aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:26:01 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:26:01 +0100
commitd0fb68d4a8b5430f95067b768c3a402ecf3727d2 (patch)
tree65c79d91a440f419cbd16206f8c7b6fe7e19d836
parent6ef4fc170212f6d9e25617524c4d8ed3dc614346 (diff)
downloadpaludis-d0fb68d4a8b5430f95067b768c3a402ecf3727d2.tar.gz
paludis-d0fb68d4a8b5430f95067b768c3a402ecf3727d2.tar.xz
Too much indirection
-rw-r--r--paludis/resolver/decider.cc19
-rw-r--r--paludis/resolver/decider.hh7
2 files changed, 2 insertions, 24 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index 595445f..300d821 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -487,7 +487,7 @@ const std::shared_ptr<Resolution>
Decider::_create_resolution_for_resolvent(const Resolvent & r) const
{
return std::make_shared<Resolution>(make_named_values<Resolution>(
- n::constraints() = _initial_constraints_for(r),
+ n::constraints() = _imp->fns.get_initial_constraints_for_fn()(r),
n::decision() = make_null_shared_ptr(),
n::resolvent() = r
));
@@ -1135,7 +1135,7 @@ Decider::_add_dependencies_if_necessary(
{
Context context_2("When handling dependency '" + stringify(s->spec()) + "':");
- SpecInterest interest(_interest_in_spec(our_resolution, package_id, *s));
+ SpecInterest interest(_imp->fns.interest_in_spec_fn()(our_resolution, package_id, *s));
switch (interest)
{
@@ -1184,21 +1184,6 @@ Decider::_add_dependencies_if_necessary(
}
}
-SpecInterest
-Decider::_interest_in_spec(
- const std::shared_ptr<const Resolution> & resolution,
- const std::shared_ptr<const PackageID> & id,
- const SanitisedDependency & dep) const
-{
- return _imp->fns.interest_in_spec_fn()(resolution, id, dep);
-}
-
-const std::shared_ptr<Constraints>
-Decider::_initial_constraints_for(const Resolvent & r) const
-{
- return _imp->fns.get_initial_constraints_for_fn()(r);
-}
-
std::pair<AnyChildScore, OperatorScore>
Decider::find_any_score(
const std::shared_ptr<const Resolution> & our_resolution,
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index 90ce723..5704253 100644
--- a/paludis/resolver/decider.hh
+++ b/paludis/resolver/decider.hh
@@ -185,13 +185,6 @@ namespace paludis
void _add_dependencies_if_necessary(
const std::shared_ptr<Resolution> & our_resolution);
- SpecInterest _interest_in_spec(
- const std::shared_ptr<const Resolution> &,
- const std::shared_ptr<const PackageID> &,
- const SanitisedDependency &) const;
-
- const std::shared_ptr<Constraints> _initial_constraints_for(const Resolvent &) const;
-
const std::shared_ptr<const PackageID> _find_existing_id_for(
const std::shared_ptr<const Resolution> &) const;