diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-04-15 23:10:24 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-04-15 23:10:24 +0100 |
| commit | 537036d40b9142858d2cf863a5d143498e927640 (patch) | |
| tree | 04fad7fd566628debde7e5271a03a48de578a282 | |
| parent | 59391a9353734507abce352f345329c793f819a2 (diff) | |
| download | paludis-537036d40b9142858d2cf863a5d143498e927640.tar.gz paludis-537036d40b9142858d2cf863a5d143498e927640.tar.xz | |
Too much indirection
| -rw-r--r-- | paludis/resolver/decider.cc | 9 | ||||
| -rw-r--r-- | paludis/resolver/decider.hh | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc index f5269e6..b68a2d8 100644 --- a/paludis/resolver/decider.cc +++ b/paludis/resolver/decider.cc @@ -2033,7 +2033,7 @@ Decider::_package_dep_spec_already_met(const PackageDepSpec & spec, const std::s else { if (installed_ids->end() == std::find_if(installed_ids->begin(), installed_ids->end(), - std::bind(&Decider::_can_use, this, std::placeholders::_1))) + _imp->fns.can_use_fn())) return false; return true; @@ -2053,13 +2053,6 @@ Decider::_block_dep_spec_already_met(const BlockDepSpec & spec, const std::share return installed_ids->empty(); } -bool -Decider::_can_use( - const std::shared_ptr<const PackageID> & id) const -{ - return _imp->fns.can_use_fn()(id); -} - namespace { struct ConfirmVisitor diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh index 7c1b7ad..e82b29a 100644 --- a/paludis/resolver/decider.hh +++ b/paludis/resolver/decider.hh @@ -229,9 +229,6 @@ namespace paludis void _confirm(const std::shared_ptr<const Resolution> & resolution); - bool _can_use( - const std::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result)); - public: Decider(const Environment * const, const ResolverFunctions &, |