aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-11-03 19:43:42 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-11-03 19:43:42 +0000
commitebeee03e8d424be339f65214e5d6fe6af67f9127 (patch)
tree57e089cf374ad6f90030bb78741db38555fbb74e
parentc90b93fa743f498a07e9620229a9050ffecf6d00 (diff)
downloadpaludis-ebeee03e8d424be339f65214e5d6fe6af67f9127.tar.gz
paludis-ebeee03e8d424be339f65214e5d6fe6af67f9127.tar.xz
Origin FGs don't need a resolution
-rw-r--r--paludis/resolver/decider.cc7
-rw-r--r--paludis/resolver/decider.hh3
-rw-r--r--paludis/resolver/make_origin_filtered_generator_helper.cc4
-rw-r--r--paludis/resolver/make_origin_filtered_generator_helper.hh4
-rw-r--r--paludis/resolver/resolver_functions.hh3
5 files changed, 7 insertions, 14 deletions
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index f7d2c12..60d7f79 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -499,10 +499,9 @@ Decider::_make_destination_filtered_generator(const Generator & g,
}
FilteredGenerator
-Decider::_make_origin_filtered_generator(const Generator & g,
- const std::shared_ptr<const Resolution> & resolution) const
+Decider::_make_origin_filtered_generator(const Generator & g) const
{
- return _imp->fns.make_origin_filtered_generator_fn()(g, resolution);
+ return _imp->fns.make_origin_filtered_generator_fn()(g);
}
Filter
@@ -1827,7 +1826,7 @@ Decider::_find_installable_id_candidates_for(
const bool include_unmaskable) const
{
return (*_imp->env)[selection::AllVersionsSorted(
- _make_origin_filtered_generator(generator::Package(resolution->resolvent().package()), resolution) |
+ _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())
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index 4cab575..a3490fd 100644
--- a/paludis/resolver/decider.hh
+++ b/paludis/resolver/decider.hh
@@ -180,8 +180,7 @@ namespace paludis
const std::shared_ptr<const Resolution> &) const;
FilteredGenerator _make_origin_filtered_generator(
- const Generator &,
- const std::shared_ptr<const Resolution> &) const;
+ const Generator &) const;
Filter _make_unmaskable_filter(
const std::shared_ptr<const Resolution> &) const;
diff --git a/paludis/resolver/make_origin_filtered_generator_helper.cc b/paludis/resolver/make_origin_filtered_generator_helper.cc
index 1e18ed6..a397f87 100644
--- a/paludis/resolver/make_origin_filtered_generator_helper.cc
+++ b/paludis/resolver/make_origin_filtered_generator_helper.cc
@@ -96,9 +96,7 @@ namespace
}
FilteredGenerator
-MakeOriginFilteredGeneratorHelper::operator() (
- const Generator & g,
- const std::shared_ptr<const Resolution> &) const
+MakeOriginFilteredGeneratorHelper::operator() (const Generator & g) const
{
if (_imp->making_binaries)
return g | BinaryableFilter();
diff --git a/paludis/resolver/make_origin_filtered_generator_helper.hh b/paludis/resolver/make_origin_filtered_generator_helper.hh
index 2a124ee..b10d528 100644
--- a/paludis/resolver/make_origin_filtered_generator_helper.hh
+++ b/paludis/resolver/make_origin_filtered_generator_helper.hh
@@ -43,9 +43,7 @@ namespace paludis
void set_making_binaries(const bool);
- FilteredGenerator operator() (
- const Generator &,
- const std::shared_ptr<const Resolution> &) const;
+ FilteredGenerator operator() (const Generator &) const;
};
}
diff --git a/paludis/resolver/resolver_functions.hh b/paludis/resolver/resolver_functions.hh
index 87b655f..a0c7a14 100644
--- a/paludis/resolver/resolver_functions.hh
+++ b/paludis/resolver/resolver_functions.hh
@@ -152,8 +152,7 @@ namespace paludis
)> MakeDestinationFilteredGeneratorFunction;
typedef std::function<FilteredGenerator (
- const Generator &,
- const std::shared_ptr<const Resolution> &
+ const Generator &
)> MakeOriginFilteredGeneratorFunction;
typedef std::function<Filter (