aboutsummaryrefslogtreecommitdiff
path: root/ruby
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 /ruby
parent78d9a9bf0758140e0e8c03c5e8d3288f74efbb51 (diff)
downloadpaludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.gz
paludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.xz
Use nullptr
Diffstat (limited to 'ruby')
-rw-r--r--ruby/action.cc5
-rw-r--r--ruby/dep_spec.cc3
2 files changed, 3 insertions, 5 deletions
diff --git a/ruby/action.cc b/ruby/action.cc
index 15c19f79a..ed3b9bdc0 100644
--- a/ruby/action.cc
+++ b/ruby/action.cc
@@ -21,7 +21,6 @@
#include <paludis_ruby.hh>
#include <paludis/action.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/standard_output_manager.hh>
#include <ruby.h>
@@ -725,11 +724,11 @@ namespace
ptr = new UninstallActionOptions(make_named_values<UninstallActionOptions>(
n::config_protect() = v_config_protect,
- 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() = &make_standard_output_manager,
- n::override_contents() = make_null_shared_ptr(),
+ n::override_contents() = nullptr,
n::want_phase() = &want_all_phases
));
diff --git a/ruby/dep_spec.cc b/ruby/dep_spec.cc
index ad9ee78dd..8631f84db 100644
--- a/ruby/dep_spec.cc
+++ b/ruby/dep_spec.cc
@@ -29,7 +29,6 @@
#include <paludis/util/save.hh>
#include <paludis/util/member_iterator-impl.hh>
#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/accept_visitor.hh>
#include <algorithm>
#include <list>
@@ -330,7 +329,7 @@ namespace
std::shared_ptr<H_> result;
std::shared_ptr<typename H_::BasicInnerNode> add_to;
- ValueToTree(VALUE val, std::shared_ptr<H_> r = make_null_shared_ptr()) :
+ ValueToTree(VALUE val, std::shared_ptr<H_> r = nullptr) :
result(r)
{
if (result)