diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-04-15 20:55:24 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-04-15 20:55:24 +0100 |
| commit | fa250d01097f71ef3b30a8499ef7440d36812440 (patch) | |
| tree | 31cde7a49f58f140224a070f808fed5cb4ba09ed | |
| parent | 82ce5421a7c5b508340f2d326944e186edcd8849 (diff) | |
| download | paludis-fa250d01097f71ef3b30a8499ef7440d36812440.tar.gz paludis-fa250d01097f71ef3b30a8499ef7440d36812440.tar.xz | |
Too much indirection
| -rw-r--r-- | paludis/resolver/decider.cc | 10 | ||||
| -rw-r--r-- | paludis/resolver/decider.hh | 4 |
2 files changed, 1 insertions, 13 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc index 99ff50006..5cce32683 100644 --- a/paludis/resolver/decider.cc +++ b/paludis/resolver/decider.cc @@ -198,7 +198,7 @@ Decider::_resolve_vias() changed = true; - const std::shared_ptr<const ConstraintSequence> constraints(_make_constraints_for_via_binary(binary_resolution, *i)); + const std::shared_ptr<const ConstraintSequence> constraints(_imp->fns.get_constraints_for_via_binary_fn()(binary_resolution, *i)); for (ConstraintSequence::ConstIterator c(constraints->begin()), c_end(constraints->end()) ; c != c_end ; ++c) @@ -210,14 +210,6 @@ Decider::_resolve_vias() return changed; } -const std::shared_ptr<ConstraintSequence> -Decider::_make_constraints_for_via_binary( - const std::shared_ptr<const Resolution> & resolution, - const std::shared_ptr<const Resolution> & other_resolution) const -{ - return _imp->fns.get_constraints_for_via_binary_fn()(resolution, other_resolution); -} - bool Decider::_resolve_dependents() { diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh index 57320fa68..6ab8eadbe 100644 --- a/paludis/resolver/decider.hh +++ b/paludis/resolver/decider.hh @@ -121,10 +121,6 @@ namespace paludis const std::shared_ptr<const Resolution> & from_resolution, const std::shared_ptr<const Constraint> & from_constraint) const; - const std::shared_ptr<ConstraintSequence> _make_constraints_for_via_binary( - const std::shared_ptr<const Resolution> & resolution, - const std::shared_ptr<const Resolution> & from_resolution) const; - void _apply_resolution_constraint( const std::shared_ptr<Resolution> &, const std::shared_ptr<const Constraint> &); |