aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories
diff options
context:
space:
mode:
authorAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2016-08-04 22:04:15 -0700
committerAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2016-08-04 22:11:01 -0700
commitd81457e4208ba6ed94b86e430c567e4c0e1f7046 (patch)
tree971aa44d14aa446e6f7641d4bf4c1279de0f0b54 /paludis/repositories
parentf3cd2455110fad09158275287cbdaa67cc3e15c3 (diff)
downloadpaludis-d81457e4208ba6ed94b86e430c567e4c0e1f7046.tar.gz
paludis-d81457e4208ba6ed94b86e430c567e4c0e1f7046.tar.xz
modernize: use nullptr rather than 0 or NULL
Automated conversion to nullptr. NFC.
Diffstat (limited to 'paludis/repositories')
-rw-r--r--paludis/repositories/e/do_info_action.cc2
-rw-r--r--paludis/repositories/e/e_repository.cc8
-rw-r--r--paludis/repositories/e/vdb_repository.cc2
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc4
4 files changed, 8 insertions, 8 deletions
diff --git a/paludis/repositories/e/do_info_action.cc b/paludis/repositories/e/do_info_action.cc
index 85944b525..bedb2d3cb 100644
--- a/paludis/repositories/e/do_info_action.cc
+++ b/paludis/repositories/e/do_info_action.cc
@@ -121,7 +121,7 @@ paludis::erepository::do_info_action(
n::expand_vars() = expand_vars,
n::info_vars() = repo->info_vars_key() ?
repo->info_vars_key()->parse_value() : std::make_shared<const Set<std::string>>(),
- n::load_environment() = static_cast<const FSPath *>(0),
+ n::load_environment() = static_cast<const FSPath *>(nullptr),
n::profiles() = params.profiles(),
n::profiles_with_parents() = profile->profiles_with_parents(),
n::use() = use,
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 6264d4b1f..b491af36c 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -534,7 +534,7 @@ ERepository::ERepository(const ERepositoryParams & p) :
p.environment(),
fetch_repo_name(p.location()),
make_named_values<RepositoryCapabilities>(
- n::destination_interface() = p.binary_destination() ? this : 0,
+ n::destination_interface() = p.binary_destination() ? this : nullptr,
n::environment_variable_interface() = this,
n::manifest_interface() = this
)),
@@ -695,7 +695,7 @@ ERepository::need_mirrors() const
if (! ee.empty())
{
/* pick up to five random mirrors only */
- std::mt19937 random(std::time(0));
+ std::mt19937 random(std::time(nullptr));
Randomator randomator{random};
std::random_shuffle(next(ee.begin()), ee.end(), randomator);
if (ee.size() > 6)
@@ -1142,7 +1142,7 @@ ERepository::repository_factory_create(
std::shared_ptr<KeyValueConfigFile> layout_conf((FSPath(location) / "metadata/layout.conf").stat().exists() ?
new KeyValueConfigFile(FSPath(location) / "metadata/layout.conf", { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation)
- : 0);
+ : nullptr);
std::shared_ptr<ERepositorySequence> master_repositories;
std::string master_repository_str(f("master_repository"));
@@ -1533,7 +1533,7 @@ ERepository::repository_factory_dependencies(
std::shared_ptr<KeyValueConfigFile> layout_conf((FSPath(location) / "metadata/layout.conf").stat().exists() ?
new KeyValueConfigFile(FSPath(location) / "metadata/layout.conf", { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation)
- : 0);
+ : nullptr);
if (layout_conf)
{
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 7aab15e97..5f59a4ff5 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -164,7 +164,7 @@ VDBRepository::VDBRepository(const VDBRepositoryParams & p) :
make_named_values<RepositoryCapabilities>(
n::destination_interface() = this,
n::environment_variable_interface() = this,
- n::manifest_interface() = static_cast<RepositoryManifestInterface *>(0)
+ n::manifest_interface() = static_cast<RepositoryManifestInterface *>(nullptr)
)),
_imp(this, p)
{
diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc
index a4922accb..2982dfc06 100644
--- a/paludis/repositories/fake/fake_installed_repository.cc
+++ b/paludis/repositories/fake/fake_installed_repository.cc
@@ -59,8 +59,8 @@ namespace paludis
FakeInstalledRepository::FakeInstalledRepository(const FakeInstalledRepositoryParams & p) :
FakeRepositoryBase(p.environment(), p.name(), make_named_values<RepositoryCapabilities>(
n::destination_interface() = this,
- n::environment_variable_interface() = static_cast<RepositoryEnvironmentVariableInterface *>(0),
- n::manifest_interface() = static_cast<RepositoryManifestInterface *>(0)
+ n::environment_variable_interface() = static_cast<RepositoryEnvironmentVariableInterface *>(nullptr),
+ n::manifest_interface() = static_cast<RepositoryManifestInterface *>(nullptr)
)),
_imp(p.supports_uninstall(), p.suitable_destination())
{