aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/fix_locked_dependencies.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 /paludis/repositories/e/fix_locked_dependencies.cc
parent78d9a9bf0758140e0e8c03c5e8d3288f74efbb51 (diff)
downloadpaludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.gz
paludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.xz
Use nullptr
Diffstat (limited to 'paludis/repositories/e/fix_locked_dependencies.cc')
-rw-r--r--paludis/repositories/e/fix_locked_dependencies.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/paludis/repositories/e/fix_locked_dependencies.cc b/paludis/repositories/e/fix_locked_dependencies.cc
index a825e2743..84156d6d2 100644
--- a/paludis/repositories/e/fix_locked_dependencies.cc
+++ b/paludis/repositories/e/fix_locked_dependencies.cc
@@ -25,7 +25,6 @@
#include <paludis/util/options.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/accept_visitor.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/dep_spec.hh>
#include <paludis/environment.hh>
#include <paludis/package_id.hh>
@@ -55,17 +54,17 @@ namespace
std::shared_ptr<const SlotRequirement> visit(const SlotExactPartialRequirement &) const
{
- return make_null_shared_ptr();
+ return nullptr;
}
std::shared_ptr<const SlotRequirement> visit(const SlotExactFullRequirement &) const
{
- return make_null_shared_ptr();
+ return nullptr;
}
std::shared_ptr<const SlotRequirement> visit(const SlotAnyUnlockedRequirement &) const
{
- return make_null_shared_ptr();
+ return nullptr;
}
std::shared_ptr<const SlotRequirement> rewrite() const
@@ -73,7 +72,7 @@ namespace
std::shared_ptr<const PackageIDSequence> matches((*env)[selection::AllVersionsSorted(
generator::Matches(*spec, id, { }) | filter::InstalledAtRoot(env->system_root_key()->parse_value()))]);
if (matches->empty())
- return make_null_shared_ptr();
+ return nullptr;
if ((*matches->last())->slot_key())
{
@@ -89,7 +88,7 @@ namespace
return std::make_shared<ELikeSlotExactPartialRequirement>(ss.match_values().first, spec->slot_requirement_ptr());
}
else
- return make_null_shared_ptr();
+ return nullptr;
}
std::shared_ptr<const SlotRequirement> visit(const SlotAnyPartialLockedRequirement &) const