aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 19:34:13 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 19:34:13 +0100
commit82ce5421a7c5b508340f2d326944e186edcd8849 (patch)
tree3fe0b32c161453c720a3f46151aeca2fc8014cc1
parentef62f20141855b4ca254dd7b8862ab94015199b4 (diff)
downloadpaludis-82ce5421a7c5b508340f2d326944e186edcd8849.tar.gz
paludis-82ce5421a7c5b508340f2d326944e186edcd8849.tar.xz
Too much indirection
-rw-r--r--paludis/resolver/decider.cc8
-rw-r--r--paludis/resolver/decider.hh1
2 files changed, 1 insertions, 8 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index c70a248..99ff500 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -173,7 +173,7 @@ Decider::_resolve_vias()
if ((*i)->resolvent().destination_type() == dt_create_binary)
continue;
- if (! _always_via_binary(*i))
+ if (! _imp->fns.always_via_binary_fn()(*i))
continue;
_imp->env->trigger_notifier_callback(NotifierCallbackResolverStepEvent());
@@ -210,12 +210,6 @@ Decider::_resolve_vias()
return changed;
}
-bool
-Decider::_always_via_binary(const std::shared_ptr<const Resolution> & resolution) const
-{
- return _imp->fns.always_via_binary_fn()(resolution);
-}
-
const std::shared_ptr<ConstraintSequence>
Decider::_make_constraints_for_via_binary(
const std::shared_ptr<const Resolution> & resolution,
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index 5474fb1..57320fa 100644
--- a/paludis/resolver/decider.hh
+++ b/paludis/resolver/decider.hh
@@ -173,7 +173,6 @@ namespace paludis
void _resolve_confirmations();
bool _via_binary(const std::shared_ptr<const Resolution> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
- bool _always_via_binary(const std::shared_ptr<const Resolution> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
void _fixup_changes_to_make_decision(
const std::shared_ptr<const Resolution> &,