diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-04-15 21:44:00 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-04-15 21:44:00 +0100 |
| commit | 2b68b73ad239c4992a06fc3248839ea441208985 (patch) | |
| tree | 47d29d28fd252ec2997a6d413b524a1f7d336a50 | |
| parent | 820ec89f63c4d010a576637021ca6fbcaa4221f4 (diff) | |
| download | paludis-2b68b73ad239c4992a06fc3248839ea441208985.tar.gz paludis-2b68b73ad239c4992a06fc3248839ea441208985.tar.xz | |
Too much indirection
| -rw-r--r-- | paludis/resolver/decider.cc | 10 | ||||
| -rw-r--r-- | paludis/resolver/decider.hh | 4 |
2 files changed, 1 insertions, 13 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc index 1e3bf89..ffb7354 100644 --- a/paludis/resolver/decider.cc +++ b/paludis/resolver/decider.cc @@ -417,7 +417,7 @@ Decider::_make_destination_for( const std::shared_ptr<const Resolution> & resolution, const ChangesToMakeDecision & decision) const { - const std::shared_ptr<const Repository> repo(_find_repository_for(resolution, decision)); + const std::shared_ptr<const Repository> repo(_imp->fns.find_repository_for_fn()(resolution, decision)); if ((! repo->destination_interface()) || (! repo->destination_interface()->is_suitable_destination_for(decision.origin_id()))) throw InternalError(PALUDIS_HERE, stringify(repo->name()) + " is not a suitable destination for " @@ -475,14 +475,6 @@ Decider::_make_change_type_for( } } -const std::shared_ptr<const Repository> -Decider::_find_repository_for( - const std::shared_ptr<const Resolution> & resolution, - const ChangesToMakeDecision & decision) const -{ - return _imp->fns.find_repository_for_fn()(resolution, decision); -} - FilteredGenerator Decider::_make_destination_filtered_generator(const Generator & g, const std::shared_ptr<const Resolution> & resolution) const diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh index f8e3031..dfc312d 100644 --- a/paludis/resolver/decider.hh +++ b/paludis/resolver/decider.hh @@ -152,10 +152,6 @@ namespace paludis const std::shared_ptr<const PackageID> &, const std::shared_ptr<const Repository> &) const; - const std::shared_ptr<const Repository> _find_repository_for( - const std::shared_ptr<const Resolution> &, - const ChangesToMakeDecision &) const; - void _resolve_decide_with_dependencies(); bool _resolve_vias() PALUDIS_ATTRIBUTE((warn_unused_result)); bool _resolve_dependents() PALUDIS_ATTRIBUTE((warn_unused_result)); |