aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-06-13 14:46:28 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-06-14 12:11:28 +0100
commit961537a03c94b4bc74647f2a91e6703994fc6298 (patch)
tree6361f1c5209227e68f8cc54490e66be280f2cdbe
parent9138fea09f5bdd7d9e70a390ea30dbcfe580f439 (diff)
downloadpaludis-961537a03c94b4bc74647f2a91e6703994fc6298.tar.gz
paludis-961537a03c94b4bc74647f2a91e6703994fc6298.tar.xz
Common base for ChangesToMake and Remove Decisions
-rw-r--r--paludis/resolver/decision-fwd.hh3
-rw-r--r--paludis/resolver/decision.hh9
2 files changed, 9 insertions, 3 deletions
diff --git a/paludis/resolver/decision-fwd.hh b/paludis/resolver/decision-fwd.hh
index 0d118df..0f4a3ae 100644
--- a/paludis/resolver/decision-fwd.hh
+++ b/paludis/resolver/decision-fwd.hh
@@ -28,11 +28,12 @@ namespace paludis
namespace resolver
{
class Decision;
+ class ChangeOrRemoveDecision;
class NothingNoChangeDecision;
class ExistingNoChangeDecision;
- class ChangesToMakeDecision;
class UnableToMakeDecision;
+ class ChangesToMakeDecision;
class RemoveDecision;
}
}
diff --git a/paludis/resolver/decision.hh b/paludis/resolver/decision.hh
index 8b5f9a1..877bbbf 100644
--- a/paludis/resolver/decision.hh
+++ b/paludis/resolver/decision.hh
@@ -91,8 +91,13 @@ namespace paludis
virtual void serialise(Serialiser &) const;
};
+ class PALUDIS_VISIBLE ChangeOrRemoveDecision :
+ public Decision
+ {
+ };
+
class PALUDIS_VISIBLE ChangesToMakeDecision :
- public Decision,
+ public ChangeOrRemoveDecision,
public ImplementAcceptMethods<Decision, ChangesToMakeDecision>,
private PrivateImplementationPattern<ChangesToMakeDecision>,
public std::tr1::enable_shared_from_this<ChangesToMakeDecision>
@@ -131,7 +136,7 @@ namespace paludis
};
class PALUDIS_VISIBLE RemoveDecision :
- public Decision,
+ public ChangeOrRemoveDecision,
public ImplementAcceptMethods<Decision, RemoveDecision>,
private PrivateImplementationPattern<RemoveDecision>,
public std::tr1::enable_shared_from_this<RemoveDecision>