aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:24:56 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:24:56 +0100
commit9a214bf495c12ee1ecb5fb9611128cf12025e9ac (patch)
tree680c79e881a5be669d6f05905c32e70bfbb76860
parentfd18e2b037bd6db838fa8c302424b0a4ef8711e4 (diff)
downloadpaludis-9a214bf495c12ee1ecb5fb9611128cf12025e9ac.tar.gz
paludis-9a214bf495c12ee1ecb5fb9611128cf12025e9ac.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 febd5ec..9fe6851 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -475,12 +475,6 @@ Decider::_make_change_type_for(
}
}
-Filter
-Decider::_make_unmaskable_filter(const QualifiedPackageName & n) const
-{
- return _imp->fns.make_unmaskable_filter_fn()(n);
-}
-
bool
Decider::_allow_choice_changes_for(const std::shared_ptr<const Resolution> & resolution) const
{
@@ -1782,7 +1776,7 @@ Decider::_find_installable_id_candidates_for(
_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())
+ (include_errors ? filter::All() : include_unmaskable ? _imp->fns.make_unmaskable_filter_fn()(package) : filter::NotMasked())
)]);
}
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index b55d55a..b9d3a83 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;
- Filter _make_unmaskable_filter(
- const QualifiedPackageName &) const;
-
bool _allow_choice_changes_for(
const std::shared_ptr<const Resolution> &) const;