aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:25:23 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:25:23 +0100
commit6ef4fc170212f6d9e25617524c4d8ed3dc614346 (patch)
tree16d80cfdba4f17d95f2314149237f2d972f52c4a
parent9a214bf495c12ee1ecb5fb9611128cf12025e9ac (diff)
downloadpaludis-6ef4fc170212f6d9e25617524c4d8ed3dc614346.tar.gz
paludis-6ef4fc170212f6d9e25617524c4d8ed3dc614346.tar.xz
Too much indirection
-rw-r--r--paludis/resolver/decider.cc10
-rw-r--r--paludis/resolver/decider.hh3
2 files changed, 2 insertions, 11 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index 9fe6851..595445f 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -475,12 +475,6 @@ Decider::_make_change_type_for(
}
}
-bool
-Decider::_allow_choice_changes_for(const std::shared_ptr<const Resolution> & resolution) const
-{
- return _imp->fns.allow_choice_changes_fn()(resolution);
-}
-
const std::shared_ptr<const PackageIDSequence>
Decider::_find_replacing(
const std::shared_ptr<const PackageID> & id,
@@ -957,7 +951,7 @@ Decider::_made_wrong_decision(
if (_allowed_to_restart(adapted_resolution))
{
const std::shared_ptr<Decision> decision(_try_to_find_decision_for(
- adapted_resolution, _allow_choice_changes_for(resolution), false, true, false, true));
+ adapted_resolution, _imp->fns.allow_choice_changes_fn()(resolution), false, true, false, true));
if (decision)
{
resolution->decision()->accept(WrongDecisionVisitor(std::bind(
@@ -1039,7 +1033,7 @@ Decider::_decide(const std::shared_ptr<Resolution> & resolution)
_copy_other_destination_constraints(resolution);
std::shared_ptr<Decision> decision(_try_to_find_decision_for(
- resolution, _allow_choice_changes_for(resolution), false, true, false, true));
+ resolution, _imp->fns.allow_choice_changes_fn()(resolution), false, true, false, true));
if (decision)
resolution->decision() = decision;
else
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index b9d3a83..90ce723 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;
- bool _allow_choice_changes_for(
- const std::shared_ptr<const Resolution> &) const;
-
void _decide(const std::shared_ptr<Resolution> & resolution);
void _copy_other_destination_constraints(const std::shared_ptr<Resolution> & resolution);