aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:26:43 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:26:43 +0100
commitf918abf690f416b3393433efeb70d667e17a0a94 (patch)
tree66dc7a1e9d71ffdd978e9eaffbefda9481e17819
parent44c377000a030db3cd29d9abe06c18b4a5746982 (diff)
downloadpaludis-f918abf690f416b3393433efeb70d667e17a0a94.tar.gz
paludis-f918abf690f416b3393433efeb70d667e17a0a94.tar.xz
Too much indirection
-rw-r--r--paludis/resolver/decider.cc9
-rw-r--r--paludis/resolver/decider.hh3
2 files changed, 1 insertions, 11 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index aec4246..740ef6d 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -940,7 +940,7 @@ Decider::_made_wrong_decision(
std::shared_ptr<Resolution> adapted_resolution(std::make_shared<Resolution>(*resolution));
adapted_resolution->constraints()->add(constraint);
- if (_allowed_to_restart(adapted_resolution))
+ if (_imp->fns.allowed_to_restart_fn()(adapted_resolution))
{
const std::shared_ptr<Decision> decision(_try_to_find_decision_for(
adapted_resolution, _imp->fns.allow_choice_changes_fn()(resolution), false, true, false, true));
@@ -967,13 +967,6 @@ Decider::_suggest_restart_with(
_make_constraint_for_preloading(decision, constraint));
}
-bool
-Decider::_allowed_to_restart(
- const std::shared_ptr<const Resolution> & resolution) const
-{
- return _imp->fns.allowed_to_restart_fn()(resolution);
-}
-
const std::shared_ptr<const Constraint>
Decider::_make_constraint_for_preloading(
const std::shared_ptr<const Decision> & decision,
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index 68a61e0..69bb20d 100644
--- a/paludis/resolver/decider.hh
+++ b/paludis/resolver/decider.hh
@@ -127,9 +127,6 @@ namespace paludis
const std::shared_ptr<Resolution> & resolution,
const std::shared_ptr<const Constraint> & constraint);
- bool _allowed_to_restart(
- const std::shared_ptr<const Resolution> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
-
void _suggest_restart_with(
const std::shared_ptr<const Resolution> & resolution,
const std::shared_ptr<const Constraint> & constraint,