aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/e_repository.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/e_repository.cc
parent78d9a9bf0758140e0e8c03c5e8d3288f74efbb51 (diff)
downloadpaludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.gz
paludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.xz
Use nullptr
Diffstat (limited to 'paludis/repositories/e/e_repository.cc')
-rw-r--r--paludis/repositories/e/e_repository.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index ba0e2a7ed..63a914169 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -79,7 +79,6 @@
#include <paludis/util/join.hh>
#include <paludis/util/log.hh>
#include <paludis/util/make_named_values.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/make_shared_copy.hh>
#include <paludis/util/map.hh>
#include <paludis/util/options.hh>
@@ -1745,11 +1744,11 @@ ERepository::get_environment_variable(
n::environment() = _imp->params.environment(),
n::exlibsdirs() = exlibsdirs,
n::files_dir() = layout()->package_directory(id->name()) / "files",
- n::maybe_output_manager() = make_null_shared_ptr(),
+ n::maybe_output_manager() = nullptr,
n::package_builddir() = _imp->params.builddir() / (stringify(id->name().category()) + "-" + stringify(id->name().package()) + "-" + stringify(id->version()) + "-variable"),
n::package_id() = id,
- n::parts() = make_null_shared_ptr(),
- n::permitted_directories() = make_null_shared_ptr(),
+ n::parts() = nullptr,
+ n::permitted_directories() = nullptr,
n::portdir() =
(_imp->params.master_repositories() && ! _imp->params.master_repositories()->empty()) ?
(*_imp->params.master_repositories()->begin())->params().location() : _imp->params.location(),
@@ -1776,7 +1775,7 @@ namespace
i != i_end ; ++i)
if ((*i)->version() == v)
return *i;
- return make_null_shared_ptr();
+ return nullptr;
}
}