aboutsummaryrefslogtreecommitdiff
path: root/src/clients/cave/resolve_common.cc
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/clients/cave/resolve_common.cc
parent78d9a9bf0758140e0e8c03c5e8d3288f74efbb51 (diff)
downloadpaludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.gz
paludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.xz
Use nullptr
Diffstat (limited to 'src/clients/cave/resolve_common.cc')
-rw-r--r--src/clients/cave/resolve_common.cc11
1 files changed, 5 insertions, 6 deletions
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()),