aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis/output_conf.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/environments/paludis/output_conf.cc
parent78d9a9bf0758140e0e8c03c5e8d3288f74efbb51 (diff)
downloadpaludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.gz
paludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.xz
Use nullptr
Diffstat (limited to 'paludis/environments/paludis/output_conf.cc')
-rw-r--r--paludis/environments/paludis/output_conf.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/paludis/environments/paludis/output_conf.cc b/paludis/environments/paludis/output_conf.cc
index 888cb03..a53b73c 100644
--- a/paludis/environments/paludis/output_conf.cc
+++ b/paludis/environments/paludis/output_conf.cc
@@ -37,7 +37,6 @@
#include <paludis/util/visitor_cast.hh>
#include <paludis/util/map.hh>
#include <paludis/util/simple_parser.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/user_dep_spec.hh>
#include <paludis/create_output_manager_info.hh>
@@ -202,7 +201,7 @@ namespace
return false;
if (rule.matches_requirement() && ! match_package(*env, *rule.matches_requirement(),
- i.package_id(), make_null_shared_ptr(), { }))
+ i.package_id(), nullptr, { }))
return false;
if (! rule.ignore_unfetched_requirement().is_indeterminate())
@@ -395,7 +394,7 @@ OutputConf::add(const FSPath & filename, const FSPath & root)
n::action_requirement() = "*",
n::ignore_unfetched_requirement() = Tribool(indeterminate),
n::manager() = "unset",
- n::matches_requirement() = make_null_shared_ptr(),
+ n::matches_requirement() = nullptr,
n::name_requirement() = "*",
n::output_exclusivity_requirement() = static_cast<OutputExclusivity>(-1),
n::type_requirement() = "*"