aboutsummaryrefslogtreecommitdiff
path: root/paludis
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-12 01:11:43 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-12 01:12:11 +0100
commit0c9893ceeca308897238e4c2190607d570f7feba (patch)
tree9c705b1f4bb1ece4790f3f547e993f4d72e8cd0f /paludis
parent8653241b4e943999757f30451f24a2ccc8d9862c (diff)
downloadpaludis-0c9893ceeca308897238e4c2190607d570f7feba.tar.gz
paludis-0c9893ceeca308897238e4c2190607d570f7feba.tar.xz
Kill AssociationMask
Diffstat (limited to 'paludis')
-rw-r--r--paludis/mask-fwd.hh1
-rw-r--r--paludis/mask.cc5
-rw-r--r--paludis/mask.hh26
-rw-r--r--paludis/mask_utils.cc5
-rw-r--r--paludis/user_dep_spec.cc10
5 files changed, 1 insertions, 46 deletions
diff --git a/paludis/mask-fwd.hh b/paludis/mask-fwd.hh
index f10225045..fef304428 100644
--- a/paludis/mask-fwd.hh
+++ b/paludis/mask-fwd.hh
@@ -36,7 +36,6 @@ namespace paludis
class UnacceptedMask;
class RepositoryMask;
class UnsupportedMask;
- class AssociationMask;
struct OverriddenMask;
diff --git a/paludis/mask.cc b/paludis/mask.cc
index 0f3bafd31..ae3f6c220 100644
--- a/paludis/mask.cc
+++ b/paludis/mask.cc
@@ -60,11 +60,6 @@ namespace
{
return "";
}
-
- std::string visit(const AssociationMask &) const
- {
- return "";
- }
};
}
diff --git a/paludis/mask.hh b/paludis/mask.hh
index 39b7f9fd0..602c4c6ae 100644
--- a/paludis/mask.hh
+++ b/paludis/mask.hh
@@ -71,7 +71,7 @@ namespace paludis
*/
class PALUDIS_VISIBLE Mask :
public virtual DeclareAbstractAcceptMethods<Mask, MakeTypeList<
- UserMask, UnacceptedMask, RepositoryMask, UnsupportedMask, AssociationMask>::Type>
+ UserMask, UnacceptedMask, RepositoryMask, UnsupportedMask>::Type>
{
public:
///\name Basic operations
@@ -193,30 +193,6 @@ namespace paludis
};
/**
- * An AssociationMask is a Mask that signifies that a PackageID is masked
- * because of its association with another PackageID that is itself masked.
- *
- * This is used by old-style virtuals. If the provider of a virtual is
- * masked then the virtual itself is masked by association.
- *
- * \ingroup g_mask
- * \since 0.26
- * \nosubgrouping
- */
- class PALUDIS_VISIBLE AssociationMask :
- public Mask,
- public ImplementAcceptMethods<Mask, AssociationMask>
- {
- public:
- /**
- * Fetch a spec identifying the associated package.
- *
- * \since 0.59
- */
- virtual const PackageDepSpec associated_package_spec() const = 0;
- };
-
- /**
* An OverriddenMask holds a Mask and an explanation of why it has been overridden.
*
* \ingroup g_mask
diff --git a/paludis/mask_utils.cc b/paludis/mask_utils.cc
index b81209023..7a26dd4f2 100644
--- a/paludis/mask_utils.cc
+++ b/paludis/mask_utils.cc
@@ -75,11 +75,6 @@ namespace
{
return false;
}
-
- bool visit(const AssociationMask &) const
- {
- return false;
- }
};
}
diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc
index ab3ec1167..404f42d18 100644
--- a/paludis/user_dep_spec.cc
+++ b/paludis/user_dep_spec.cc
@@ -868,11 +868,6 @@ namespace
{
return 0;
}
-
- const MetadataKey * const visit(const AssociationMask &) const
- {
- return 0;
- }
};
struct MaskChecker
@@ -898,11 +893,6 @@ namespace
{
return key == "*" || key == "unsupported";
}
-
- bool visit(const AssociationMask &) const
- {
- return key == "*" || key == "association";
- }
};
}