aboutsummaryrefslogtreecommitdiff
path: root/paludis/resolver/collect_depped_upon.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-07 14:15:31 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-07 14:15:31 +0100
commit5bca2928c8047c1d34e35d8c167a7a6644b2515a (patch)
treef89de8dc9aac885067abea62dc1f5e8fcb04eea9 /paludis/resolver/collect_depped_upon.cc
parent4eb9754117cf6d1fe9985fc1950ffbaf943fcafc (diff)
downloadpaludis-5bca2928c8047c1d34e35d8c167a7a6644b2515a.tar.gz
paludis-5bca2928c8047c1d34e35d8c167a7a6644b2515a.tar.xz
Constraint -> Requirement
Diffstat (limited to 'paludis/resolver/collect_depped_upon.cc')
-rw-r--r--paludis/resolver/collect_depped_upon.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/paludis/resolver/collect_depped_upon.cc b/paludis/resolver/collect_depped_upon.cc
index f8f6a1d0c..3d97cdc2b 100644
--- a/paludis/resolver/collect_depped_upon.cc
+++ b/paludis/resolver/collect_depped_upon.cc
@@ -33,7 +33,7 @@
#include <paludis/metadata_key.hh>
#include <paludis/match_package.hh>
#include <paludis/version_spec.hh>
-#include <paludis/package_dep_spec_constraint.hh>
+#include <paludis/package_dep_spec_requirement.hh>
#include <paludis/dep_spec_data.hh>
#include <algorithm>
@@ -111,7 +111,7 @@ namespace
{
auto spec(s.spec());
- if (s.spec()->any_slot_constraint() && ! s.spec()->any_slot_constraint()->locking())
+ if (s.spec()->any_slot_requirement() && ! s.spec()->any_slot_requirement()->locking())
{
auto best_eventual_id(best_eventual(env, *s.spec(), id_for_specs, newly_available));
if (! best_eventual_id)
@@ -120,8 +120,8 @@ namespace
{
MutablePackageDepSpecData part_spec(*s.spec()->data());
part_spec
- .unconstrain_exact_slot()
- .constrain_exact_slot(best_eventual_id->slot_key()->value(), false);
+ .unrequire_exact_slot()
+ .require_exact_slot(best_eventual_id->slot_key()->value(), false);
spec = std::make_shared<PackageDepSpec>(part_spec);
}
}