diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-04-15 20:55:51 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-04-15 20:55:51 +0100 |
| commit | 820ec89f63c4d010a576637021ca6fbcaa4221f4 (patch) | |
| tree | ad541259a689e03e520a6f79e2a1065007bab381 | |
| parent | fa250d01097f71ef3b30a8499ef7440d36812440 (diff) | |
| download | paludis-820ec89f63c4d010a576637021ca6fbcaa4221f4.tar.gz paludis-820ec89f63c4d010a576637021ca6fbcaa4221f4.tar.xz | |
Too much indirection
| -rw-r--r-- | paludis/resolver/decider.cc | 11 | ||||
| -rw-r--r-- | paludis/resolver/decider.hh | 5 |
2 files changed, 1 insertions, 15 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc index 5cce32683..1e3bf89d5 100644 --- a/paludis/resolver/decider.cc +++ b/paludis/resolver/decider.cc @@ -248,7 +248,7 @@ Decider::_resolve_dependents() changed = true; const std::shared_ptr<Resolution> resolution(_resolution_for_resolvent(resolvent, true)); - const std::shared_ptr<const ConstraintSequence> constraints(_make_constraints_for_dependent( + const std::shared_ptr<const ConstraintSequence> constraints(_imp->fns.get_constraints_for_dependent_fn()( resolution, *s, dependent_upon_ids)); for (ConstraintSequence::ConstIterator c(constraints->begin()), c_end(constraints->end()) ; c != c_end ; ++c) @@ -272,15 +272,6 @@ Decider::_resolve_dependents() return changed; } -const std::shared_ptr<ConstraintSequence> -Decider::_make_constraints_for_dependent( - 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_dependent_fn()(resolution, id, r); -} - namespace { const std::shared_ptr<const PackageID> get_change_by_resolvent_id(const ChangeByResolvent & r) diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh index 6ab8eadbe..f8e303183 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_dependent( - 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_for_purge( const std::shared_ptr<const Resolution> & resolution, const std::shared_ptr<const PackageID> &, |