aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/exheres_profile.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/exheres_profile.cc
parent78d9a9bf0758140e0e8c03c5e8d3288f74efbb51 (diff)
downloadpaludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.gz
paludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.xz
Use nullptr
Diffstat (limited to 'paludis/repositories/e/exheres_profile.cc')
-rw-r--r--paludis/repositories/e/exheres_profile.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/paludis/repositories/e/exheres_profile.cc b/paludis/repositories/e/exheres_profile.cc
index de84491..4abf767 100644
--- a/paludis/repositories/e/exheres_profile.cc
+++ b/paludis/repositories/e/exheres_profile.cc
@@ -34,7 +34,6 @@
#include <paludis/util/make_named_values.hh>
#include <paludis/util/hashes.hh>
#include <paludis/util/system.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/fs_stat.hh>
#include <paludis/util/safe_ifstream.hh>
@@ -135,18 +134,18 @@ ExheresProfile::ExheresProfile(
_load_dir(*l);
const std::shared_ptr<const Set<UnprefixedChoiceName> > s(_imp->options_conf.known_choice_value_names(
- make_null_shared_ptr(), ChoicePrefixName("suboptions")));
+ nullptr, ChoicePrefixName("suboptions")));
for (Set<UnprefixedChoiceName>::ConstIterator f(s->begin()), f_end(s->end()) ;
f != f_end ; ++f)
- if (_imp->options_conf.want_choice_enabled_locked(make_null_shared_ptr(),
+ if (_imp->options_conf.want_choice_enabled_locked(nullptr,
ChoicePrefixName("suboptions"), *f).first.is_true())
_imp->use_expand->insert(stringify(*f));
const std::shared_ptr<const Set<UnprefixedChoiceName> > sh(_imp->options_conf.known_choice_value_names(
- make_null_shared_ptr(), ChoicePrefixName("hidden_suboptions")));
+ nullptr, ChoicePrefixName("hidden_suboptions")));
for (Set<UnprefixedChoiceName>::ConstIterator f(sh->begin()), f_end(sh->end()) ;
f != f_end ; ++f)
- if (_imp->options_conf.want_choice_enabled_locked(make_null_shared_ptr(),
+ if (_imp->options_conf.want_choice_enabled_locked(nullptr,
ChoicePrefixName("hidden_suboptions"), *f).first.is_true())
_imp->use_expand_hidden->insert(stringify(*f));
}
@@ -185,7 +184,7 @@ ExheresProfile::_load_dir(const FSPath & f)
auto eapi(EAPIData::get_instance()->eapi_from_string(_imp->eapi_for_file(f / "system.conf")));
auto specs(parse_commented_set(file_text, _imp->env, *EAPIData::get_instance()->eapi_from_string(_imp->eapi_for_file(f / "system.conf"))));
- DepSpecFlattener<SetSpecTree, PackageDepSpec> flat_specs(_imp->env, make_null_shared_ptr());
+ DepSpecFlattener<SetSpecTree, PackageDepSpec> flat_specs(_imp->env, nullptr);
specs->top()->accept(flat_specs);
for (auto s(flat_specs.begin()), s_end(flat_specs.end()) ;