aboutsummaryrefslogtreecommitdiff
path: root/paludis/resolver/reason.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-19 18:06:02 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-19 18:06:02 +0100
commita3e36c8d731798e9ca930b9fdd4e99cda155dbd5 (patch)
treef076828e0704c95e7fd0b9394d4b3e47d0ef75d3 /paludis/resolver/reason.cc
parent726d87775ad381f4c38bf336e02437a9f3bed037 (diff)
downloadpaludis-a3e36c8d731798e9ca930b9fdd4e99cda155dbd5.tar.gz
paludis-a3e36c8d731798e9ca930b9fdd4e99cda155dbd5.tar.xz
Make some ChangeByResolvents into DependentPackageIDs
Diffstat (limited to 'paludis/resolver/reason.cc')
-rw-r--r--paludis/resolver/reason.cc21
1 files changed, 12 insertions, 9 deletions
diff --git a/paludis/resolver/reason.cc b/paludis/resolver/reason.cc
index 50977f458..c966b7496 100644
--- a/paludis/resolver/reason.cc
+++ b/paludis/resolver/reason.cc
@@ -21,10 +21,13 @@
#include <paludis/resolver/resolvent.hh>
#include <paludis/resolver/sanitised_dependencies.hh>
#include <paludis/resolver/change_by_resolvent.hh>
+#include <paludis/resolver/collect_depped_upon.hh>
+
#include <paludis/util/stringify.hh>
#include <paludis/util/pimp-impl.hh>
#include <paludis/util/sequence-impl.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
+
#include <paludis/serialise-impl.hh>
#include <paludis/changed_choices.hh>
@@ -156,16 +159,16 @@ namespace paludis
template <>
struct Imp<DependentReason>
{
- const ChangeByResolvent id_being_removed;
+ const DependentPackageID dependent_upon;
- Imp(const ChangeByResolvent & i) :
- id_being_removed(i)
+ Imp(const DependentPackageID & i) :
+ dependent_upon(i)
{
}
};
}
-DependentReason::DependentReason(const ChangeByResolvent & i) :
+DependentReason::DependentReason(const DependentPackageID & i) :
_imp(i)
{
}
@@ -174,17 +177,17 @@ DependentReason::~DependentReason()
{
}
-const ChangeByResolvent
-DependentReason::id_and_resolvent_being_removed() const
+const DependentPackageID
+DependentReason::dependent_upon() const
{
- return _imp->id_being_removed;
+ return _imp->dependent_upon;
}
void
DependentReason::serialise(Serialiser & s) const
{
s.object("DependentReason")
- .member(SerialiserFlags<>(), "id_and_resolvent_being_removed", id_and_resolvent_being_removed())
+ .member(SerialiserFlags<>(), "dependent_upon", dependent_upon())
;
}
@@ -454,7 +457,7 @@ Reason::deserialise(Deserialisation & d)
{
Deserialisator v(d, "DependentReason");
return std::make_shared<DependentReason>(
- v.member<ChangeByResolvent>("id_and_resolvent_being_removed")
+ v.member<DependentPackageID>("dependent_upon")
);
}
else if (d.class_name() == "WasUsedByReason")