diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2010-11-03 19:49:19 +0000 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2010-11-03 19:49:19 +0000 |
| commit | 85ed1ea66ef46694ec7d77a101b23245576862d6 (patch) | |
| tree | a7cf55377fe164ab2c258402bf2e618105385918 | |
| parent | ebeee03e8d424be339f65214e5d6fe6af67f9127 (diff) | |
| download | paludis-85ed1ea66ef46694ec7d77a101b23245576862d6.tar.gz paludis-85ed1ea66ef46694ec7d77a101b23245576862d6.tar.xz | |
Just take a name for unmaskable filters
| -rw-r--r-- | paludis/resolver/decider.cc | 6 | ||||
| -rw-r--r-- | paludis/resolver/decider.hh | 3 | ||||
| -rw-r--r-- | paludis/resolver/make_unmaskable_filter_helper.cc | 2 | ||||
| -rw-r--r-- | paludis/resolver/make_unmaskable_filter_helper.hh | 3 | ||||
| -rw-r--r-- | paludis/resolver/resolver_functions.hh | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc index 60d7f79a9..aec0d39e8 100644 --- a/paludis/resolver/decider.cc +++ b/paludis/resolver/decider.cc @@ -505,9 +505,9 @@ Decider::_make_origin_filtered_generator(const Generator & g) const } Filter -Decider::_make_unmaskable_filter(const std::shared_ptr<const Resolution> & resolution) const +Decider::_make_unmaskable_filter(const QualifiedPackageName & n) const { - return _imp->fns.make_unmaskable_filter_fn()(resolution); + return _imp->fns.make_unmaskable_filter_fn()(n); } bool @@ -1829,7 +1829,7 @@ Decider::_find_installable_id_candidates_for( _make_origin_filtered_generator(generator::Package(resolution->resolvent().package())) | make_slot_filter(resolution->resolvent()) | filter::SupportsAction<InstallAction>() | - (include_errors ? filter::All() : include_unmaskable ? _make_unmaskable_filter(resolution) : filter::NotMasked()) + (include_errors ? filter::All() : include_unmaskable ? _make_unmaskable_filter(resolution->resolvent().package()) : filter::NotMasked()) )]; } diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh index a3490fd93..de740dc99 100644 --- a/paludis/resolver/decider.hh +++ b/paludis/resolver/decider.hh @@ -48,6 +48,7 @@ #include <paludis/filtered_generator-fwd.hh> #include <paludis/generator-fwd.hh> #include <paludis/changed_choices-fwd.hh> +#include <paludis/name-fwd.hh> #include <tuple> namespace paludis @@ -183,7 +184,7 @@ namespace paludis const Generator &) const; Filter _make_unmaskable_filter( - const std::shared_ptr<const Resolution> &) const; + const QualifiedPackageName &) const; bool _allow_choice_changes_for( const std::shared_ptr<const Resolution> &) const; diff --git a/paludis/resolver/make_unmaskable_filter_helper.cc b/paludis/resolver/make_unmaskable_filter_helper.cc index f63ea7395..8b4393954 100644 --- a/paludis/resolver/make_unmaskable_filter_helper.cc +++ b/paludis/resolver/make_unmaskable_filter_helper.cc @@ -98,7 +98,7 @@ namespace Filter MakeUnmaskableFilterHelper::operator() ( - const std::shared_ptr<const Resolution> &) const + const QualifiedPackageName &) const { if (_imp->override_masks) return UnmaskableFilter(); diff --git a/paludis/resolver/make_unmaskable_filter_helper.hh b/paludis/resolver/make_unmaskable_filter_helper.hh index 930ebca79..f1500ce77 100644 --- a/paludis/resolver/make_unmaskable_filter_helper.hh +++ b/paludis/resolver/make_unmaskable_filter_helper.hh @@ -26,6 +26,7 @@ #include <paludis/util/attributes.hh> #include <paludis/environment-fwd.hh> #include <paludis/filter-fwd.hh> +#include <paludis/name-fwd.hh> #include <memory> namespace paludis @@ -41,7 +42,7 @@ namespace paludis void set_override_masks(const bool); - Filter operator() (const std::shared_ptr<const Resolution> &) const; + Filter operator() (const QualifiedPackageName &) const; }; } diff --git a/paludis/resolver/resolver_functions.hh b/paludis/resolver/resolver_functions.hh index a0c7a1448..a378c3b8a 100644 --- a/paludis/resolver/resolver_functions.hh +++ b/paludis/resolver/resolver_functions.hh @@ -156,7 +156,7 @@ namespace paludis )> MakeOriginFilteredGeneratorFunction; typedef std::function<Filter ( - const std::shared_ptr<const Resolution> & + const QualifiedPackageName & )> MakeUnmaskableFilterFunction; typedef std::function<Tribool ( |