aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2013-05-16 20:18:39 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2013-05-22 23:19:27 +0100
commit0174215ed434594d9288e38575a3aa41e2b10842 (patch)
tree6037c4c58a100e5a0cbca30ac7f3d911d8d57032 /src
parent78d9a9bf0758140e0e8c03c5e8d3288f74efbb51 (diff)
downloadpaludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.gz
paludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.xz
Use nullptr
Diffstat (limited to 'src')
-rw-r--r--src/clients/cave/cmd_config.cc3
-rw-r--r--src/clients/cave/cmd_contents.cc3
-rw-r--r--src/clients/cave/cmd_digest.cc3
-rw-r--r--src/clients/cave/cmd_display_resolution.cc25
-rw-r--r--src/clients/cave/cmd_execute_resolution.cc41
-rw-r--r--src/clients/cave/cmd_find_candidates.cc5
-rw-r--r--src/clients/cave/cmd_fix_linkage.cc3
-rw-r--r--src/clients/cave/cmd_generate_metadata.cc3
-rw-r--r--src/clients/cave/cmd_graph_jobs.cc2
-rw-r--r--src/clients/cave/cmd_has_version.cc3
-rw-r--r--src/clients/cave/cmd_info.cc39
-rw-r--r--src/clients/cave/cmd_match.cc3
-rw-r--r--src/clients/cave/cmd_mirror.cc3
-rw-r--r--src/clients/cave/cmd_owner.cc3
-rw-r--r--src/clients/cave/cmd_perform.cc9
-rw-r--r--src/clients/cave/cmd_print_best_version.cc3
-rw-r--r--src/clients/cave/cmd_print_dependent_ids.cc3
-rw-r--r--src/clients/cave/cmd_print_id_actions.cc3
-rw-r--r--src/clients/cave/cmd_print_id_contents.cc3
-rw-r--r--src/clients/cave/cmd_print_id_environment_variable.cc3
-rw-r--r--src/clients/cave/cmd_print_id_masks.cc3
-rw-r--r--src/clients/cave/cmd_print_id_metadata.cc3
-rw-r--r--src/clients/cave/cmd_print_ids.cc3
-rw-r--r--src/clients/cave/cmd_print_owners.cc3
-rw-r--r--src/clients/cave/cmd_print_spec.cc1
-rw-r--r--src/clients/cave/cmd_purge.cc13
-rw-r--r--src/clients/cave/cmd_report.cc5
-rw-r--r--src/clients/cave/cmd_resolve.cc3
-rw-r--r--src/clients/cave/cmd_search.cc3
-rw-r--r--src/clients/cave/cmd_show.cc25
-rw-r--r--src/clients/cave/cmd_sync.cc9
-rw-r--r--src/clients/cave/cmd_uninstall.cc15
-rw-r--r--src/clients/cave/cmd_verify.cc3
-rw-r--r--src/clients/cave/executables_common.cc3
-rw-r--r--src/clients/cave/resolve_common.cc11
-rw-r--r--src/clients/cave/size_common.cc3
36 files changed, 117 insertions, 152 deletions
diff --git a/src/clients/cave/cmd_config.cc b/src/clients/cave/cmd_config.cc
index 0877de636..8e4c94979 100644
--- a/src/clients/cave/cmd_config.cc
+++ b/src/clients/cave/cmd_config.cc
@@ -24,7 +24,6 @@
#include <paludis/args/do_help.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/environment.hh>
#include <paludis/repository.hh>
#include <paludis/user_dep_spec.hh>
@@ -96,7 +95,7 @@ ConfigCommand::run(
PackageDepSpec spec(parse_spec_with_nice_error(*cmdline.begin_parameters(), env.get(), { }, filter::SupportsAction<ConfigAction>()));
const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsUnsorted(
- generator::Matches(spec, make_null_shared_ptr(), { }) | filter::SupportsAction<ConfigAction>())]);
+ generator::Matches(spec, nullptr, { }) | filter::SupportsAction<ConfigAction>())]);
if (ids->empty())
nothing_matching_error(env.get(), *cmdline.begin_parameters(), filter::SupportsAction<ConfigAction>());
else if (1 != std::distance(ids->begin(), ids->end()))
diff --git a/src/clients/cave/cmd_contents.cc b/src/clients/cave/cmd_contents.cc
index 2122dd2dc..e893005a0 100644
--- a/src/clients/cave/cmd_contents.cc
+++ b/src/clients/cave/cmd_contents.cc
@@ -31,7 +31,6 @@
#include <paludis/util/options.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/filter.hh>
#include <paludis/generator.hh>
#include <paludis/filtered_generator.hh>
@@ -138,7 +137,7 @@ ContentsCommand::run(
{ }, filter::InstalledAtRoot(env->preferred_root_key()->parse_value())));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(spec, make_null_shared_ptr(), { })
+ (*env)[selection::AllVersionsSorted(generator::Matches(spec, nullptr, { })
| filter::InstalledAtRoot(env->preferred_root_key()->parse_value()))]);
if (entries->empty())
diff --git a/src/clients/cave/cmd_digest.cc b/src/clients/cave/cmd_digest.cc
index 3c8ea88f4..039eb1f0e 100644
--- a/src/clients/cave/cmd_digest.cc
+++ b/src/clients/cave/cmd_digest.cc
@@ -30,7 +30,6 @@
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/map.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/stringify.hh>
#include <paludis/name.hh>
@@ -116,7 +115,7 @@ DigestCommand::run(
throw args::DoHelp("digest takes exactly two parameters");
RepositoryName repo(*next(cmdline.begin_parameters()));
- Filter repo_filter(filter::Matches(make_package_dep_spec({ }).in_repository(repo), make_null_shared_ptr(), { }));
+ Filter repo_filter(filter::Matches(make_package_dep_spec({ }).in_repository(repo), nullptr, { }));
QualifiedPackageName pkg(std::string::npos == cmdline.begin_parameters()->find('/') ?
env->fetch_unique_qualified_package_name(PackageNamePart(*cmdline.begin_parameters()), repo_filter) :
QualifiedPackageName(*cmdline.begin_parameters()));
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index f6472a037..ea0549a6f 100644
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -42,7 +42,6 @@
#include <paludis/util/visitor_cast.hh>
#include <paludis/util/log.hh>
#include <paludis/util/pretty_print.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/enum_iterator.hh>
#include <paludis/resolver/resolutions_by_resolvent.hh>
@@ -311,17 +310,17 @@ namespace
const std::shared_ptr<const PackageID> visit(const UnableToMakeDecision &) const
{
- return make_null_shared_ptr();
+ return nullptr;
}
const std::shared_ptr<const PackageID> visit(const RemoveDecision &) const
{
- return make_null_shared_ptr();
+ return nullptr;
}
const std::shared_ptr<const PackageID> visit(const NothingNoChangeDecision &) const
{
- return make_null_shared_ptr();
+ return nullptr;
}
};
@@ -338,7 +337,7 @@ namespace
{
const std::shared_ptr<const PackageID> maybe_id(id_for_decision_or_null(decision));
if (maybe_id)
- return match_package(*env, spec, maybe_id, make_null_shared_ptr(), { });
+ return match_package(*env, spec, maybe_id, nullptr, { });
else
{
/* could also match slot here too */
@@ -1409,7 +1408,7 @@ namespace
cout << fuc(fs_uninstall_end());
- display_reasons(resolution, make_null_shared_ptr(), more_annotations);
+ display_reasons(resolution, nullptr, more_annotations);
if (untaken)
display_untaken_remove(decision);
if (confirmations)
@@ -1433,7 +1432,7 @@ namespace
else
cout << fuc(fs_unable_taken(), fv<'s'>(stringify(d.resolvent().package())));
- display_reasons(resolution, make_null_shared_ptr(), true);
+ display_reasons(resolution, nullptr, true);
if (untaken)
return;
@@ -1559,7 +1558,7 @@ namespace
std::pair<std::shared_ptr<const ConfirmableDecision>, std::shared_ptr<const OrdererNotes> >
get_decision_and_notes(const std::shared_ptr<const ConfirmableDecision> & d)
{
- return std::make_pair(d, make_null_shared_ptr());
+ return std::make_pair(d, nullptr);
}
std::pair<std::shared_ptr<const ConfirmableDecision>, std::shared_ptr<const OrdererNotes> >
@@ -1584,7 +1583,7 @@ namespace
cout << fuc(fs_break_id(), fv<'i'>(decision.existing_id()->canonical_form(idcf_no_name)));
cout << fuc(fs_break_by());
- display_reasons(resolution, make_null_shared_ptr(), more_annotations);
+ display_reasons(resolution, nullptr, more_annotations);
display_confirmations(decision);
}
@@ -1844,7 +1843,7 @@ namespace
{
if (! resolved->taken_unorderable_decisions()->empty())
display_a_changes_and_removes(env, resolved, resolved->taken_unorderable_decisions(),
- cmdline, choices_to_explain, false, false, false, true, make_null_shared_ptr(), already_cycle_notes);
+ cmdline, choices_to_explain, false, false, false, true, nullptr, already_cycle_notes);
}
void display_untaken_changes_and_removes(
@@ -1856,7 +1855,7 @@ namespace
{
if (! resolved->untaken_change_or_remove_decisions()->empty())
display_a_changes_and_removes(env, resolved, resolved->untaken_change_or_remove_decisions(),
- cmdline, choices_to_explain, true, false, true, false, make_null_shared_ptr(), already_cycle_notes);
+ cmdline, choices_to_explain, true, false, true, false, nullptr, already_cycle_notes);
}
void display_an_errors(
@@ -1914,7 +1913,7 @@ namespace
ChoicesToExplain ignore_choices_to_explain;
if (! resolved->taken_unconfirmed_decisions()->empty())
display_a_changes_and_removes(env, resolved, resolved->taken_unconfirmed_decisions(),
- cmdline, ignore_choices_to_explain, true, true, false, false, make_null_shared_ptr(), already_cycle_notes);
+ cmdline, ignore_choices_to_explain, true, true, false, false, nullptr, already_cycle_notes);
}
}
@@ -1971,7 +1970,7 @@ DisplayResolutionCommand::run(
const std::shared_ptr<Environment> & env,
const std::shared_ptr<const Sequence<std::string > > & args)
{
- return run(env, args, make_null_shared_ptr());
+ return run(env, args, nullptr);
}
std::shared_ptr<args::ArgsHandler>
diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc
index d3b28f6cb..54ff3300a 100644
--- a/src/clients/cave/cmd_execute_resolution.cc
+++ b/src/clients/cave/cmd_execute_resolution.cc
@@ -45,7 +45,6 @@
#include <paludis/util/wrapped_output_iterator.hh>
#include <paludis/util/executor.hh>
#include <paludis/util/timestamp.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/process.hh>
#include <paludis/resolver/resolutions_by_resolvent.hh>
#include <paludis/resolver/reason.hh>
@@ -159,7 +158,7 @@ namespace
const PackageDepSpec & spec)
{
const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::BestVersionOnly(
- generator::Matches(spec, make_null_shared_ptr(), { }))]);
+ generator::Matches(spec, nullptr, { }))]);
if (ids->empty())
return stringify(spec);
else
@@ -320,7 +319,7 @@ namespace
else
r.append(", ");
- const auto replacing_ids((*env)[selection::BestVersionOnly(generator::Matches(*i, make_null_shared_ptr(), { }))]);
+ const auto replacing_ids((*env)[selection::BestVersionOnly(generator::Matches(*i, nullptr, { }))]);
if (replacing_ids->empty())
r.append(stringify(*i));
else if (id_specs->empty() || *id_specs->begin()->package_ptr() != (*replacing_ids->begin())->name())
@@ -345,7 +344,7 @@ namespace
if (! r.empty())
r.append(", ");
- const auto ids((*env)[selection::BestVersionOnly(generator::Matches(*i, make_null_shared_ptr(), { }))]);
+ const auto ids((*env)[selection::BestVersionOnly(generator::Matches(*i, nullptr, { }))]);
if (ids->empty())
r.append(stringify(*i));
else
@@ -748,7 +747,7 @@ namespace
if (0 != env->perform_hook(Hook("pretend_all_pre")
("TARGETS", join(cmdline.begin_parameters(), cmdline.end_parameters(), " ")),
- make_null_shared_ptr()).max_exit_status())
+ nullptr).max_exit_status())
throw ActionAbortedError("Aborted by hook");
for (JobList<PretendJob>::ConstIterator c(lists->pretend_job_list()->begin()),
@@ -772,7 +771,7 @@ namespace
if (0 != env->perform_hook(Hook("pretend_all_post")
("TARGETS", join(cmdline.begin_parameters(), cmdline.end_parameters(), " ")),
- make_null_shared_ptr()).max_exit_status())
+ nullptr).max_exit_status())
throw ActionAbortedError("Aborted by hook");
return failed ? 1 : 0;
@@ -947,7 +946,7 @@ namespace
case x1_pre:
{
++counts.x_installs;
- starting_action(env, "remove", uninstall_item.ids_to_remove_specs(), make_null_shared_ptr(), counts.x_installs, counts.y_installs,
+ starting_action(env, "remove", uninstall_item.ids_to_remove_specs(), nullptr, counts.x_installs, counts.y_installs,
counts.f_installs, counts.s_installs);
}
break;
@@ -979,7 +978,7 @@ namespace
break;
case x1_post:
- done_action(env, "remove", uninstall_item.ids_to_remove_specs(), make_null_shared_ptr(), 0 == retcode);
+ done_action(env, "remove", uninstall_item.ids_to_remove_specs(), nullptr, 0 == retcode);
break;
}
@@ -993,7 +992,7 @@ namespace
case x1_pre:
{
++counts.x_fetches;
- starting_action(env, "fetch", ensequence(fetch_item.origin_id_spec()), make_null_shared_ptr(), counts.x_fetches, counts.y_fetches,
+ starting_action(env, "fetch", ensequence(fetch_item.origin_id_spec()), nullptr, counts.x_fetches, counts.y_fetches,
counts.f_fetches, counts.s_fetches);
}
break;
@@ -1021,7 +1020,7 @@ namespace
break;
case x1_post:
- done_action(env, "fetch", ensequence(fetch_item.origin_id_spec()), make_null_shared_ptr(), 0 == retcode);
+ done_action(env, "fetch", ensequence(fetch_item.origin_id_spec()), nullptr, 0 == retcode);
break;
}
@@ -1210,12 +1209,12 @@ namespace
const std::shared_ptr<OutputManager> visit(const JobSkippedState &) const
{
- return make_null_shared_ptr();
+ return nullptr;
}
const std::shared_ptr<OutputManager> visit(const JobPendingState &) const
{
- return make_null_shared_ptr();
+ return nullptr;
}
};
@@ -1526,7 +1525,7 @@ namespace
if (0 != env->perform_hook(Hook("install_all_pre")
("TARGETS", join(cmdline.begin_parameters(), cmdline.end_parameters(), " ")),
- make_null_shared_ptr()).max_exit_status())
+ nullptr).max_exit_status())
throw ActionAbortedError("Aborted by hook");
JobRequirementIf require_if(last_jri);
@@ -1556,7 +1555,7 @@ namespace
if (0 != env->perform_hook(Hook("install_all_post")
("TARGETS", join(cmdline.begin_parameters(), cmdline.end_parameters(), " ")),
- make_null_shared_ptr()).max_exit_status())
+ nullptr).max_exit_status())
throw ActionAbortedError("Aborted by hook");
return retcode;
@@ -1609,7 +1608,7 @@ namespace
std::string r;
if (! j.replacing_specs()->empty())
{
- const auto origin_ids((*env)[selection::BestVersionOnly(generator::Matches(j.origin_id_spec(), make_null_shared_ptr(), { }))]);
+ const auto origin_ids((*env)[selection::BestVersionOnly(generator::Matches(j.origin_id_spec(), nullptr, { }))]);
for (auto i(j.replacing_specs()->begin()), i_end(j.replacing_specs()->end()) ;
i != i_end ; ++i)
@@ -1619,7 +1618,7 @@ namespace
else
r.append(", ");
- const auto ids((*env)[selection::BestVersionOnly(generator::Matches(*i, make_null_shared_ptr(), { }))]);
+ const auto ids((*env)[selection::BestVersionOnly(generator::Matches(*i, nullptr, { }))]);
if (ids->empty())
r.append(stringify(*i));
else if (origin_ids->empty() || (*origin_ids->begin())->name() != (*ids->begin())->name())
@@ -1718,7 +1717,7 @@ namespace
c != c_end ; ++c)
{
(*c)->state()->accept(SummaryDisplayer(env, *c, something_failed, done_heading));
- (*c)->set_state(make_null_shared_ptr());
+ (*c)->set_state(nullptr);
}
}
@@ -1733,7 +1732,7 @@ namespace
int retcode(0);
if (0 != env->perform_hook(Hook("install_task_execute_pre")
("TARGETS", join(cmdline.begin_parameters(), cmdline.end_parameters(), " ")),
- make_null_shared_ptr()).max_exit_status())
+ nullptr).max_exit_status())
throw ActionAbortedError("Aborted by hook");
try
@@ -1752,7 +1751,7 @@ namespace
("TARGETS", join(cmdline.begin_parameters(), cmdline.end_parameters(), " "))
("PRETEND", stringify(cmdline.a_pretend.specified()))
("SUCCESS", stringify(false)),
- make_null_shared_ptr()).max_exit_status())
+ nullptr).max_exit_status())
throw ActionAbortedError("Aborted by hook");
throw;
}
@@ -1767,7 +1766,7 @@ namespace
("TARGETS", join(cmdline.begin_parameters(), cmdline.end_parameters(), " "))
("PRETEND", stringify(cmdline.a_pretend.specified()))
("SUCCESS", stringify(true)),
- make_null_shared_ptr()).max_exit_status())
+ nullptr).max_exit_status())
throw ActionAbortedError("Aborted by hook");
return retcode;
@@ -1822,7 +1821,7 @@ ExecuteResolutionCommand::run(
const std::shared_ptr<Environment> & env,
const std::shared_ptr<const Sequence<std::string > > & args)
{
- return run(env, args, make_null_shared_ptr());
+ return run(env, args, nullptr);
}
std::shared_ptr<args::ArgsHandler>
diff --git a/src/clients/cave/cmd_find_candidates.cc b/src/clients/cave/cmd_find_candidates.cc
index 21db9b8e4..1e278d461 100644
--- a/src/clients/cave/cmd_find_candidates.cc
+++ b/src/clients/cave/cmd_find_candidates.cc
@@ -42,7 +42,6 @@
#include <paludis/util/make_shared_copy.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/visitor_cast.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/stringify.hh>
#include <cstdlib>
@@ -194,7 +193,7 @@ FindCandidatesCommand::run_hosted(
for (auto m(matches.begin()), m_end(matches.end()) ;
m != m_end ; ++m)
if (match_package(*env, *m, *(*env)[selection::RequireExactlyOne(generator::Matches(
- parse_user_package_dep_spec(*s, env.get(), { }), make_null_shared_ptr(), { }))]->begin(), make_null_shared_ptr(), { }))
+ parse_user_package_dep_spec(*s, env.get(), { }), nullptr, { }))]->begin(), nullptr, { }))
{
ok = true;
break;
@@ -311,7 +310,7 @@ FindCandidatesCommand::run_hosted(
k_end(search_options.a_matching.end_args()) ;
k != k_end ; ++k)
{
- generator::Matches m(parse_user_package_dep_spec(*k, env.get(), { updso_allow_wildcards }), make_null_shared_ptr(), { });
+ generator::Matches m(parse_user_package_dep_spec(*k, env.get(), { updso_allow_wildcards }), nullptr, { });
if (match_generator)
match_generator = std::make_shared<generator::Union>(*match_generator, m);
diff --git a/src/clients/cave/cmd_fix_linkage.cc b/src/clients/cave/cmd_fix_linkage.cc
index de4fd0c41..9bb8efa5f 100644
--- a/src/clients/cave/cmd_fix_linkage.cc
+++ b/src/clients/cave/cmd_fix_linkage.cc
@@ -26,7 +26,6 @@
#include <paludis/util/stringify.hh>
#include <paludis/util/join.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/create_iterator-impl.hh>
#include <paludis/util/log.hh>
#include <paludis/broken_linkage_finder.hh>
@@ -259,7 +258,7 @@ FixLinkageCommand::run(
resolve_cmdline.display_options,
resolve_cmdline.graph_jobs_options,
resolve_cmdline.program_options,
- make_null_shared_ptr(), targets, make_null_shared_ptr(), false);
+ nullptr, targets, nullptr, false);
}
std::shared_ptr<args::ArgsHandler>
diff --git a/src/clients/cave/cmd_generate_metadata.cc b/src/clients/cave/cmd_generate_metadata.cc
index fde43b930..e2b9e630c 100644
--- a/src/clients/cave/cmd_generate_metadata.cc
+++ b/src/clients/cave/cmd_generate_metadata.cc
@@ -28,7 +28,6 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/visitor_cast.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/accept_visitor.hh>
#include <paludis/util/thread_pool.hh>
#include <paludis/util/stringify.hh>
@@ -294,7 +293,7 @@ GenerateMetadataCommand::run(
m != m_end ; ++m)
{
PackageDepSpec s(parse_user_package_dep_spec(*m, env.get(), { updso_allow_wildcards }));
- g = g & generator::Matches(s, make_null_shared_ptr(), { });
+ g = g & generator::Matches(s, nullptr, { });
}
}
diff --git a/src/clients/cave/cmd_graph_jobs.cc b/src/clients/cave/cmd_graph_jobs.cc
index 5583422b7..c01cfc114 100644
--- a/src/clients/cave/cmd_graph_jobs.cc
+++ b/src/clients/cave/cmd_graph_jobs.cc
@@ -261,7 +261,7 @@ GraphJobsCommand::run(
const std::shared_ptr<Environment> & env,
const std::shared_ptr<const Sequence<std::string > > & args)
{
- return run(env, args, make_null_shared_ptr());
+ return run(env, args, nullptr);
}
std::shared_ptr<args::ArgsHandler>
diff --git a/src/clients/cave/cmd_has_version.cc b/src/clients/cave/cmd_has_version.cc
index 451cf325a..2bf5210a2 100644
--- a/src/clients/cave/cmd_has_version.cc
+++ b/src/clients/cave/cmd_has_version.cc
@@ -28,7 +28,6 @@
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/visitor_cast.hh>
#include <paludis/util/map.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/generator.hh>
#include <paludis/filtered_generator.hh>
#include <paludis/filter.hh>
@@ -96,7 +95,7 @@ HasVersionCommand::run(
throw args::DoHelp("has-version takes exactly one parameter");
auto s(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), { }));
- auto ids((*env)[selection::BestVersionOnly(generator::Matches(s, make_null_shared_ptr(), { }) | filter::InstalledAtRoot(
+ auto ids((*env)[selection::BestVersionOnly(generator::Matches(s, nullptr, { }) | filter::InstalledAtRoot(
env->preferred_root_key()->parse_value()))]);
if (ids->empty())
diff --git a/src/clients/cave/cmd_info.cc b/src/clients/cave/cmd_info.cc
index 62ae30db4..e193b372d 100644
--- a/src/clients/cave/cmd_info.cc
+++ b/src/clients/cave/cmd_info.cc
@@ -43,7 +43,6 @@
#include <paludis/util/visitor_cast.hh>
#include <paludis/util/pretty_print.hh>
#include <paludis/util/timestamp.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/join.hh>
#include <paludis/action.hh>
@@ -165,31 +164,31 @@ namespace
void visit(const MetadataCollectionKey<KeywordNameSet> & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(k.pretty_print_value(printer, { })));
}
void visit(const MetadataCollectionKey<Set<std::string> > & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(k.pretty_print_value(printer, { })));
}
void visit(const MetadataCollectionKey<Map<std::string, std::string> > & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(k.pretty_print_value(printer, { })));
}
void visit(const MetadataCollectionKey<Sequence<std::string> > & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(k.pretty_print_value(printer, { })));
}
void visit(const MetadataCollectionKey<PackageIDSequence> & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(k.pretty_print_value(printer, { })));
}
@@ -207,73 +206,73 @@ namespace
void visit(const MetadataSpecTreeKey<LicenseSpecTree> & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(k.pretty_print_value(printer, { })));
}
void visit(const MetadataSpecTreeKey<SimpleURISpecTree> & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(k.pretty_print_value(printer, { })));
}
void visit(const MetadataSpecTreeKey<PlainTextSpecTree> & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(k.pretty_print_value(printer, { })));
}
void visit(const MetadataSpecTreeKey<RequiredUseSpecTree> & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(k.pretty_print_value(printer, { })));
}
void visit(const MetadataSpecTreeKey<FetchableURISpecTree> & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(k.pretty_print_value(printer, { })));
}
void visit(const MetadataSpecTreeKey<DependencySpecTree> & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(k.pretty_print_value(printer, { })));
}
void visit(const MetadataValueKey<std::string> & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(stringify(k.parse_value())));
}
void visit(const MetadataValueKey<Slot> & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(stringify(k.parse_value().raw_value())));
}
void visit(const MetadataValueKey<long> & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(stringify(k.parse_value())));
}
void visit(const MetadataValueKey<bool> & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(stringify(k.parse_value())));
}
void visit(const MetadataValueKey<FSPath> & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(stringify(k.parse_value())));
}
void visit(const MetadataValueKey<std::shared_ptr<const PackageID> > & k)
{
- ColourPrettyPrinter printer(env, make_null_shared_ptr(), indent);
+ ColourPrettyPrinter printer(env, nullptr, indent);
cout << fuc(fs_metadata(), fv<'h'>(k.human_name()), fv<'i'>(std::string(indent, ' ')), fv<'s'>(stringify(*k.parse_value())));
}
@@ -373,9 +372,9 @@ namespace
PackageDepSpec spec(parse_spec_with_nice_error(param, env.get(), { }, filter::All()));
const std::shared_ptr<const PackageIDSequence> installed_ids((*env)[selection::AllVersionsSorted(generator::Matches(
- spec, make_null_shared_ptr(), { }) | filter::InstalledAtRoot(env->preferred_root_key()->parse_value()))]);
+ spec, nullptr, { }) | filter::InstalledAtRoot(env->preferred_root_key()->parse_value()))]);
const std::shared_ptr<const PackageIDSequence> installable_ids((*env)[selection::BestVersionOnly(generator::Matches(
- spec, make_null_shared_ptr(), { }) | filter::SupportsAction<InstallAction>() | filter::NotMasked())]);
+ spec, nullptr, { }) | filter::SupportsAction<InstallAction>() | filter::NotMasked())]);
if (installed_ids->empty() && installable_ids->empty())
nothing_matching_error(env.get(), param, filter::InstalledAtRoot(env->preferred_root_key()->parse_value()));
diff --git a/src/clients/cave/cmd_match.cc b/src/clients/cave/cmd_match.cc
index e6e6e55a5..f20a4f04c 100644
--- a/src/clients/cave/cmd_match.cc
+++ b/src/clients/cave/cmd_match.cc
@@ -32,7 +32,6 @@
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/singleton-impl.hh>
#include <paludis/util/accept_visitor.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/log.hh>
#include <paludis/generator.hh>
#include <paludis/filtered_generator.hh>
@@ -423,7 +422,7 @@ MatchCommand::run_hosted(
std::shared_ptr<const PackageID> id;
try
{
- id = (*((*env)[selection::RequireExactlyOne(generator::Matches(spec, make_null_shared_ptr(), { }))])->begin());
+ id = (*((*env)[selection::RequireExactlyOne(generator::Matches(spec, nullptr, { }))])->begin());
}
catch (const DidNotGetExactlyOneError & e)
{
diff --git a/src/clients/cave/cmd_mirror.cc b/src/clients/cave/cmd_mirror.cc
index f51560916..cead6747d 100644
--- a/src/clients/cave/cmd_mirror.cc
+++ b/src/clients/cave/cmd_mirror.cc
@@ -31,7 +31,6 @@
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/map.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/stringify.hh>
#include <paludis/name.hh>
@@ -130,7 +129,7 @@ MirrorCommand::run(
m != m_end ; ++m)
{
PackageDepSpec s(parse_user_package_dep_spec(*m, env.get(), { updso_allow_wildcards }));
- g = g & generator::Matches(s, make_null_shared_ptr(), { });
+ g = g & generator::Matches(s, nullptr, { });
}
}
diff --git a/src/clients/cave/cmd_owner.cc b/src/clients/cave/cmd_owner.cc
index 244b8da9e..5d582cd6f 100644
--- a/src/clients/cave/cmd_owner.cc
+++ b/src/clients/cave/cmd_owner.cc
@@ -31,7 +31,6 @@
#include <paludis/filter.hh>
#include <paludis/user_dep_spec.hh>
#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/stringify.hh>
@@ -122,7 +121,7 @@ OwnerCommand::run(
m != m_end ; ++m)
{
PackageDepSpec s(parse_user_package_dep_spec(*m, env.get(), { updso_allow_wildcards }));
- matches = filter::And(matches, filter::Matches(s, make_null_shared_ptr(), { }));
+ matches = filter::And(matches, filter::Matches(s, nullptr, { }));
}
}
diff --git a/src/clients/cave/cmd_perform.cc b/src/clients/cave/cmd_perform.cc
index 4981e41e6..96b6eba12 100644
--- a/src/clients/cave/cmd_perform.cc
+++ b/src/clients/cave/cmd_perform.cc
@@ -42,7 +42,6 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/iterator_funcs.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/stringify.hh>
#include <cstdlib>
#include <iostream>
@@ -414,7 +413,7 @@ PerformCommand::run(
const auto spec_str(*next(cmdline.begin_parameters()));
const auto spec(parse_spec_with_nice_error(spec_str, env.get(), { }, filter::All()));
- const auto ids((*env)[selection::AllVersionsUnsorted(generator::Matches(spec, make_null_shared_ptr(), { }))]);
+ const auto ids((*env)[selection::AllVersionsUnsorted(generator::Matches(spec, nullptr, { }))]);
if (ids->empty())
nothing_matching_error(env.get(), spec_str, filter::All());
else if (1 != std::distance(ids->begin(), ids->end()))
@@ -434,7 +433,7 @@ PerformCommand::run(
p != p_end ; ++p)
{
PackageDepSpec rspec(parse_spec_with_nice_error(*p, env.get(), { }, filter::All()));
- const std::shared_ptr<const PackageIDSequence> rids((*env)[selection::AllVersionsUnsorted(generator::Matches(rspec, make_null_shared_ptr(), { }))]);
+ const std::shared_ptr<const PackageIDSequence> rids((*env)[selection::AllVersionsUnsorted(generator::Matches(rspec, nullptr, { }))]);
if (rids->empty())
nothing_matching_error(env.get(), *p, filter::All());
else if (1 != std::distance(rids->begin(), rids->end()))
@@ -591,11 +590,11 @@ PerformCommand::run(
WantInstallPhase want_phase(cmdline, output_manager_holder);
UninstallActionOptions options(make_named_values<UninstallActionOptions>(
n::config_protect() = cmdline.a_config_protect.argument(),
- n::if_for_install_id() = make_null_shared_ptr(),
+ n::if_for_install_id() = nullptr,
n::ignore_for_unmerge() = &ignore_nothing,
n::is_overwrite() = false,
n::make_output_manager() = std::ref(output_manager_holder),
- n::override_contents() = make_null_shared_ptr(),
+ n::override_contents() = nullptr,
n::want_phase() = want_phase
));
UninstallAction uninstall_action(options);
diff --git a/src/clients/cave/cmd_print_best_version.cc b/src/clients/cave/cmd_print_best_version.cc
index 699c40627..41d115aed 100644
--- a/src/clients/cave/cmd_print_best_version.cc
+++ b/src/clients/cave/cmd_print_best_version.cc
@@ -28,7 +28,6 @@
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/visitor_cast.hh>
#include <paludis/util/map.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/generator.hh>
#include <paludis/filtered_generator.hh>
#include <paludis/filter.hh>
@@ -108,7 +107,7 @@ PrintBestVersionCommand::run(
throw args::DoHelp("print-best-version takes exactly one parameter");
auto s(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), { }));
- auto ids((*env)[selection::BestVersionOnly(generator::Matches(s, make_null_shared_ptr(), { }) | filter::InstalledAtRoot(
+ auto ids((*env)[selection::BestVersionOnly(generator::Matches(s, nullptr, { }) | filter::InstalledAtRoot(
env->preferred_root_key()->parse_value()))]);
if (ids->empty())
diff --git a/src/clients/cave/cmd_print_dependent_ids.cc b/src/clients/cave/cmd_print_dependent_ids.cc
index 441ea0114..d1fbad7b4 100644
--- a/src/clients/cave/cmd_print_dependent_ids.cc
+++ b/src/clients/cave/cmd_print_dependent_ids.cc
@@ -31,7 +31,6 @@
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/visitor_cast.hh>
#include <paludis/util/map.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/stringify.hh>
#include <paludis/resolver/collect_depped_upon.hh>
#include <paludis/generator.hh>
@@ -115,7 +114,7 @@ PrintDependentIDsCommand::run(
auto installed_filter(filter::InstalledAtRoot(env->system_root_key()->parse_value()));
auto spec(parse_spec_with_nice_error(*cmdline.begin_parameters(), env.get(), { }, installed_filter));
auto ids((*env)[selection::AllVersionsSorted(
- generator::Matches(spec, make_null_shared_ptr(), { }) |
+ generator::Matches(spec, nullptr, { }) |
installed_filter)]);
if (ids->empty())
diff --git a/src/clients/cave/cmd_print_id_actions.cc b/src/clients/cave/cmd_print_id_actions.cc
index 76678d037..aab4d9c3a 100644
--- a/src/clients/cave/cmd_print_id_actions.cc
+++ b/src/clients/cave/cmd_print_id_actions.cc
@@ -24,7 +24,6 @@
#include <paludis/util/set.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/environment.hh>
#include <paludis/user_dep_spec.hh>
#include <paludis/filtered_generator.hh>
@@ -108,7 +107,7 @@ PrintIDActionsCommand::run(
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), { updso_allow_wildcards }));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(spec, make_null_shared_ptr(), { }))]);
+ (*env)[selection::AllVersionsSorted(generator::Matches(spec, nullptr, { }))]);
if (entries->empty())
throw NothingMatching(spec);
diff --git a/src/clients/cave/cmd_print_id_contents.cc b/src/clients/cave/cmd_print_id_contents.cc
index 83f6a095c..e7d0aad13 100644
--- a/src/clients/cave/cmd_print_id_contents.cc
+++ b/src/clients/cave/cmd_print_id_contents.cc
@@ -29,7 +29,6 @@
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/options.hh>
#include <paludis/util/sequence.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/filter.hh>
#include <paludis/generator.hh>
#include <paludis/filtered_generator.hh>
@@ -161,7 +160,7 @@ PrintIDContentsCommand::run(
{ updso_allow_wildcards }, filter::InstalledAtRoot(env->preferred_root_key()->parse_value())));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(spec, make_null_shared_ptr(), { }) |
+ (*env)[selection::AllVersionsSorted(generator::Matches(spec, nullptr, { }) |
filter::InstalledAtRoot(env->preferred_root_key()->parse_value()))]);
if (entries->empty())
diff --git a/src/clients/cave/cmd_print_id_environment_variable.cc b/src/clients/cave/cmd_print_id_environment_variable.cc
index 2e2d89873..487b9d609 100644
--- a/src/clients/cave/cmd_print_id_environment_variable.cc
+++ b/src/clients/cave/cmd_print_id_environment_variable.cc
@@ -24,7 +24,6 @@
#include <paludis/args/args.hh>
#include <paludis/args/do_help.hh>
#include <paludis/util/map.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/environment.hh>
#include <paludis/user_dep_spec.hh>
#include <paludis/filtered_generator.hh>
@@ -134,7 +133,7 @@ PrintIDEnvironmentVariableCommand::run(
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), { updso_allow_wildcards }));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(spec, make_null_shared_ptr(), { }))]);
+ (*env)[selection::AllVersionsSorted(generator::Matches(spec, nullptr, { }))]);
if (entries->empty())
throw NothingMatching(spec);
diff --git a/src/clients/cave/cmd_print_id_masks.cc b/src/clients/cave/cmd_print_id_masks.cc
index 4cc9227f6..02f735e7d 100644
--- a/src/clients/cave/cmd_print_id_masks.cc
+++ b/src/clients/cave/cmd_print_id_masks.cc
@@ -29,7 +29,6 @@
#include <paludis/util/options.hh>
#include <paludis/util/map.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/environment.hh>
#include <paludis/metadata_key.hh>
#include <paludis/user_dep_spec.hh>
@@ -185,7 +184,7 @@ PrintIDMasksCommand::run(
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), { updso_allow_wildcards }));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(spec, make_null_shared_ptr(), { }))]);
+ (*env)[selection::AllVersionsSorted(generator::Matches(spec, nullptr, { }))]);
if (entries->empty())
throw NothingMatching(spec);
diff --git a/src/clients/cave/cmd_print_id_metadata.cc b/src/clients/cave/cmd_print_id_metadata.cc
index 3068ea462..139c4403d 100644
--- a/src/clients/cave/cmd_print_id_metadata.cc
+++ b/src/clients/cave/cmd_print_id_metadata.cc
@@ -26,7 +26,6 @@
#include <paludis/util/set.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/options.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/environment.hh>
#include <paludis/metadata_key.hh>
#include <paludis/user_dep_spec.hh>
@@ -152,7 +151,7 @@ PrintIDMetadataCommand::run(
PackageDepSpec spec(parse_user_package_dep_spec(*cmdline.begin_parameters(), env.get(), { updso_allow_wildcards }));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(spec, make_null_shared_ptr(), { }))]);
+ (*env)[selection::AllVersionsSorted(generator::Matches(spec, nullptr, { }))]);
if (entries->empty())
throw NothingMatching(spec);
diff --git a/src/clients/cave/cmd_print_ids.cc b/src/clients/cave/cmd_print_ids.cc
index 9f682aee7..0dc3d57d7 100644
--- a/src/clients/cave/cmd_print_ids.cc
+++ b/src/clients/cave/cmd_print_ids.cc
@@ -29,7 +29,6 @@
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/visitor_cast.hh>
#include <paludis/util/map.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/stringify.hh>
#include <paludis/generator.hh>
#include <paludis/filtered_generator.hh>
@@ -268,7 +267,7 @@ PrintIDsCommand::run(
m != m_end ; ++m)
{
PackageDepSpec s(parse_user_package_dep_spec(*m, env.get(), { updso_allow_wildcards }));
- g = g & generator::Matches(s, make_null_shared_ptr(), { });
+ g = g & generator::Matches(s, nullptr, { });
}
}
diff --git a/src/clients/cave/cmd_print_owners.cc b/src/clients/cave/cmd_print_owners.cc
index c9f5603a7..f70d00bed 100644
--- a/src/clients/cave/cmd_print_owners.cc
+++ b/src/clients/cave/cmd_print_owners.cc
@@ -29,7 +29,6 @@
#include <paludis/metadata_key.hh>
#include <paludis/package_id.hh>
#include <paludis/user_dep_spec.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/map.hh>
#include <paludis/util/stringify.hh>
#include <paludis/version_spec.hh>
@@ -128,7 +127,7 @@ PrintOwnersCommand::run(
m != m_end ; ++m)
{
PackageDepSpec s(parse_user_package_dep_spec(*m, env.get(), { updso_allow_wildcards }));
- matches = filter::And(matches, filter::Matches(s, make_null_shared_ptr(), { }));
+ matches = filter::And(matches, filter::Matches(s, nullptr, { }));
}
}
diff --git a/src/clients/cave/cmd_print_spec.cc b/src/clients/cave/cmd_print_spec.cc
index 11b7824d1..399e848ab 100644
--- a/src/clients/cave/cmd_print_spec.cc
+++ b/src/clients/cave/cmd_print_spec.cc
@@ -28,7 +28,6 @@
#include <paludis/util/options.hh>
#include <paludis/util/map.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/join.hh>
#include <paludis/util/make_named_values.hh>
diff --git a/src/clients/cave/cmd_purge.cc b/src/clients/cave/cmd_purge.cc
index 1a252bac0..4e664cba3 100644
--- a/src/clients/cave/cmd_purge.cc
+++ b/src/clients/cave/cmd_purge.cc
@@ -24,7 +24,6 @@
#include <paludis/args/do_help.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/user_dep_spec.hh>
#include <paludis/selection.hh>
#include <paludis/generator.hh>
@@ -55,11 +54,11 @@ namespace
std::shared_ptr<ResolveCommandLineProgramOptions> program_options;
PurgeCommandLine(const bool for_docs) :
- resolution_options(for_docs ? make_null_shared_ptr() : std::make_shared<ResolveCommandLineResolutionOptions>(this)),
- execution_options(for_docs ? make_null_shared_ptr() : std::make_shared<ResolveCommandLineExecutionOptions>(this)),
- display_options(for_docs ? make_null_shared_ptr() : std::make_shared<ResolveCommandLineDisplayOptions>(this)),
- graph_jobs_options(for_docs ? make_null_shared_ptr() : std::make_shared<ResolveCommandLineGraphJobsOptions>(this)),
- program_options(for_docs ? make_null_shared_ptr() : std::make_shared<ResolveCommandLineProgramOptions>(this))
+ resolution_options(for_docs ? nullptr : std::make_shared<ResolveCommandLineResolutionOptions>(this)),
+ execution_options(for_docs ? nullptr : std::make_shared<ResolveCommandLineExecutionOptions>(this)),
+ display_options(for_docs ? nullptr : std::make_shared<ResolveCommandLineDisplayOptions>(this)),
+ graph_jobs_options(for_docs ? nullptr : std::make_shared<ResolveCommandLineGraphJobsOptions>(this)),
+ program_options(for_docs ? nullptr : std::make_shared<ResolveCommandLineProgramOptions>(this))
{
add_usage_line("[ -x|--execute ]");
add_note("All options available for 'cave resolve' are also permitted. See 'man cave-resolve' for details.");
@@ -108,7 +107,7 @@ PurgeCommand::run(
cmdline.resolution_options->a_purge.add_argument("*/*");
return resolve_common(env, *cmdline.resolution_options, *cmdline.execution_options, *cmdline.display_options,
- *cmdline.graph_jobs_options, *cmdline.program_options, make_null_shared_ptr(), make_null_shared_ptr(), make_null_shared_ptr(), true);
+ *cmdline.graph_jobs_options, *cmdline.program_options, nullptr, nullptr, nullptr, true);
}
std::shared_ptr<args::ArgsHandler>
diff --git a/src/clients/cave/cmd_report.cc b/src/clients/cave/cmd_report.cc
index b584d764d..11340fbe4 100644
--- a/src/clients/cave/cmd_report.cc
+++ b/src/clients/cave/cmd_report.cc
@@ -46,7 +46,6 @@
#include <paludis/util/wrapped_output_iterator.hh>
#include <paludis/util/visitor_cast.hh>
#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/accept_visitor.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/stringify.hh>
@@ -112,7 +111,7 @@ namespace
.version_requirement(make_named_values<VersionRequirement>(
n::version_operator() = vo_equal,
n::version_spec() = id->version())),
- make_null_shared_ptr(), { })) |
+ nullptr, { })) |
filter::SupportsAction<InstallAction>())]);
if (! ids->empty())
@@ -120,7 +119,7 @@ namespace
}
}
- return make_null_shared_ptr();
+ return nullptr;
}
void need_heading(
diff --git a/src/clients/cave/cmd_resolve.cc b/src/clients/cave/cmd_resolve.cc
index e0a7f2a4c..01680e58c 100644
--- a/src/clients/cave/cmd_resolve.cc
+++ b/src/clients/cave/cmd_resolve.cc
@@ -20,7 +20,6 @@
#include "cmd_resolve.hh"
#include "resolve_cmdline.hh"
#include "resolve_common.hh"
-#include <paludis/util/make_null_shared_ptr.hh>
#include <iostream>
#include <cstdlib>
@@ -98,7 +97,7 @@ ResolveCommand::run(
targets->push_back(std::make_pair(*p, ""));
return resolve_common(env, cmdline.resolution_options, cmdline.execution_options, cmdline.display_options,
- cmdline.graph_jobs_options, cmdline.program_options, make_null_shared_ptr(), targets, make_null_shared_ptr(), false);
+ cmdline.graph_jobs_options, cmdline.program_options, nullptr, targets, nullptr, false);
}
std::shared_ptr<args::ArgsHandler>
diff --git a/src/clients/cave/cmd_search.cc b/src/clients/cave/cmd_search.cc
index 9b87f89a7..89f5b038d 100644
--- a/src/clients/cave/cmd_search.cc
+++ b/src/clients/cave/cmd_search.cc
@@ -46,7 +46,6 @@
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/wrapped_output_iterator.hh>
#include <paludis/util/iterator_funcs.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/stringify.hh>
#include <cstdlib>
@@ -115,7 +114,7 @@ namespace
const PackageDepSpec & spec)
{
const std::shared_ptr<const PackageID> id(*((*env)[selection::RequireExactlyOne(
- generator::Matches(spec, make_null_shared_ptr(), { }))])->begin());
+ generator::Matches(spec, nullptr, { }))])->begin());
result->insert(id->name());
}
diff --git a/src/clients/cave/cmd_show.cc b/src/clients/cave/cmd_show.cc
index 6ad9d35e5..398f97339 100644
--- a/src/clients/cave/cmd_show.cc
+++ b/src/clients/cave/cmd_show.cc
@@ -43,7 +43,6 @@
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/pretty_print.hh>
#include <paludis/util/timestamp.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/accept_visitor.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/join.hh>
@@ -195,7 +194,7 @@ namespace
annotations << m->key() << " = [" << (m->value().empty() ? " " : " " + m->value() + " ") << "] ";
}
- out << fuc(select_format_for_spec(env, *node.spec(), make_null_shared_ptr(),
+ out << fuc(select_format_for_spec(env, *node.spec(), nullptr,
fs_set_spec_installed(),
fs_set_spec_installable(),
fs_set_spec_unavailable()),
@@ -246,7 +245,7 @@ namespace
{
cout << fuc(fs_wildcard_heading(), fv<'s'>(stringify(s)));
- const std::shared_ptr<const PackageIDSequence> names((*env)[selection::BestVersionOnly(generator::Matches(s, make_null_shared_ptr(), { }))]);
+ const std::shared_ptr<const PackageIDSequence> names((*env)[selection::BestVersionOnly(generator::Matches(s, nullptr, { }))]);
if (names->empty())
throw NothingMatching(s);
@@ -254,7 +253,7 @@ namespace
i != i_end ; ++i)
{
PackageDepSpec name_spec(make_package_dep_spec({ }).package((*i)->name()));
- cout << fuc(select_format_for_spec(env, name_spec, make_null_shared_ptr(),
+ cout << fuc(select_format_for_spec(env, name_spec, nullptr,
fs_wildcard_spec_installed(),
fs_wildcard_spec_installable(),
fs_wildcard_spec_unavailable()
@@ -1002,7 +1001,7 @@ namespace
{
if (! m.unaccepted_key_name().empty())
{
- InfoDisplayer i(env, cmdline, basic_ppos, indent, false, make_null_shared_ptr(), make_null_shared_ptr(), false, out);
+ InfoDisplayer i(env, cmdline, basic_ppos, indent, false, nullptr, nullptr, false, out);
(*id->find_metadata(m.unaccepted_key_name()))->accept(i);
}
else
@@ -1078,8 +1077,8 @@ namespace
for (std::set<std::shared_ptr<const MetadataKey>, MetadataKeyComparator>::const_iterator
k(keys.begin()), k_end(keys.end()) ; k != k_end ; ++k)
{
- InfoDisplayer i(env, cmdline, basic_ppos, 0, ((*k)->type() == mkt_significant), make_null_shared_ptr(), make_null_shared_ptr(), false, cout);
- if (want_key(cmdline, *k, make_null_shared_ptr()))
+ InfoDisplayer i(env, cmdline, basic_ppos, 0, ((*k)->type() == mkt_significant), nullptr, nullptr, false, cout);
+ if (want_key(cmdline, *k, nullptr))
accept_visitor(i)(**k);
}
cout << endl;
@@ -1250,7 +1249,7 @@ namespace
else if (cmdline.a_one_version.specified())
{
if (best_installable)
- do_one_package_id(cmdline, env, basic_ppos, best_installable, all_installed->empty() ? make_null_shared_ptr() : *all_installed->rbegin(),
+ do_one_package_id(cmdline, env, basic_ppos, best_installable, all_installed->empty() ? nullptr : *all_installed->rbegin(),
true, rest_out);
else if (! all_installed->empty())
do_one_package_id(cmdline, env, basic_ppos, *all_installed->rbegin(), best_installable,
@@ -1264,7 +1263,7 @@ namespace
for (PackageIDSequence::ConstIterator i(all_not_installed->begin()), i_end(all_not_installed->end()) ;
i != i_end ; ++i)
- do_one_package_id(cmdline, env, basic_ppos, *i, all_installed->empty() ? make_null_shared_ptr() : *all_installed->rbegin(), true, rest_out);
+ do_one_package_id(cmdline, env, basic_ppos, *i, all_installed->empty() ? nullptr : *all_installed->rbegin(), true, rest_out);
}
else
{
@@ -1272,7 +1271,7 @@ namespace
i != i_end ; ++i)
do_one_package_id(cmdline, env, basic_ppos, *i, best_installable, false, rest_out);
if (best_installable)
- do_one_package_id(cmdline, env, basic_ppos, best_installable, all_installed->empty() ? make_null_shared_ptr() : *all_installed->rbegin(),
+ do_one_package_id(cmdline, env, basic_ppos, best_installable, all_installed->empty() ? nullptr : *all_installed->rbegin(),
true, rest_out);
}
}
@@ -1285,7 +1284,7 @@ namespace
{
cout << fuc(fs_package_heading(), fv<'s'>(stringify(s)));
- auto ids((*env)[selection::AllVersionsGroupedBySlot(generator::Matches(s, make_null_shared_ptr(), { }))]);
+ auto ids((*env)[selection::AllVersionsGroupedBySlot(generator::Matches(s, nullptr, { }))]);
if (ids->empty())
throw NothingMatching(s);
@@ -1300,7 +1299,7 @@ namespace
for (auto r(repos.begin()), r_end(repos.end()) ; r != r_end ; ++r)
{
auto r_ids((*env)[selection::AllVersionsGroupedBySlot(generator::Matches(
- PartiallyMadePackageDepSpec(s).in_repository(*r), make_null_shared_ptr(), { }))]);
+ PartiallyMadePackageDepSpec(s).in_repository(*r), nullptr, { }))]);
if (! r_ids->empty())
do_one_package_with_ids(cmdline, env, basic_ppos, s, r_ids, cout, rest_out);
}
@@ -1321,7 +1320,7 @@ namespace
const PackageDepSpec & s)
{
const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::BestVersionOnly(generator::Matches(s,
- make_null_shared_ptr(), { }))]);
+ nullptr, { }))]);
if (ids->empty())
throw NothingMatching(s);
diff --git a/src/clients/cave/cmd_sync.cc b/src/clients/cave/cmd_sync.cc
index 6045cae27..8d8e564b1 100644
--- a/src/clients/cave/cmd_sync.cc
+++ b/src/clients/cave/cmd_sync.cc
@@ -26,7 +26,6 @@
#include <paludis/util/return_literal_function.hh>
#include <paludis/util/executor.hh>
#include <paludis/util/timestamp.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/join.hh>
#include <paludis/output_manager.hh>
@@ -173,7 +172,7 @@ namespace
("NUMBER_DONE", stringify(executor->done()))
("NUMBER_ACTIVE", stringify(executor->active()))
("NUMBER_PENDING", stringify(executor->pending())),
- make_null_shared_ptr()).max_exit_status())
+ nullptr).max_exit_status())
throw SyncFailedError("Sync aborted by hook");
const std::shared_ptr<Repository> repo(env->fetch_repository(name));
@@ -275,7 +274,7 @@ namespace
("NUMBER_DONE", stringify(executor->done()))
("NUMBER_ACTIVE", stringify(executor->active()))
("NUMBER_PENDING", stringify(executor->pending())),
- make_null_shared_ptr()).max_exit_status())
+ nullptr).max_exit_status())
throw SyncFailedError("Sync aborted by hook");
}
@@ -395,7 +394,7 @@ SyncCommand::run(
if (0 != env->perform_hook(Hook("sync_all_pre")
("TARGETS", join(repos.begin(), repos.end(), " ")),
- make_null_shared_ptr()).max_exit_status())
+ nullptr).max_exit_status())
throw SyncFailedError("Sync aborted by hook");
cout << fuc(fs_repos_title());
@@ -410,7 +409,7 @@ SyncCommand::run(
if (0 != env->perform_hook(Hook("sync_all_post")
("TARGETS", join(repos.begin(), repos.end(), " ")),
- make_null_shared_ptr()).max_exit_status())
+ nullptr).max_exit_status())
throw SyncFailedError("Sync aborted by hook");
return retcode;
diff --git a/src/clients/cave/cmd_uninstall.cc b/src/clients/cave/cmd_uninstall.cc
index eb62084fe..dcb22475e 100644
--- a/src/clients/cave/cmd_uninstall.cc
+++ b/src/clients/cave/cmd_uninstall.cc
@@ -26,7 +26,6 @@
#include <paludis/util/stringify.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/wrapped_output_iterator.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/user_dep_spec.hh>
#include <paludis/selection.hh>
#include <paludis/generator.hh>
@@ -66,11 +65,11 @@ namespace
g_target_options(main_options_section(), "Target options", "Target options"),
a_all_versions(&g_target_options, "all-versions", 'a', "If a supplied spec matches multiple versions, "
"uninstall all versions rather than erroring", true),
- resolution_options(for_docs ? make_null_shared_ptr() : std::make_shared<ResolveCommandLineResolutionOptions>(this)),
- execution_options(for_docs ? make_null_shared_ptr() : std::make_shared<ResolveCommandLineExecutionOptions>(this)),
- display_options(for_docs ? make_null_shared_ptr() : std::make_shared<ResolveCommandLineDisplayOptions>(this)),
- graph_jobs_options(for_docs ? make_null_shared_ptr() : std::make_shared<ResolveCommandLineGraphJobsOptions>(this)),
- program_options(for_docs ? make_null_shared_ptr() : std::make_shared<ResolveCommandLineProgramOptions>(this))
+ resolution_options(for_docs ? nullptr : std::make_shared<ResolveCommandLineResolutionOptions>(this)),
+ execution_options(for_docs ? nullptr : std::make_shared<ResolveCommandLineExecutionOptions>(this)),
+ display_options(for_docs ? nullptr : std::make_shared<ResolveCommandLineDisplayOptions>(this)),
+ graph_jobs_options(for_docs ? nullptr : std::make_shared<ResolveCommandLineGraphJobsOptions>(this)),
+ program_options(for_docs ? nullptr : std::make_shared<ResolveCommandLineProgramOptions>(this))
{
add_usage_line("[ -x|--execute ] spec ...");
add_note("All options available for 'cave resolve' are also permitted. See 'man cave-resolve' for details.");
@@ -138,7 +137,7 @@ UninstallCommand::run(
{
PackageDepSpec spec(parse_spec_with_nice_error(*p, env.get(), { updso_allow_wildcards }, filter::All()));
const std::shared_ptr<const PackageIDSequence> ids((*env)[selection::AllVersionsSorted(
- generator::Matches(spec, make_null_shared_ptr(), { }) | filter::SupportsAction<UninstallAction>())]);
+ generator::Matches(spec, nullptr, { }) | filter::SupportsAction<UninstallAction>())]);
if (ids->empty())
nothing_matching_error(env.get(), *p, filter::SupportsAction<UninstallAction>());
else if ((! cmdline.a_all_versions.specified()) && has_multiple_versions(ids))
@@ -185,7 +184,7 @@ UninstallCommand::run(
}
return resolve_common(env, *cmdline.resolution_options, *cmdline.execution_options, *cmdline.display_options,
- *cmdline.graph_jobs_options, *cmdline.program_options, make_null_shared_ptr(), targets, targets_cleaned_up, false);
+ *cmdline.graph_jobs_options, *cmdline.program_options, nullptr, targets, targets_cleaned_up, false);
}
std::shared_ptr<args::ArgsHandler>
diff --git a/src/clients/cave/cmd_verify.cc b/src/clients/cave/cmd_verify.cc
index 61badcf25..9f2218b00 100644
--- a/src/clients/cave/cmd_verify.cc
+++ b/src/clients/cave/cmd_verify.cc
@@ -33,7 +33,6 @@
#include <paludis/util/visitor_cast.hh>
#include <paludis/util/md5.hh>
#include <paludis/util/fs_stat.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/stringify.hh>
#include <paludis/environment.hh>
#include <paludis/repository.hh>
@@ -216,7 +215,7 @@ VerifyCommand::run(
{ updso_allow_wildcards }, filter::InstalledAtRoot(env->preferred_root_key()->parse_value())));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(spec, make_null_shared_ptr(), { }) |
+ (*env)[selection::AllVersionsSorted(generator::Matches(spec, nullptr, { }) |
filter::InstalledAtRoot(env->preferred_root_key()->parse_value()))]);
if (entries->empty())
diff --git a/src/clients/cave/executables_common.cc b/src/clients/cave/executables_common.cc
index 1e76b3011..6c3582d7a 100644
--- a/src/clients/cave/executables_common.cc
+++ b/src/clients/cave/executables_common.cc
@@ -37,7 +37,6 @@
#include <paludis/util/system.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/accept_visitor.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <algorithm>
#include <set>
@@ -116,7 +115,7 @@ paludis::cave::executables_common(
filter::InstalledAtRoot(env->preferred_root_key()->parse_value())));
std::shared_ptr<const PackageIDSequence> entries(
- (*env)[selection::AllVersionsSorted(generator::Matches(spec, make_null_shared_ptr(), { }) |
+ (*env)[selection::AllVersionsSorted(generator::Matches(spec, nullptr, { }) |
filter::InstalledAtRoot(env->preferred_root_key()->parse_value()))]);
if (entries->empty())
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc
index b1877179a..d25c83f3c 100644
--- a/src/clients/cave/resolve_common.cc
+++ b/src/clients/cave/resolve_common.cc
@@ -41,7 +41,6 @@
#include <paludis/util/sequence-impl.hh>
#include <paludis/util/set-impl.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/return_literal_function.hh>
#include <paludis/util/join.hh>
#include <paludis/util/tribool.hh>
@@ -193,7 +192,7 @@ namespace
p != p_end ; ++p)
{
PackageDepSpec s(parse_spec_with_nice_error(*p, env.get(), { }, installed_filter));
- auto ids((*env)[selection::AllVersionsSorted(generator::Matches(s, make_null_shared_ptr(), { }) | installed_filter)]);
+ auto ids((*env)[selection::AllVersionsSorted(generator::Matches(s, nullptr, { }) | installed_filter)]);
if (ids->empty())
throw args::DoHelp("Found nothing installed matching '" + *p + "' for --" + resolution_options.a_reinstall_dependents_of.long_name());
@@ -671,7 +670,7 @@ namespace
r != r_end ; ++r)
if (visitor_cast<const DependentReason>(*(*r)->reason()))
return make_shared_copy((*remove_decision->ids()->begin())->name());
- return make_null_shared_ptr();
+ return nullptr;
}
std::shared_ptr<Sequence<std::string> > get_removed_if_dependent_names(
@@ -838,7 +837,7 @@ paludis::cave::resolve_common(
for (args::StringSetArg::ConstIterator i(resolution_options.a_preset.begin_args()),
i_end(resolution_options.a_preset.end_args()) ;
i != i_end ; ++i)
- get_initial_constraints_for_helper.add_preset_spec(parse_spec_with_nice_error(*i, env.get(), { updso_allow_wildcards }, filter::All()), make_null_shared_ptr());
+ get_initial_constraints_for_helper.add_preset_spec(parse_spec_with_nice_error(*i, env.get(), { updso_allow_wildcards }, filter::All()), nullptr);
get_initial_constraints_for_helper.set_reinstall_scm_days(reinstall_scm_days(resolution_options));
@@ -975,12 +974,12 @@ paludis::cave::resolve_common(
i_end(resolution_options.a_favour_matching.end_args()) ;
i != i_end ; ++i)
prefer_or_avoid_helper.add_prefer_matching((*env)[selection::AllVersionsUnsorted(generator::Matches(
- parse_spec_with_nice_error(*i, env.get(), { }, filter::All()), make_null_shared_ptr(), { }))]);
+ parse_spec_with_nice_error(*i, env.get(), { }, filter::All()), nullptr, { }))]);
for (args::StringSetArg::ConstIterator i(resolution_options.a_avoid_matching.begin_args()),
i_end(resolution_options.a_avoid_matching.end_args()) ;
i != i_end ; ++i)
prefer_or_avoid_helper.add_avoid_matching((*env)[selection::AllVersionsUnsorted(generator::Matches(
- parse_spec_with_nice_error(*i, env.get(), { }, filter::All()), make_null_shared_ptr(), { }))]);
+ parse_spec_with_nice_error(*i, env.get(), { }, filter::All()), nullptr, { }))]);
RemoveIfDependentHelper remove_if_dependent_helper(env.get());
for (args::StringSetArg::ConstIterator i(resolution_options.a_remove_if_dependent.begin_args()),
diff --git a/src/clients/cave/size_common.cc b/src/clients/cave/size_common.cc
index df7080b33..4aed3a564 100644
--- a/src/clients/cave/size_common.cc
+++ b/src/clients/cave/size_common.cc
@@ -39,7 +39,6 @@
#include <paludis/util/fs_path.hh>
#include <paludis/util/fs_stat.hh>
#include <paludis/util/iterator_funcs.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <algorithm>
#include <functional>
#include <iostream>
@@ -94,7 +93,7 @@ paludis::cave::size_common(
const bool best)
{
PackageDepSpec spec(parse_spec_with_nice_error(q, env.get(), { }, filter::All()));
- std::shared_ptr<const PackageIDSequence> entries((*env)[selection::AllVersionsSorted(generator::Matches(spec, make_null_shared_ptr(), { }) |
+ std::shared_ptr<const PackageIDSequence> entries((*env)[selection::AllVersionsSorted(generator::Matches(spec, nullptr, { }) |
filter::InstalledAtRoot(env->preferred_root_key()->parse_value()))]);
if (entries->empty())