diff options
author | 2012-04-15 14:51:22 +0100 | |
---|---|---|
committer | 2012-04-15 14:51:22 +0100 | |
commit | 1eda5a0333e14e44d341a19f9fe506f67a0ebf07 (patch) | |
tree | b009ce2a5a5275431a7f956499d15cc387cfe507 | |
parent | 535b0908fbc1f4372d0b53f71f5b72958e9e8831 (diff) | |
download | paludis-1eda5a0333e14e44d341a19f9fe506f67a0ebf07.tar.gz paludis-1eda5a0333e14e44d341a19f9fe506f67a0ebf07.tar.xz |
Explicitly qualify lookups for gtest with templates
-rw-r--r-- | paludis/resolver/resolver_TEST_any.cc | 18 | ||||
-rw-r--r-- | paludis/resolver/resolver_TEST_binaries.cc | 4 | ||||
-rw-r--r-- | paludis/resolver/resolver_TEST_blockers.cc | 26 | ||||
-rw-r--r-- | paludis/resolver/resolver_TEST_continue_on_failure.cc | 6 | ||||
-rw-r--r-- | paludis/resolver/resolver_TEST_cycles.cc | 16 | ||||
-rw-r--r-- | paludis/resolver/resolver_TEST_errors.cc | 2 | ||||
-rw-r--r-- | paludis/resolver/resolver_TEST_fetches.cc | 2 | ||||
-rw-r--r-- | paludis/resolver/resolver_TEST_purges.cc | 4 | ||||
-rw-r--r-- | paludis/resolver/resolver_TEST_serialisation.cc | 2 | ||||
-rw-r--r-- | paludis/resolver/resolver_TEST_simple.cc | 8 | ||||
-rw-r--r-- | paludis/resolver/resolver_TEST_suggestions.cc | 6 | ||||
-rw-r--r-- | paludis/resolver/resolver_TEST_uninstalls.cc | 6 |
12 files changed, 50 insertions, 50 deletions
diff --git a/paludis/resolver/resolver_TEST_any.cc b/paludis/resolver/resolver_TEST_any.cc index 03d86025e..fa94ed931 100644 --- a/paludis/resolver/resolver_TEST_any.cc +++ b/paludis/resolver/resolver_TEST_any.cc @@ -75,7 +75,7 @@ TEST_F(ResolverAnyTestCase, EmptyAlternative) { std::shared_ptr<const Resolved> resolved(data->get_resolved("test/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("test/target")) .finished()), @@ -97,7 +97,7 @@ TEST_F(ResolverAnyTestCase, EmptyAlternativeWithUpdate) data->install("test", "dep", "2"); std::shared_ptr<const Resolved> resolved(data->get_resolved("test/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("test/target")) .finished()), @@ -119,7 +119,7 @@ TEST_F(ResolverAnyTestCase, EmptyAlternativeWithUntakenUpgrade) data->install("test", "dep", "1"); std::shared_ptr<const Resolved> resolved(data->get_resolved("test/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("test/target")) .finished()), @@ -192,7 +192,7 @@ namespace .finished()); } - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = checks, n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks() .finished()), @@ -233,7 +233,7 @@ TEST_F(ResolverAnyTestCase, SelfUseFirst) { std::shared_ptr<const Resolved> resolved(data->get_resolved("self-use-first/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("self-use-first/dep")) .change(QualifiedPackageName("self-use-first/target")) @@ -255,7 +255,7 @@ TEST_F(ResolverAnyTestCase, SelfUseSecond) { std::shared_ptr<const Resolved> resolved(data->get_resolved("self-use-second/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("self-use-second/dep")) .change(QualifiedPackageName("self-use-second/target")) @@ -277,7 +277,7 @@ TEST_F(ResolverAnyTestCase, SelfUseNeither) { std::shared_ptr<const Resolved> resolved(data->get_resolved("self-use-neither/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("self-use-neither/dep")) .change(QualifiedPackageName("self-use-neither/target")) @@ -303,7 +303,7 @@ TEST_F(ResolverAnyTestCase, SelfOrOther) std::shared_ptr<const Resolved> resolved(data->get_resolved("self-or-other/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("self-or-other/target")) .finished()), @@ -326,7 +326,7 @@ TEST_F(ResolverAnyTestCase, UpgradeOverAny) std::shared_ptr<const Resolved> resolved(data->get_resolved("upgrade-over-any/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("upgrade-over-any/dep")) .change(QualifiedPackageName("upgrade-over-any/target")) diff --git a/paludis/resolver/resolver_TEST_binaries.cc b/paludis/resolver/resolver_TEST_binaries.cc index 4b8fe1b60..e0cb541a7 100644 --- a/paludis/resolver/resolver_TEST_binaries.cc +++ b/paludis/resolver/resolver_TEST_binaries.cc @@ -75,7 +75,7 @@ TEST_F(ResolverBinariesTestCase, SelfBuildBinary) { std::shared_ptr<const Resolved> resolved(data->get_resolved("self-build-binary/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("self-build-binary/target")) .finished()), @@ -98,7 +98,7 @@ TEST_F(ResolverBinariesTestCase, SelfRunBinary) { std::shared_ptr<const Resolved> resolved(data->get_resolved("self-run-binary/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("self-run-binary/dep")) .change(QualifiedPackageName("self-run-binary/dep")) diff --git a/paludis/resolver/resolver_TEST_blockers.cc b/paludis/resolver/resolver_TEST_blockers.cc index fa319b526..4518bbd90 100644 --- a/paludis/resolver/resolver_TEST_blockers.cc +++ b/paludis/resolver/resolver_TEST_blockers.cc @@ -98,7 +98,7 @@ namespace data->install("hard", "z-pkg", "1")->behaviours_set()->insert(transient_ ? "transient" : ""); std::shared_ptr<const Resolved> resolved(data->get_resolved("hard/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("hard/a-pkg")) .change(QualifiedPackageName("hard/z-pkg")) @@ -136,7 +136,7 @@ namespace data->install("unfixable", "a-pkg", "1")->behaviours_set()->insert(transient_ ? "transient" : ""); std::shared_ptr<const Resolved> resolved(data->get_resolved("unfixable/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("unfixable/target")) .finished()), @@ -176,7 +176,7 @@ namespace data->install("remove", "z-pkg", "1")->behaviours_set()->insert(transient_ ? "transient" : ""); std::shared_ptr<const Resolved> resolved(data->get_resolved("remove/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .remove(QualifiedPackageName("remove/a-pkg")) .remove(QualifiedPackageName("remove/z-pkg")) @@ -219,7 +219,7 @@ namespace std::shared_ptr<const Resolved> resolved(data->get_resolved(make_uninstall_blocker( parse_user_package_dep_spec("target/target", &data->env, UserPackageDepSpecOptions())))); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = exists_ ? make_shared_copy(DecisionChecks() .remove(QualifiedPackageName("target/target")) .finished()) : make_shared_copy(DecisionChecks() @@ -261,7 +261,7 @@ namespace std::shared_ptr<const Resolved> resolved(data->get_resolved("blocked-and-dep/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("blocked-and-dep/target")) .finished()), @@ -296,7 +296,7 @@ TEST_F(ResolverBlockers0TestCase, Cycle) data->install("block-and-dep-cycle", "target", "0"); std::shared_ptr<const Resolved> resolved(data->get_resolved("block-and-dep-cycle/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("block-and-dep-cycle/dep")) .change(QualifiedPackageName("block-and-dep-cycle/target")) @@ -319,7 +319,7 @@ TEST_F(ResolverBlockers0TestCase, HardBlockAndDepCycle) data->install("hard-block-and-dep-cycle", "target", "0"); std::shared_ptr<const Resolved> resolved(data->get_resolved("hard-block-and-dep-cycle/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .finished()), n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks() @@ -408,7 +408,7 @@ namespace .finished()); } - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = checks, n::taken_unable_to_make_decisions() = u_checks, n::taken_unconfirmed_decisions() = make_shared_copy(ResolverTestCase::DecisionChecks() @@ -506,7 +506,7 @@ TEST_F(ResolverBlockersTestCase, UninstallBlockedAfter) std::shared_ptr<const Resolved> resolved(data->get_resolved("uninstall-blocked-after/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("uninstall-blocked-after/target")) .remove(QualifiedPackageName("uninstall-blocked-after/dep")) @@ -530,7 +530,7 @@ TEST_F(ResolverBlockersTestCase, UninstallBlockedBefore) data->allowed_to_remove_helper.add_allowed_to_remove_spec(parse_user_package_dep_spec("uninstall-blocked-before/dep", &data->env, UserPackageDepSpecOptions())); std::shared_ptr<const Resolved> resolved(data->get_resolved("uninstall-blocked-before/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .remove(QualifiedPackageName("uninstall-blocked-before/dep")) .change(QualifiedPackageName("uninstall-blocked-before/target")) @@ -554,7 +554,7 @@ TEST_F(ResolverBlockersTestCase, UpgradeBlockedBefore) data->allowed_to_remove_helper.add_allowed_to_remove_spec(parse_user_package_dep_spec("upgrade-blocked-before/dep", &data->env, UserPackageDepSpecOptions())); std::shared_ptr<const Resolved> resolved(data->get_resolved("upgrade-blocked-before/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("upgrade-blocked-before/dep")) .change(QualifiedPackageName("upgrade-blocked-before/target")) @@ -577,7 +577,7 @@ TEST_F(ResolverBlockersTestCase, Manual) data->install("manual", "dep", "1"); std::shared_ptr<const Resolved> resolved(data->get_resolved("manual/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("manual/target")) .finished()), @@ -600,7 +600,7 @@ TEST_F(ResolverBlockersTestCase, OtherSlotFirst) data->install("other-slot-first", "dep", "1")->set_slot(SlotName("1")); std::shared_ptr<const Resolved> resolved(data->get_resolved("other-slot-first/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change_slot(QualifiedPackageName("other-slot-first/dep"), SlotName("1")) .change_slot(QualifiedPackageName("other-slot-first/dep"), SlotName("2")) diff --git a/paludis/resolver/resolver_TEST_continue_on_failure.cc b/paludis/resolver/resolver_TEST_continue_on_failure.cc index 4e2ac571f..2771a395f 100644 --- a/paludis/resolver/resolver_TEST_continue_on_failure.cc +++ b/paludis/resolver/resolver_TEST_continue_on_failure.cc @@ -116,7 +116,7 @@ namespace std::shared_ptr<const Resolved> resolved(data->get_resolved("continue-on-failure/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("continue-on-failure/direct-dep")) .change(QualifiedPackageName("continue-on-failure/indirect-dep")) @@ -178,7 +178,7 @@ TEST_F(ResolverContinueOnFailureTestCase, Uninstall) std::shared_ptr<const Resolved> resolved(data->get_resolved(make_uninstall_blocker( parse_user_package_dep_spec("continue-on-failure-uninstall/target", &data->env, { })))); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .remove(QualifiedPackageName("continue-on-failure-uninstall/needs-target")) .remove(QualifiedPackageName("continue-on-failure-uninstall/target")) @@ -226,7 +226,7 @@ TEST_F(ResolverContinueOnFailureTestCase, Purge) std::shared_ptr<const Resolved> resolved(data->get_resolved("continue-on-failure-purge/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("continue-on-failure-purge/target")) .remove(QualifiedPackageName("continue-on-failure-purge/going")) diff --git a/paludis/resolver/resolver_TEST_cycles.cc b/paludis/resolver/resolver_TEST_cycles.cc index 2e5db637e..d0339e045 100644 --- a/paludis/resolver/resolver_TEST_cycles.cc +++ b/paludis/resolver/resolver_TEST_cycles.cc @@ -79,7 +79,7 @@ TEST_F(ResolverCyclesTestCase, NoChanges) std::shared_ptr<const Resolved> resolved(data->get_resolved("no-changes/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("no-changes/target")) .finished()), @@ -101,7 +101,7 @@ TEST_F(ResolverCyclesTestCase, ExistingUsable) data->install("existing-usable", "dep", "1"); std::shared_ptr<const Resolved> resolved(data->get_resolved("existing-usable/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("existing-usable/target")) .change(QualifiedPackageName("existing-usable/dep")) @@ -123,7 +123,7 @@ TEST_F(ResolverCyclesTestCase, MutualRunDeps) { std::shared_ptr<const Resolved> resolved(data->get_resolved("mutual-run-deps/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("mutual-run-deps/dep-a")) .change(QualifiedPackageName("mutual-run-deps/dep-b")) @@ -147,7 +147,7 @@ TEST_F(ResolverCyclesTestCase, MutualBuildDeps) { std::shared_ptr<const Resolved> resolved(data->get_resolved("mutual-build-deps/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("mutual-build-deps/target")) .finished()), @@ -217,7 +217,7 @@ namespace .finished()); } - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = checks, n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks() .finished()), @@ -289,7 +289,7 @@ namespace .finished()); } - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = checks, n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks() .finished()), @@ -327,7 +327,7 @@ TEST_F(ResolverCyclesTestCase, CycleDeps) std::shared_ptr<const Resolved> resolved(data->get_resolved("cycle-deps/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("cycle-deps/target")) .finished()), @@ -354,7 +354,7 @@ TEST_F(ResolverCyclesTestCase, BuildAgainstBlock) { std::shared_ptr<const Resolved> resolved(data->get_resolved("build-against-block/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("build-against-block/dep-b")) .change(QualifiedPackageName("build-against-block/dep-a")) diff --git a/paludis/resolver/resolver_TEST_errors.cc b/paludis/resolver/resolver_TEST_errors.cc index d4d925a56..f39c8bced 100644 --- a/paludis/resolver/resolver_TEST_errors.cc +++ b/paludis/resolver/resolver_TEST_errors.cc @@ -73,7 +73,7 @@ TEST_F(ResolverErrorsTestCase, UnableToDecideThenMore) { std::shared_ptr<const Resolved> resolved(data->get_resolved("unable-to-decide-then-more/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("unable-to-decide-then-more/pkg-b")) .change(QualifiedPackageName("unable-to-decide-then-more/target")) diff --git a/paludis/resolver/resolver_TEST_fetches.cc b/paludis/resolver/resolver_TEST_fetches.cc index 80d41b2fa..7f51f8e27 100644 --- a/paludis/resolver/resolver_TEST_fetches.cc +++ b/paludis/resolver/resolver_TEST_fetches.cc @@ -101,7 +101,7 @@ TEST_F(ResolverFetchTestCase, Fetch) { std::shared_ptr<const Resolved> resolved(data->get_resolved("fetch/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("fetch/fetch-dep")) .change(QualifiedPackageName("fetch/target")) diff --git a/paludis/resolver/resolver_TEST_purges.cc b/paludis/resolver/resolver_TEST_purges.cc index 0da210b54..3a0d14b9d 100644 --- a/paludis/resolver/resolver_TEST_purges.cc +++ b/paludis/resolver/resolver_TEST_purges.cc @@ -83,7 +83,7 @@ TEST_F(ResolverPurgesTestCase, Purges) data->get_use_existing_nothing_helper.set_use_existing_for_dependencies(ue_if_possible); std::shared_ptr<const Resolved> resolved(data->get_resolved("purges/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("purges/new-dep")) .change(QualifiedPackageName("purges/target")) @@ -116,7 +116,7 @@ TEST_F(ResolverPurgesTestCase, StarSlotPurges) std::shared_ptr<const Resolved> resolved(data->get_resolved(make_uninstall_blocker( parse_user_package_dep_spec("star-slot-purges/target:1", &data->env, { })))); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .remove(QualifiedPackageName("star-slot-purges/target")) .finished()), diff --git a/paludis/resolver/resolver_TEST_serialisation.cc b/paludis/resolver/resolver_TEST_serialisation.cc index fc1b687ae..0a9e5f933 100644 --- a/paludis/resolver/resolver_TEST_serialisation.cc +++ b/paludis/resolver/resolver_TEST_serialisation.cc @@ -85,7 +85,7 @@ TEST_F(ResolverSerialisationTestCase, Serialisation) resolved = std::make_shared<Resolved>(Resolved::deserialise(desern)); } - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("serialisation/dep")) .change(QualifiedPackageName("serialisation/target")) diff --git a/paludis/resolver/resolver_TEST_simple.cc b/paludis/resolver/resolver_TEST_simple.cc index 4bd2328cb..fa8b4076e 100644 --- a/paludis/resolver/resolver_TEST_simple.cc +++ b/paludis/resolver/resolver_TEST_simple.cc @@ -71,7 +71,7 @@ namespace TEST_F(ResolverSimpleTestCase, NoDeps) { std::shared_ptr<const Resolved> resolved(data->get_resolved("no-deps/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("no-deps/target")) .finished()), @@ -92,7 +92,7 @@ TEST_F(ResolverSimpleTestCase, BuildDeps) { std::shared_ptr<const Resolved> resolved(data->get_resolved("build-deps/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("build-deps/a-dep")) .change(QualifiedPackageName("build-deps/b-dep")) @@ -116,7 +116,7 @@ TEST_F(ResolverSimpleTestCase, RunDeps) { std::shared_ptr<const Resolved> resolved(data->get_resolved("run-deps/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("run-deps/a-dep")) .change(QualifiedPackageName("run-deps/b-dep")) @@ -140,7 +140,7 @@ TEST_F(ResolverSimpleTestCase, PostDeps) { std::shared_ptr<const Resolved> resolved(data->get_resolved("post-deps/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("post-deps/a-dep")) .change(QualifiedPackageName("post-deps/b-dep")) diff --git a/paludis/resolver/resolver_TEST_suggestions.cc b/paludis/resolver/resolver_TEST_suggestions.cc index 9578acbb2..15acc486d 100644 --- a/paludis/resolver/resolver_TEST_suggestions.cc +++ b/paludis/resolver/resolver_TEST_suggestions.cc @@ -72,7 +72,7 @@ TEST_F(ResolverSuggestionsTestCase, Suggestion) { std::shared_ptr<const Resolved> resolved(data->get_resolved("suggestion/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("suggestion/target")) .finished()), @@ -94,7 +94,7 @@ TEST_F(ResolverSuggestionsTestCase, Unmeetable) { std::shared_ptr<const Resolved> resolved(data->get_resolved("unmeetable-suggestion/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("unmeetable-suggestion/target")) .finished()), @@ -116,7 +116,7 @@ TEST_F(ResolverSuggestionsTestCase, SuggestionThenDependency) { std::shared_ptr<const Resolved> resolved(data->get_resolved("suggestion-then-dependency/target")); - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .change(QualifiedPackageName("suggestion-then-dependency/a-suggested-dep")) .change(QualifiedPackageName("suggestion-then-dependency/hard-dep")) diff --git a/paludis/resolver/resolver_TEST_uninstalls.cc b/paludis/resolver/resolver_TEST_uninstalls.cc index e4aea101e..377795c3a 100644 --- a/paludis/resolver/resolver_TEST_uninstalls.cc +++ b/paludis/resolver/resolver_TEST_uninstalls.cc @@ -97,7 +97,7 @@ namespace parse_user_package_dep_spec("breaking/target", &data->env, UserPackageDepSpecOptions())))); if (allowed_to_remove_) - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .remove(QualifiedPackageName("breaking/dep")) .remove(QualifiedPackageName("breaking/target")) @@ -114,7 +114,7 @@ namespace .finished()) ); else if (confirm_) - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .remove(QualifiedPackageName("breaking/target")) .finished()), @@ -130,7 +130,7 @@ namespace .finished()) ); else - check_resolved(resolved, + this->check_resolved(resolved, n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks() .remove(QualifiedPackageName("breaking/target")) .finished()), |