aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 21:44:44 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 21:44:44 +0100
commit387f6a5d9137064dd8ccfaf546c42c72e3ab04b1 (patch)
treeaec82285d5e6572761692748b72634a110e050b5
parent2b68b73ad239c4992a06fc3248839ea441208985 (diff)
downloadpaludis-387f6a5d9137064dd8ccfaf546c42c72e3ab04b1.tar.gz
paludis-387f6a5d9137064dd8ccfaf546c42c72e3ab04b1.tar.xz
Too much indirection
-rw-r--r--paludis/resolver/decider.cc9
-rw-r--r--paludis/resolver/decider.hh4
2 files changed, 1 insertions, 12 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index ffb7354..53f1b70 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -476,13 +476,6 @@ Decider::_make_change_type_for(
}
FilteredGenerator
-Decider::_make_destination_filtered_generator(const Generator & g,
- const std::shared_ptr<const Resolution> & resolution) const
-{
- return _imp->fns.make_destination_filtered_generator_fn()(g, resolution);
-}
-
-FilteredGenerator
Decider::_make_origin_filtered_generator(const Generator & g) const
{
return _imp->fns.make_origin_filtered_generator_fn()(g);
@@ -1776,7 +1769,7 @@ Decider::_installed_ids(const std::shared_ptr<const Resolution> & resolution) co
Context context("When finding installed IDs for '" + stringify(resolution->resolvent()) + "':");
return (*_imp->env)[selection::AllVersionsSorted(
- _make_destination_filtered_generator(generator::Package(resolution->resolvent().package()), resolution) |
+ _imp->fns.make_destination_filtered_generator_fn()(generator::Package(resolution->resolvent().package()), resolution) |
make_slot_filter(resolution->resolvent())
)];
}
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index dfc312d..d302ff2 100644
--- a/paludis/resolver/decider.hh
+++ b/paludis/resolver/decider.hh
@@ -173,10 +173,6 @@ namespace paludis
const std::shared_ptr<const Resolution> & resolution,
const ChangesToMakeDecision &) const;
- FilteredGenerator _make_destination_filtered_generator(
- const Generator &,
- const std::shared_ptr<const Resolution> &) const;
-
FilteredGenerator _make_origin_filtered_generator(
const Generator &) const;