aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:24:30 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:24:30 +0100
commitfd18e2b037bd6db838fa8c302424b0a4ef8711e4 (patch)
treec4861d8f2a9ecd7e5111e29aaeef65577b274169
parent309020b6b2f1312d9c93424e26b5bf79248a45f5 (diff)
downloadpaludis-fd18e2b037bd6db838fa8c302424b0a4ef8711e4.tar.gz
paludis-fd18e2b037bd6db838fa8c302424b0a4ef8711e4.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 7d30965..febd5ec 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -475,12 +475,6 @@ Decider::_make_change_type_for(
}
}
-FilteredGenerator
-Decider::_make_origin_filtered_generator(const Generator & g) const
-{
- return _imp->fns.make_origin_filtered_generator_fn()(g);
-}
-
Filter
Decider::_make_unmaskable_filter(const QualifiedPackageName & n) const
{
@@ -1785,7 +1779,7 @@ Decider::_find_installable_id_candidates_for(
return _imp->fns.remove_hidden_fn()(
(*_imp->env)[selection::AllVersionsSorted(
- _make_origin_filtered_generator(generator::Package(package)) |
+ _imp->fns.make_origin_filtered_generator_fn()(generator::Package(package)) |
slot_filter |
filter::SupportsAction<InstallAction>() |
(include_errors ? filter::All() : include_unmaskable ? _make_unmaskable_filter(package) : filter::NotMasked())
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index cb970e6..b55d55a 100644
--- a/paludis/resolver/decider.hh
+++ b/paludis/resolver/decider.hh
@@ -168,9 +168,6 @@ namespace paludis
const std::shared_ptr<const Resolution> & resolution,
const ChangesToMakeDecision &) const;
- FilteredGenerator _make_origin_filtered_generator(
- const Generator &) const;
-
Filter _make_unmaskable_filter(
const QualifiedPackageName &) const;