aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:27:41 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:27:41 +0100
commita2a92fb108993135badb903d7d6794980cedcca7 (patch)
tree57ead9e7c401f34397a063ab784a042e780a5993
parentf918abf690f416b3393433efeb70d667e17a0a94 (diff)
downloadpaludis-a2a92fb108993135badb903d7d6794980cedcca7.tar.gz
paludis-a2a92fb108993135badb903d7d6794980cedcca7.tar.xz
Too much indirection
-rw-r--r--paludis/resolver/decider.cc11
-rw-r--r--paludis/resolver/decider.hh3
2 files changed, 2 insertions, 12 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index 740ef6d..69a6d43 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -603,7 +603,7 @@ Decider::_make_constraints_from_blocker(
throw InternalError(PALUDIS_HERE, "unexpected role");
}
- DestinationTypes destination_types(_get_destination_types_for_blocker(spec, reason));
+ DestinationTypes destination_types(_imp->fns.get_destination_types_for_blocker_fn()(spec, reason));
for (EnumIterator<DestinationType> t, t_end(last_dt) ; t != t_end ; ++t)
if (destination_types[*t])
result->push_back(std::make_shared<Constraint>(make_named_values<Constraint>(
@@ -1355,7 +1355,7 @@ Decider::_get_resolvents_for_blocker(const BlockDepSpec & spec,
if (spec.blocking().exact_slot_requirement())
exact_slot = make_shared_copy(spec.blocking().exact_slot_requirement()->name());
- DestinationTypes destination_types(_get_destination_types_for_blocker(spec, reason));
+ DestinationTypes destination_types(_imp->fns.get_destination_types_for_blocker_fn()(spec, reason));
std::shared_ptr<Resolvents> result(std::make_shared<Resolvents>());
if (exact_slot)
{
@@ -1378,13 +1378,6 @@ Decider::_get_resolvents_for_blocker(const BlockDepSpec & spec,
return result;
}
-const DestinationTypes
-Decider::_get_destination_types_for_blocker(const BlockDepSpec & spec,
- const std::shared_ptr<const Reason> & reason) const
-{
- return _imp->fns.get_destination_types_for_blocker_fn()(spec, reason);
-}
-
const std::pair<std::shared_ptr<const Resolvents>, bool>
Decider::_get_resolvents_for(
const PackageDepSpec & spec,
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index 69bb20d..36b84eb 100644
--- a/paludis/resolver/decider.hh
+++ b/paludis/resolver/decider.hh
@@ -69,9 +69,6 @@ namespace paludis
const std::shared_ptr<const Resolvents> _get_resolvents_for_blocker(const BlockDepSpec &,
const std::shared_ptr<const Reason> & reason) const;
- const DestinationTypes _get_destination_types_for_blocker(const BlockDepSpec &,
- const std::shared_ptr<const Reason> &) const;
-
const std::pair<std::shared_ptr<const Resolvents>, bool> _get_resolvents_for(
const PackageDepSpec & spec,
const std::shared_ptr<const Reason> & reason) const;