aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:26:22 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-15 22:26:22 +0100
commit44c377000a030db3cd29d9abe06c18b4a5746982 (patch)
treeace9a69fd86e41d26aec8d03bc5b1242e3538437
parentd0fb68d4a8b5430f95067b768c3a402ecf3727d2 (diff)
downloadpaludis-44c377000a030db3cd29d9abe06c18b4a5746982.tar.gz
paludis-44c377000a030db3cd29d9abe06c18b4a5746982.tar.xz
Too much indirection
-rw-r--r--paludis/resolver/decider.cc10
-rw-r--r--paludis/resolver/decider.hh4
2 files changed, 1 insertions, 13 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index 300d821..aec4246 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -424,7 +424,7 @@ Decider::_make_destination_for(
+ stringify(*decision.origin_id()));
return std::make_shared<Destination>(make_named_values<Destination>(
- n::replacing() = _find_replacing(decision.origin_id(), repo),
+ n::replacing() = _imp->fns.find_replacing_fn()(decision.origin_id(), repo),
n::repository() = repo->name()
));
}
@@ -475,14 +475,6 @@ Decider::_make_change_type_for(
}
}
-const std::shared_ptr<const PackageIDSequence>
-Decider::_find_replacing(
- const std::shared_ptr<const PackageID> & id,
- const std::shared_ptr<const Repository> & repo) const
-{
- return _imp->fns.find_replacing_fn()(id, repo);
-}
-
const std::shared_ptr<Resolution>
Decider::_create_resolution_for_resolvent(const Resolvent & r) const
{
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index 5704253..68a61e0 100644
--- a/paludis/resolver/decider.hh
+++ b/paludis/resolver/decider.hh
@@ -143,10 +143,6 @@ namespace paludis
const PackageDepSpec & spec,
const std::shared_ptr<const ChangedChoices> &) const;
- const std::shared_ptr<const PackageIDSequence> _find_replacing(
- const std::shared_ptr<const PackageID> &,
- const std::shared_ptr<const Repository> &) const;
-
void _resolve_decide_with_dependencies();
bool _resolve_vias() PALUDIS_ATTRIBUTE((warn_unused_result));
bool _resolve_dependents() PALUDIS_ATTRIBUTE((warn_unused_result));