From f918abf690f416b3393433efeb70d667e17a0a94 Mon Sep 17 00:00:00 2001
From: Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
Date: Fri, 15 Apr 2011 22:26:43 +0100
Subject: Too much indirection

---
 paludis/resolver/decider.cc | 9 +--------
 paludis/resolver/decider.hh | 3 ---
 2 files changed, 1 insertion(+), 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,
-- 
cgit v1.1