aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:54:30 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:54:30 +0100
commit3e39f5ae53328a4556201f0586595f26e0c9581c (patch)
treef6bb32b01f75facf4b5a692eef0e47a66db54c6b
parenta2a92fb108993135badb903d7d6794980cedcca7 (diff)
downloadpaludis-3e39f5ae53328a4556201f0586595f26e0c9581c.tar.gz
paludis-3e39f5ae53328a4556201f0586595f26e0c9581c.tar.xz
Too much indirection
-rw-r--r--paludis/resolver/decider.cc10
-rw-r--r--paludis/resolver/decider.hh4
2 files changed, 1 insertions, 13 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index 69a6d43..3ff8bf7 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -1393,14 +1393,6 @@ Decider::_get_resolvents_for(
return _imp->fns.get_resolvents_for_fn()(spec, maybe_from_package_id_from_reason(reason), exact_slot, reason);
}
-const DestinationTypes
-Decider::_get_destination_types_for_error(
- const PackageDepSpec & spec,
- const std::shared_ptr<const Reason> & reason) const
-{
- return _imp->fns.get_destination_types_for_error_fn()(spec, reason);
-}
-
const std::shared_ptr<const Resolvents>
Decider::_get_error_resolvents_for(
const PackageDepSpec & spec,
@@ -1409,7 +1401,7 @@ Decider::_get_error_resolvents_for(
Context context("When finding slots for '" + stringify(spec) + "', which can't be found the normal way:");
std::shared_ptr<Resolvents> result(std::make_shared<Resolvents>());
- DestinationTypes destination_types(_get_destination_types_for_error(spec, reason));
+ DestinationTypes destination_types(_imp->fns.get_destination_types_for_error_fn()(spec, reason));
for (EnumIterator<DestinationType> t, t_end(last_dt) ; t != t_end ; ++t)
if (destination_types[*t])
{
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index 36b84eb..0c1146f 100644
--- a/paludis/resolver/decider.hh
+++ b/paludis/resolver/decider.hh
@@ -73,10 +73,6 @@ namespace paludis
const PackageDepSpec & spec,
const std::shared_ptr<const Reason> & reason) const;
- const DestinationTypes _get_destination_types_for_error(
- const PackageDepSpec & spec,
- const std::shared_ptr<const Reason> &) const;
-
const std::shared_ptr<const Resolvents> _get_error_resolvents_for(
const PackageDepSpec & spec,
const std::shared_ptr<const Reason> & reason) const;