aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/portage/portage_environment.cc
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/environments/portage/portage_environment.cc')
-rw-r--r--paludis/environments/portage/portage_environment.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index e02721568..71fc907c7 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -40,7 +40,6 @@
#include <paludis/util/fs_stat.hh>
#include <paludis/util/fs_iterator.hh>
#include <paludis/util/fs_error.hh>
-#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/env_var_names.hh>
#include <paludis/util/join.hh>
#include <paludis/util/upper_lower.hh>
@@ -583,7 +582,7 @@ PortageEnvironment::want_choice_enabled(
for (PackageUse::const_iterator i(_imp->package_use.begin()), i_end(_imp->package_use.end()) ;
i != i_end ; ++i)
{
- if (! match_package(*this, *i->first, id, make_null_shared_ptr(), { }))
+ if (! match_package(*this, *i->first, id, nullptr, { }))
continue;
if (i->second == stringify(f))
@@ -627,7 +626,7 @@ PortageEnvironment::accept_keywords(const std::shared_ptr <const KeywordNameSet>
for (PackageKeywords::const_iterator it(_imp->package_keywords.begin()),
it_end(_imp->package_keywords.end()); it_end != it; ++it)
{
- if (! match_package(*this, *it->first, d, make_null_shared_ptr(), { }))
+ if (! match_package(*this, *it->first, d, nullptr, { }))
continue;
if ("-*" == it->second)
@@ -662,7 +661,7 @@ PortageEnvironment::unmasked_by_user(const std::shared_ptr<const PackageID> & e,
{
for (PackageUnmask::const_iterator i(_imp->package_unmask.begin()), i_end(_imp->package_unmask.end()) ;
i != i_end ; ++i)
- if (match_package(*this, **i, e, make_null_shared_ptr(), { }))
+ if (match_package(*this, **i, e, nullptr, { }))
return true;
return false;
@@ -687,7 +686,7 @@ PortageEnvironment::known_choice_value_names(const std::shared_ptr<const Package
for (PackageUse::const_iterator i(_imp->package_use.begin()), i_end(_imp->package_use.end()) ;
i != i_end ; ++i)
{
- if (! match_package(*this, *i->first, id, make_null_shared_ptr(), { }))
+ if (! match_package(*this, *i->first, id, nullptr, { }))
continue;
if (0 == i->second.compare(0, prefix_lower.length(), prefix_lower, 0, prefix_lower.length()))
@@ -836,7 +835,7 @@ PortageEnvironment::mask_for_user(const std::shared_ptr<const PackageID> & d, co
{
for (PackageMask::const_iterator i(_imp->package_mask.begin()), i_end(_imp->package_mask.end()) ;
i != i_end ; ++i)
- if (match_package(*this, **i, d, make_null_shared_ptr(), { }))
+ if (match_package(*this, **i, d, nullptr, { }))
return std::make_shared<UserConfigMask>(o);
return std::shared_ptr<const Mask>();