diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-04-15 21:45:57 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-04-15 21:45:57 +0100 |
| commit | 309020b6b2f1312d9c93424e26b5bf79248a45f5 (patch) | |
| tree | a0dc52a5d9641b98280107f0b28036ef864c7443 | |
| parent | cec8fd3b6ca7bfcd4e3f28120e25a7f8a73e3f42 (diff) | |
| download | paludis-309020b6b2f1312d9c93424e26b5bf79248a45f5.tar.gz paludis-309020b6b2f1312d9c93424e26b5bf79248a45f5.tar.xz | |
Too much indirection
| -rw-r--r-- | paludis/resolver/decider.cc | 13 | ||||
| -rw-r--r-- | paludis/resolver/decider.hh | 5 |
2 files changed, 2 insertions, 16 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc index 7556090..7d30965 100644 --- a/paludis/resolver/decider.cc +++ b/paludis/resolver/decider.cc @@ -2053,7 +2053,7 @@ Decider::purge() )); } - const std::shared_ptr<const ConstraintSequence> constraints(_make_constraints_for_purge(resolution, *i, used_to_use)); + const std::shared_ptr<const ConstraintSequence> constraints(_imp->fns.get_constraints_for_purge_fn()(resolution, *i, used_to_use)); for (ConstraintSequence::ConstIterator c(constraints->begin()), c_end(constraints->end()) ; c != c_end ; ++c) _apply_resolution_constraint(resolution, *c); @@ -2321,7 +2321,7 @@ Decider::_resolve_purges() if (resolution->decision()) continue; - const std::shared_ptr<const ConstraintSequence> constraints(_make_constraints_for_purge(resolution, *i, used_to_use)); + const std::shared_ptr<const ConstraintSequence> constraints(_imp->fns.get_constraints_for_purge_fn()(resolution, *i, used_to_use)); for (ConstraintSequence::ConstIterator c(constraints->begin()), c_end(constraints->end()) ; c != c_end ; ++c) _apply_resolution_constraint(resolution, *c); @@ -2335,15 +2335,6 @@ Decider::_resolve_purges() return changed; } -const std::shared_ptr<ConstraintSequence> -Decider::_make_constraints_for_purge( - const std::shared_ptr<const Resolution> & resolution, - const std::shared_ptr<const PackageID> & id, - const std::shared_ptr<const ChangeByResolventSequence> & r) const -{ - return _imp->fns.get_constraints_for_purge_fn()(resolution, id, r); -} - namespace { struct ConstraintFromOtherDestinationVisitor diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh index ed8c4ff..cb970e6 100644 --- a/paludis/resolver/decider.hh +++ b/paludis/resolver/decider.hh @@ -106,11 +106,6 @@ namespace paludis const BlockDepSpec & dep, const std::shared_ptr<const Reason> & reason) const; - const std::shared_ptr<ConstraintSequence> _make_constraints_for_purge( - const std::shared_ptr<const Resolution> & resolution, - const std::shared_ptr<const PackageID> &, - const std::shared_ptr<const ChangeByResolventSequence> &) const; - const std::shared_ptr<ConstraintSequence> _make_constraints_from_other_destination( const std::shared_ptr<const Resolution> & resolution, const std::shared_ptr<const Resolution> & from_resolution, |