aboutsummaryrefslogtreecommitdiff
path: root/python
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 /python
parent78d9a9bf0758140e0e8c03c5e8d3288f74efbb51 (diff)
downloadpaludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.gz
paludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.xz
Use nullptr
Diffstat (limited to 'python')
-rw-r--r--python/action.cc5
-rw-r--r--python/additional_tests.cc3
-rw-r--r--python/environment.cc1
-rw-r--r--python/generator.cc3
-rw-r--r--python/slot_requirement.cc1
5 files changed, 4 insertions, 9 deletions
diff --git a/python/action.cc b/python/action.cc
index 650f2808d..bbc5ffb09 100644
--- a/python/action.cc
+++ b/python/action.cc
@@ -23,7 +23,6 @@
#include <paludis/action.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/sequence.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/standard_output_manager.hh>
#include <paludis/repository.hh>
#include <memory>
@@ -89,11 +88,11 @@ namespace
{
return new UninstallActionOptions(make_named_values<UninstallActionOptions>(
n::config_protect() = c,
- 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/python/additional_tests.cc b/python/additional_tests.cc
index f95492ff8..b9c39ebb8 100644
--- a/python/additional_tests.cc
+++ b/python/additional_tests.cc
@@ -25,7 +25,6 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/environment.hh>
#include <paludis/environments/test/test_environment.hh>
#include <paludis/repositories/fake/fake_repository.hh>
@@ -81,7 +80,7 @@ namespace environment
e.set(SetName("set"));
- e.perform_hook(Hook("test"), make_null_shared_ptr());
+ e.perform_hook(Hook("test"), nullptr);
e.distribution();
diff --git a/python/environment.cc b/python/environment.cc
index fa7bd58d5..369144310 100644
--- a/python/environment.cc
+++ b/python/environment.cc
@@ -38,7 +38,6 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/tribool.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
using namespace paludis;
using namespace paludis::python;
diff --git a/python/generator.cc b/python/generator.cc
index 4281fdb2a..e68ee541b 100644
--- a/python/generator.cc
+++ b/python/generator.cc
@@ -24,7 +24,6 @@
#include <paludis/filtered_generator.hh>
#include <paludis/filter.hh>
#include <paludis/dep_spec.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
using namespace paludis;
using namespace paludis::python;
@@ -34,7 +33,7 @@ namespace
{
generator::Matches * make_generator_matches(const PackageDepSpec & spec, const MatchPackageOptions & o)
{
- return new generator::Matches(spec, make_null_shared_ptr(), o);
+ return new generator::Matches(spec, nullptr, o);
}
}
diff --git a/python/slot_requirement.cc b/python/slot_requirement.cc
index 80ebc5286..527621e04 100644
--- a/python/slot_requirement.cc
+++ b/python/slot_requirement.cc
@@ -22,7 +22,6 @@
#include <paludis/util/make_named_values.hh>
#include <paludis/util/sequence.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/slot_requirement.hh>
#include <paludis/name.hh>
#include <memory>