aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-06-14 20:15:56 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-06-14 20:15:56 +0100
commitc84c91aed69c43772e0684cd4d05a638f80e44ac (patch)
treeabcb0783958b9a15a0e2620595063e64ca004f4d
parentbad0e1b891c786bf1373194fda7bdd67af7196f2 (diff)
downloadpaludis-c84c91aed69c43772e0684cd4d05a638f80e44ac.tar.gz
paludis-c84c91aed69c43772e0684cd4d05a638f80e44ac.tar.xz
display_change_or_remove_decisions -> taken_change_or_remove_decisions
-rw-r--r--paludis/resolver/lineariser.cc2
-rw-r--r--paludis/resolver/resolved.cc10
-rw-r--r--paludis/resolver/resolved.hh4
-rw-r--r--paludis/resolver/resolver.cc2
-rw-r--r--paludis/resolver/resolver_TEST_any.cc8
-rw-r--r--paludis/resolver/resolver_TEST_blockers.cc12
-rw-r--r--paludis/resolver/resolver_TEST_cycles.cc8
-rw-r--r--paludis/resolver/resolver_TEST_errors.cc2
-rw-r--r--paludis/resolver/resolver_TEST_serialisation.cc2
-rw-r--r--paludis/resolver/resolver_TEST_simple.cc8
-rw-r--r--paludis/resolver/resolver_TEST_suggestions.cc6
-rw-r--r--paludis/resolver/resolver_TEST_virtuals.cc4
-rw-r--r--paludis/resolver/resolver_test.cc6
-rw-r--r--paludis/resolver/resolver_test.hh2
-rw-r--r--src/clients/cave/cmd_display_resolution.cc2
15 files changed, 39 insertions, 39 deletions
diff --git a/paludis/resolver/lineariser.cc b/paludis/resolver/lineariser.cc
index f0b8916..32315ba 100644
--- a/paludis/resolver/lineariser.cc
+++ b/paludis/resolver/lineariser.cc
@@ -464,6 +464,6 @@ Lineariser::linearise_sub_ssccs(
void
Lineariser::schedule(const std::tr1::shared_ptr<const ChangeOrRemoveDecision> & d)
{
- _imp->resolved->display_change_or_remove_decisions()->push_back(d);
+ _imp->resolved->taken_change_or_remove_decisions()->push_back(d);
}
diff --git a/paludis/resolver/resolved.cc b/paludis/resolver/resolved.cc
index 0be519a..9be43f5 100644
--- a/paludis/resolver/resolved.cc
+++ b/paludis/resolver/resolved.cc
@@ -31,8 +31,8 @@ void
Resolved::serialise(Serialiser & s) const
{
s.object("Resolved")
- .member(SerialiserFlags<serialise::container, serialise::might_be_null>(), "display_change_or_remove_decisions", display_change_or_remove_decisions())
.member(SerialiserFlags<serialise::might_be_null>(), "resolutions_by_resolvent", resolutions_by_resolvent())
+ .member(SerialiserFlags<serialise::container, serialise::might_be_null>(), "taken_change_or_remove_decisions", taken_change_or_remove_decisions())
.member(SerialiserFlags<serialise::container, serialise::might_be_null>(), "taken_unable_to_make_decisions", taken_unable_to_make_decisions())
.member(SerialiserFlags<serialise::container, serialise::might_be_null>(), "untaken_change_or_remove_decisions", untaken_change_or_remove_decisions())
.member(SerialiserFlags<serialise::container, serialise::might_be_null>(), "untaken_unable_to_make_decisions", untaken_unable_to_make_decisions())
@@ -44,11 +44,11 @@ Resolved::deserialise(Deserialisation & d)
{
Deserialisator v(d, "Resolved");
- std::tr1::shared_ptr<Decisions<ChangeOrRemoveDecision> > display_change_or_remove_decisions(new Decisions<ChangeOrRemoveDecision>);
+ std::tr1::shared_ptr<Decisions<ChangeOrRemoveDecision> > taken_change_or_remove_decisions(new Decisions<ChangeOrRemoveDecision>);
{
- Deserialisator vv(*v.find_remove_member("display_change_or_remove_decisions"), "c");
+ Deserialisator vv(*v.find_remove_member("taken_change_or_remove_decisions"), "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
- display_change_or_remove_decisions->push_back(vv.member<std::tr1::shared_ptr<ChangeOrRemoveDecision> >(stringify(n)));
+ taken_change_or_remove_decisions->push_back(vv.member<std::tr1::shared_ptr<ChangeOrRemoveDecision> >(stringify(n)));
}
std::tr1::shared_ptr<Decisions<UnableToMakeDecision> > taken_unable_to_make_decisions(new Decisions<UnableToMakeDecision>);
@@ -73,8 +73,8 @@ Resolved::deserialise(Deserialisation & d)
}
return make_named_values<Resolved>(
- n::display_change_or_remove_decisions() = display_change_or_remove_decisions,
n::resolutions_by_resolvent() = v.member<std::tr1::shared_ptr<ResolutionsByResolvent> >("resolutions_by_resolvent"),
+ n::taken_change_or_remove_decisions() = taken_change_or_remove_decisions,
n::taken_unable_to_make_decisions() = taken_unable_to_make_decisions,
n::untaken_change_or_remove_decisions() = untaken_change_or_remove_decisions,
n::untaken_unable_to_make_decisions() = untaken_unable_to_make_decisions
diff --git a/paludis/resolver/resolved.hh b/paludis/resolver/resolved.hh
index 607c2c1..f4ff2c6 100644
--- a/paludis/resolver/resolved.hh
+++ b/paludis/resolver/resolved.hh
@@ -32,8 +32,8 @@ namespace paludis
{
namespace n
{
- typedef Name<struct display_change_or_remove_decisions_name> display_change_or_remove_decisions;
typedef Name<struct resolutions_by_resolvent_name> resolutions_by_resolvent;
+ typedef Name<struct taken_change_or_remove_decisions_name> taken_change_or_remove_decisions;
typedef Name<struct taken_unable_to_make_decisions_name> taken_unable_to_make_decisions;
typedef Name<struct untaken_change_or_remove_decisions_name> untaken_change_or_remove_decisions;
typedef Name<struct untaken_unable_to_make_decisions_name> untaken_unable_to_make_decisions;
@@ -43,8 +43,8 @@ namespace paludis
{
struct Resolved
{
- NamedValue<n::display_change_or_remove_decisions, std::tr1::shared_ptr<Decisions<ChangeOrRemoveDecision> > > display_change_or_remove_decisions;
NamedValue<n::resolutions_by_resolvent, std::tr1::shared_ptr<ResolutionsByResolvent> > resolutions_by_resolvent;
+ NamedValue<n::taken_change_or_remove_decisions, std::tr1::shared_ptr<Decisions<ChangeOrRemoveDecision> > > taken_change_or_remove_decisions;
NamedValue<n::taken_unable_to_make_decisions, std::tr1::shared_ptr<Decisions<UnableToMakeDecision> > > taken_unable_to_make_decisions;
NamedValue<n::untaken_change_or_remove_decisions, std::tr1::shared_ptr<Decisions<ChangeOrRemoveDecision> > > untaken_change_or_remove_decisions;
NamedValue<n::untaken_unable_to_make_decisions, std::tr1::shared_ptr<Decisions<UnableToMakeDecision> > > untaken_unable_to_make_decisions;
diff --git a/paludis/resolver/resolver.cc b/paludis/resolver/resolver.cc
index 9315080..f983498 100644
--- a/paludis/resolver/resolver.cc
+++ b/paludis/resolver/resolver.cc
@@ -76,8 +76,8 @@ namespace paludis
n::untaken_job_ids() = make_shared_ptr(new JobIDSequence)
))),
resolved(new Resolved(make_named_values<Resolved>(
- n::display_change_or_remove_decisions() = make_shared_ptr(new Decisions<ChangeOrRemoveDecision>),
n::resolutions_by_resolvent() = lists->resolutions_by_resolvent(),
+ n::taken_change_or_remove_decisions() = make_shared_ptr(new Decisions<ChangeOrRemoveDecision>),
n::taken_unable_to_make_decisions() = make_shared_ptr(new Decisions<UnableToMakeDecision>),
n::untaken_change_or_remove_decisions() = make_shared_ptr(new Decisions<ChangeOrRemoveDecision>),
n::untaken_unable_to_make_decisions() = make_shared_ptr(new Decisions<UnableToMakeDecision>)
diff --git a/paludis/resolver/resolver_TEST_any.cc b/paludis/resolver/resolver_TEST_any.cc
index eb4e03a..92a6c20 100644
--- a/paludis/resolver/resolver_TEST_any.cc
+++ b/paludis/resolver/resolver_TEST_any.cc
@@ -77,7 +77,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("test/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("test/target"))
.finished()),
n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
@@ -103,7 +103,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("test/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("test/dep"))
.change(QualifiedPackageName("test/target"))
.finished()),
@@ -130,7 +130,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("test/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("test/target"))
.finished()),
n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
@@ -194,7 +194,7 @@ namespace test_cases
}
check_resolved(resolved,
- n::display_change_or_remove_decisions() = checks,
+ n::taken_change_or_remove_decisions() = checks,
n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
.finished()),
n::untaken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
diff --git a/paludis/resolver/resolver_TEST_blockers.cc b/paludis/resolver/resolver_TEST_blockers.cc
index 0cdd1f4..fdf3aa5 100644
--- a/paludis/resolver/resolver_TEST_blockers.cc
+++ b/paludis/resolver/resolver_TEST_blockers.cc
@@ -82,7 +82,7 @@ namespace test_cases
{
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("hard/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("hard/a-pkg"))
.change(QualifiedPackageName("hard/z-pkg"))
.change(QualifiedPackageName("hard/target"))
@@ -112,7 +112,7 @@ namespace test_cases
{
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("unfixable/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("unfixable/target"))
.finished()),
n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
@@ -142,7 +142,7 @@ namespace test_cases
{
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("remove/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.remove(QualifiedPackageName("remove/a-pkg"))
.change(QualifiedPackageName("remove/target"))
.finished()),
@@ -178,7 +178,7 @@ namespace test_cases
false)));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = exists ? make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = exists ? make_shared_copy(DecisionChecks()
.remove(QualifiedPackageName("target/target"))
.finished()) : make_shared_copy(DecisionChecks()
.finished()),
@@ -216,7 +216,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("blocked-and-dep/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("blocked-and-dep/target"))
.finished()),
n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
@@ -246,7 +246,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("block-and-dep-cycle/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("block-and-dep-cycle/dep"))
.change(QualifiedPackageName("block-and-dep-cycle/target"))
.finished()),
diff --git a/paludis/resolver/resolver_TEST_cycles.cc b/paludis/resolver/resolver_TEST_cycles.cc
index a1df690..3f673fe 100644
--- a/paludis/resolver/resolver_TEST_cycles.cc
+++ b/paludis/resolver/resolver_TEST_cycles.cc
@@ -97,7 +97,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("no-changes/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("no-changes/target"))
.finished()),
n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
@@ -123,7 +123,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("existing-usable/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("existing-usable/target"))
.change(QualifiedPackageName("existing-usable/dep"))
.finished()),
@@ -146,7 +146,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("mutual-run-deps/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("mutual-run-deps/dep-a"))
.change(QualifiedPackageName("mutual-run-deps/dep-b"))
.change(QualifiedPackageName("mutual-run-deps/dep-c"))
@@ -221,7 +221,7 @@ namespace test_cases
TEST_CHECK(false);
check_resolved(resolved,
- n::display_change_or_remove_decisions() = checks,
+ n::taken_change_or_remove_decisions() = checks,
n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
.finished()),
n::untaken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
diff --git a/paludis/resolver/resolver_TEST_errors.cc b/paludis/resolver/resolver_TEST_errors.cc
index 3e71e75..ee744ae 100644
--- a/paludis/resolver/resolver_TEST_errors.cc
+++ b/paludis/resolver/resolver_TEST_errors.cc
@@ -75,7 +75,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("unable-to-decide-then-more/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ 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"))
.finished()),
diff --git a/paludis/resolver/resolver_TEST_serialisation.cc b/paludis/resolver/resolver_TEST_serialisation.cc
index 066f4f0..faf9d31 100644
--- a/paludis/resolver/resolver_TEST_serialisation.cc
+++ b/paludis/resolver/resolver_TEST_serialisation.cc
@@ -88,7 +88,7 @@ namespace test_cases
}
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("serialisation/dep"))
.change(QualifiedPackageName("serialisation/target"))
.finished()),
diff --git a/paludis/resolver/resolver_TEST_simple.cc b/paludis/resolver/resolver_TEST_simple.cc
index e12a5d0..7b0985b 100644
--- a/paludis/resolver/resolver_TEST_simple.cc
+++ b/paludis/resolver/resolver_TEST_simple.cc
@@ -74,7 +74,7 @@ namespace test_cases
{
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("no-deps/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("no-deps/target"))
.finished()),
n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
@@ -96,7 +96,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("build-deps/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("build-deps/a-dep"))
.change(QualifiedPackageName("build-deps/b-dep"))
.change(QualifiedPackageName("build-deps/z-dep"))
@@ -121,7 +121,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("run-deps/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("run-deps/a-dep"))
.change(QualifiedPackageName("run-deps/b-dep"))
.change(QualifiedPackageName("run-deps/z-dep"))
@@ -146,7 +146,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("post-deps/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("post-deps/a-dep"))
.change(QualifiedPackageName("post-deps/b-dep"))
.change(QualifiedPackageName("post-deps/target"))
diff --git a/paludis/resolver/resolver_TEST_suggestions.cc b/paludis/resolver/resolver_TEST_suggestions.cc
index 66ef034..56044da 100644
--- a/paludis/resolver/resolver_TEST_suggestions.cc
+++ b/paludis/resolver/resolver_TEST_suggestions.cc
@@ -75,7 +75,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("suggestion/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("suggestion/target"))
.finished()),
n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
@@ -98,7 +98,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("unmeetable-suggestion/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("unmeetable-suggestion/target"))
.finished()),
n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
@@ -121,7 +121,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("suggestion-then-dependency/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ 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"))
.change(QualifiedPackageName("suggestion-then-dependency/target"))
diff --git a/paludis/resolver/resolver_TEST_virtuals.cc b/paludis/resolver/resolver_TEST_virtuals.cc
index c8ead8a..51247bb 100644
--- a/paludis/resolver/resolver_TEST_virtuals.cc
+++ b/paludis/resolver/resolver_TEST_virtuals.cc
@@ -75,7 +75,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("virtuals/target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("cat/foo-a"))
.change(QualifiedPackageName("virtuals/target"))
.finished()),
@@ -98,7 +98,7 @@ namespace test_cases
std::tr1::shared_ptr<const Resolved> resolved(get_resolved("virtual/virtual-target"));
check_resolved(resolved,
- n::display_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
+ n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("cat/real-target"))
.finished()),
n::taken_unable_to_make_decisions() = make_shared_copy(DecisionChecks()
diff --git a/paludis/resolver/resolver_test.cc b/paludis/resolver/resolver_test.cc
index b2ce300..ff3abcb 100644
--- a/paludis/resolver/resolver_test.cc
+++ b/paludis/resolver/resolver_test.cc
@@ -452,15 +452,15 @@ ResolverTestCase::check_resolved_one(
void
ResolverTestCase::check_resolved(
const std::tr1::shared_ptr<const Resolved> & resolved,
- const NamedValue<n::display_change_or_remove_decisions, const std::tr1::shared_ptr<const DecisionChecks> > & display_change_or_remove_decisions,
+ const NamedValue<n::taken_change_or_remove_decisions, const std::tr1::shared_ptr<const DecisionChecks> > & taken_change_or_remove_decisions,
const NamedValue<n::taken_unable_to_make_decisions, const std::tr1::shared_ptr<const DecisionChecks> > & taken_unable_to_make_decisions,
const NamedValue<n::untaken_change_or_remove_decisions, const std::tr1::shared_ptr<const DecisionChecks> > & untaken_change_or_remove_decisions,
const NamedValue<n::untaken_unable_to_make_decisions, const std::tr1::shared_ptr<const DecisionChecks> > & untaken_unable_to_make_decisions
)
{
{
- TestMessageSuffix s("display change or remove");
- check_resolved_one(resolved->display_change_or_remove_decisions(), display_change_or_remove_decisions());
+ TestMessageSuffix s("taken change or remove");
+ check_resolved_one(resolved->taken_change_or_remove_decisions(), taken_change_or_remove_decisions());
}
{
diff --git a/paludis/resolver/resolver_test.hh b/paludis/resolver/resolver_test.hh
index 54b093c..4f2ea97 100644
--- a/paludis/resolver/resolver_test.hh
+++ b/paludis/resolver/resolver_test.hh
@@ -166,7 +166,7 @@ namespace paludis
void check_resolved(
const std::tr1::shared_ptr<const Resolved> &,
- const NamedValue<n::display_change_or_remove_decisions, const std::tr1::shared_ptr<const DecisionChecks> > &,
+ const NamedValue<n::taken_change_or_remove_decisions, const std::tr1::shared_ptr<const DecisionChecks> > &,
const NamedValue<n::taken_unable_to_make_decisions, const std::tr1::shared_ptr<const DecisionChecks> > &,
const NamedValue<n::untaken_change_or_remove_decisions, const std::tr1::shared_ptr<const DecisionChecks> > &,
const NamedValue<n::untaken_unable_to_make_decisions, const std::tr1::shared_ptr<const DecisionChecks> > &
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index b96f17b..93d1ef5 100644
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -1181,7 +1181,7 @@ namespace
const DisplayResolutionCommandLine & cmdline,
ChoicesToExplain & choices_to_explain)
{
- display_a_changes_and_removes(env, resolved, resolved->display_change_or_remove_decisions(),
+ display_a_changes_and_removes(env, resolved, resolved->taken_change_or_remove_decisions(),
cmdline, choices_to_explain, false, false);
}