aboutsummaryrefslogtreecommitdiff
path: root/paludis/match_package.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-04 08:19:18 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-04 08:33:00 +0100
commit6d8fa49055b5c43117d98c020187be9bfa4fb2c6 (patch)
tree1f8d90310bbac90838dce4f082fd4c8fa4e04942 /paludis/match_package.cc
parent508e7564e1d8d1de765d4d517bc899b7ef137716 (diff)
downloadpaludis-6d8fa49055b5c43117d98c020187be9bfa4fb2c6.tar.gz
paludis-6d8fa49055b5c43117d98c020187be9bfa4fb2c6.tar.xz
Use reqs to constraints
Diffstat (limited to 'paludis/match_package.cc')
-rw-r--r--paludis/match_package.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/paludis/match_package.cc b/paludis/match_package.cc
index 5b40768a4..2001ec483 100644
--- a/paludis/match_package.cc
+++ b/paludis/match_package.cc
@@ -25,7 +25,6 @@
#include <paludis/metadata_key.hh>
#include <paludis/action.hh>
#include <paludis/repository.hh>
-#include <paludis/additional_package_dep_spec_requirement.hh>
#include <paludis/package_dep_spec_constraint.hh>
#include <paludis/contents.hh>
#include <paludis/version_operator.hh>
@@ -171,10 +170,10 @@ paludis::match_package_with_maybe_changes(
if (! options[mpo_ignore_additional_requirements])
{
- if (spec.additional_requirements_ptr())
+ if (spec.all_choice_constraints())
{
- for (AdditionalPackageDepSpecRequirements::ConstIterator u(spec.additional_requirements_ptr()->begin()),
- u_end(spec.additional_requirements_ptr()->end()) ; u != u_end ; ++u)
+ for (auto u(spec.all_choice_constraints()->begin()), u_end(spec.all_choice_constraints()->end()) ;
+ u != u_end ; ++u)
if (! (*u)->requirement_met(&env, maybe_changes_to_owner, id, from_id, maybe_changes_to_target).first)
return false;
}