aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 21:45:06 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 21:45:06 +0100
commitcec8fd3b6ca7bfcd4e3f28120e25a7f8a73e3f42 (patch)
tree11edce2f8466f55f373480ae26b3a2802fea5a32
parent387f6a5d9137064dd8ccfaf546c42c72e3ab04b1 (diff)
downloadpaludis-cec8fd3b6ca7bfcd4e3f28120e25a7f8a73e3f42.tar.gz
paludis-cec8fd3b6ca7bfcd4e3f28120e25a7f8a73e3f42.tar.xz
Too much indirection
-rw-r--r--paludis/resolver/decider.cc8
-rw-r--r--paludis/resolver/decider.hh3
2 files changed, 1 insertions, 10 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index 53f1b70..7556090 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -1783,7 +1783,7 @@ Decider::_find_installable_id_candidates_for(
{
Context context("When finding installable ID candidates for '" + stringify(package) + "':");
- return _remove_hidden(
+ return _imp->fns.remove_hidden_fn()(
(*_imp->env)[selection::AllVersionsSorted(
_make_origin_filtered_generator(generator::Package(package)) |
slot_filter |
@@ -1792,12 +1792,6 @@ Decider::_find_installable_id_candidates_for(
)]);
}
-const std::shared_ptr<const PackageIDSequence>
-Decider::_remove_hidden(const std::shared_ptr<const PackageIDSequence> & ids) const
-{
- return _imp->fns.remove_hidden_fn()(ids);
-}
-
const Decider::FoundID
Decider::_find_installable_id_for(const std::shared_ptr<const Resolution> & resolution,
const bool include_option_changes,
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index d302ff2..ed8c4ff 100644
--- a/paludis/resolver/decider.hh
+++ b/paludis/resolver/decider.hh
@@ -206,9 +206,6 @@ namespace paludis
const std::shared_ptr<Constraints> _initial_constraints_for(const Resolvent &) const;
- const std::shared_ptr<const PackageIDSequence> _remove_hidden(
- const std::shared_ptr<const PackageIDSequence> & ids) const;
-
const std::shared_ptr<const PackageID> _find_existing_id_for(
const std::shared_ptr<const Resolution> &) const;