diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-04-15 23:08:57 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-04-15 23:08:57 +0100 |
| commit | 59391a9353734507abce352f345329c793f819a2 (patch) | |
| tree | 3a3298491538696a9367c6b156d819bd06a4a08e | |
| parent | 3e39f5ae53328a4556201f0586595f26e0c9581c (diff) | |
| download | paludis-59391a9353734507abce352f345329c793f819a2.tar.gz paludis-59391a9353734507abce352f345329c793f819a2.tar.xz | |
Too much indirection
| -rw-r--r-- | paludis/resolver/decider.cc | 8 | ||||
| -rw-r--r-- | paludis/resolver/decider.hh | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc index 3ff8bf7..f5269e6 100644 --- a/paludis/resolver/decider.cc +++ b/paludis/resolver/decider.cc @@ -239,7 +239,7 @@ Decider::_resolve_dependents() continue; Resolvent resolvent(*s, dt_install_to_slash); - bool remove(_remove_if_dependent(*s)); + bool remove(_imp->fns.remove_if_dependent_fn()(*s)); /* we've changed things if we've not already done anything for this * resolvent, but only if we're going to remove it rather than mark it @@ -1694,12 +1694,6 @@ Decider::_allowed_to_remove( return id->supports_action(SupportsActionTest<UninstallAction>()) && _imp->fns.allowed_to_remove_fn()(resolution, id); } -bool -Decider::_remove_if_dependent(const std::shared_ptr<const PackageID> & id) const -{ - return _imp->fns.remove_if_dependent_fn()(id); -} - const std::shared_ptr<const PackageIDSequence> Decider::_installed_ids(const std::shared_ptr<const Resolution> & resolution) const { diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh index 0c1146f..7c1b7ad 100644 --- a/paludis/resolver/decider.hh +++ b/paludis/resolver/decider.hh @@ -220,8 +220,6 @@ namespace paludis const std::shared_ptr<const Resolution> &, const std::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - bool _remove_if_dependent(const std::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - const std::pair< std::shared_ptr<const ChangeByResolventSequence>, std::shared_ptr<const ChangeByResolventSequence> > _collect_changing() const PALUDIS_ATTRIBUTE((warn_unused_result)); |