aboutsummaryrefslogtreecommitdiff
path: root/paludis/legacy/query_visitor.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-28 22:19:20 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-01 03:57:52 +0000
commit92f0a95d1854442e744f707eaae9add7fd92ff67 (patch)
tree9d403328a07f89c1598b4d3cb0079b292d82729e /paludis/legacy/query_visitor.cc
parent092228a814cd6700b97112b5dcf931c80b6b9431 (diff)
downloadpaludis-92f0a95d1854442e744f707eaae9add7fd92ff67.tar.gz
paludis-92f0a95d1854442e744f707eaae9add7fd92ff67.tar.xz
Pass env, id to ConditionalDepSpec members
Diffstat (limited to 'paludis/legacy/query_visitor.cc')
-rw-r--r--paludis/legacy/query_visitor.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/paludis/legacy/query_visitor.cc b/paludis/legacy/query_visitor.cc
index 655a86c43..0ddec62a6 100644
--- a/paludis/legacy/query_visitor.cc
+++ b/paludis/legacy/query_visitor.cc
@@ -140,7 +140,7 @@ QueryVisitor::visit(const DependencySpecTree::NodeType<ConditionalDepSpec>::Type
{
/* for use? ( ) dep specs, return true if we're not enabled, so that
* weird || ( ) cases work. */
- if (node.spec()->condition_met())
+ if (node.spec()->condition_met(_imp->environment, _imp->id))
{
_imp->result = true;
for (DependencySpecTree::NodeType<AnyDepSpec>::Type::ConstIterator c(node.begin()), c_end(node.end()) ;
@@ -174,7 +174,7 @@ QueryVisitor::visit(const DependencySpecTree::NodeType<AnyDepSpec>::Type & node)
for (DependencySpecTree::NodeType<AnyDepSpec>::Type::ConstIterator c(node.begin()), c_end(node.end()) ;
c != c_end ; ++c)
{
- if (! is_viable_any_child(**c))
+ if (! is_viable_any_child(_imp->environment, _imp->id, **c))
continue;
(*c)->accept(*this);