aboutsummaryrefslogtreecommitdiff
path: root/paludis/generator_TEST.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/generator_TEST.cc
parent78d9a9bf0758140e0e8c03c5e8d3288f74efbb51 (diff)
downloadpaludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.gz
paludis-0174215ed434594d9288e38575a3aa41e2b10842.tar.xz
Use nullptr
Diffstat (limited to 'paludis/generator_TEST.cc')
-rw-r--r--paludis/generator_TEST.cc13
1 files changed, 6 insertions, 7 deletions
diff --git a/paludis/generator_TEST.cc b/paludis/generator_TEST.cc
index 033c1f7b4..f141db4d3 100644
--- a/paludis/generator_TEST.cc
+++ b/paludis/generator_TEST.cc
@@ -33,7 +33,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/util/join.hh>
#include <gtest/gtest.h>
@@ -118,21 +117,21 @@ INSTANTIATE_TEST_CASE_P(GeneratorTest, GeneratorTestCaseBase, testing::Values(
"cat/c-3:0::repo2" ) },
TestInfo{ std::make_shared<generator::Matches>(
- envless_parse_package_dep_spec_for_tests("cat/a"), make_null_shared_ptr(), MatchPackageOptions()), std::string(
+ envless_parse_package_dep_spec_for_tests("cat/a"), nullptr, MatchPackageOptions()), std::string(
"cat/a-1:0::inst_repo1, "
"cat/a-1:0::repo1, "
"cat/a-1:0::repo2, "
"cat/a-2:0::repo2") },
TestInfo{ std::make_shared<generator::Matches>(
- envless_parse_package_dep_spec_for_tests("*/a"), make_null_shared_ptr(), MatchPackageOptions()), std::string(
+ envless_parse_package_dep_spec_for_tests("*/a"), nullptr, MatchPackageOptions()), std::string(
"cat/a-1:0::inst_repo1, "
"cat/a-1:0::repo1, "
"cat/a-1:0::repo2, "
"cat/a-2:0::repo2") },
TestInfo{ std::make_shared<generator::Matches>(
- envless_parse_package_dep_spec_for_tests("cat/*"), make_null_shared_ptr(), MatchPackageOptions()), std::string(
+ envless_parse_package_dep_spec_for_tests("cat/*"), nullptr, MatchPackageOptions()), std::string(
"cat/a-1:0::inst_repo1, "
"cat/a-1:0::repo1, "
"cat/a-1:0::repo2, "
@@ -141,7 +140,7 @@ INSTANTIATE_TEST_CASE_P(GeneratorTest, GeneratorTestCaseBase, testing::Values(
"cat/c-3:0::repo2") },
TestInfo{ std::make_shared<generator::Matches>(
- envless_parse_package_dep_spec_for_tests(">=*/*-2"), make_null_shared_ptr(), MatchPackageOptions()), std::string(
+ envless_parse_package_dep_spec_for_tests(">=*/*-2"), nullptr, MatchPackageOptions()), std::string(
"cat/a-2:0::repo2, "
"cat/b-2:0::repo1, "
"cat/c-3:0::repo2") },
@@ -174,8 +173,8 @@ INSTANTIATE_TEST_CASE_P(GeneratorTest, GeneratorTestCaseBase, testing::Values(
"") },
TestInfo{ std::make_shared<generator::Intersection>(
- generator::Matches(envless_parse_package_dep_spec_for_tests("*/a"), make_null_shared_ptr(), MatchPackageOptions()),
- generator::Matches(envless_parse_package_dep_spec_for_tests("cat/*"), make_null_shared_ptr(), MatchPackageOptions())
+ generator::Matches(envless_parse_package_dep_spec_for_tests("*/a"), nullptr, MatchPackageOptions()),
+ generator::Matches(envless_parse_package_dep_spec_for_tests("cat/*"), nullptr, MatchPackageOptions())
), std::string(
"cat/a-1:0::inst_repo1, "
"cat/a-1:0::repo1, "