aboutsummaryrefslogtreecommitdiff
path: root/paludis
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-09-04 23:30:07 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-09-04 23:30:07 +0100
commit27d57d9ed2f2a24a86b91029638563cd8ccfabab (patch)
treecc8bd72c1be1741d3206735ca591bffac9c49d75 /paludis
parentb5280212886a3a31703600c12608c5a5a8be5555 (diff)
downloadpaludis-27d57d9ed2f2a24a86b91029638563cd8ccfabab.tar.gz
paludis-27d57d9ed2f2a24a86b91029638563cd8ccfabab.tar.xz
Contents is not a MetadataKey
Diffstat (limited to 'paludis')
-rw-r--r--paludis/metadata_key.cc1
-rw-r--r--paludis/metadata_key.hh2
-rw-r--r--paludis/user_dep_spec.cc18
3 files changed, 0 insertions, 21 deletions
diff --git a/paludis/metadata_key.cc b/paludis/metadata_key.cc
index 299e54ecc..2f009e549 100644
--- a/paludis/metadata_key.cc
+++ b/paludis/metadata_key.cc
@@ -91,6 +91,5 @@ namespace paludis
template class MetadataValueKey<FSPath>;
template class MetadataValueKey<SlotName>;
template class MetadataValueKey<std::shared_ptr<const PackageID> >;
- template class MetadataValueKey<std::shared_ptr<const Contents> >;
template class MetadataValueKey<std::shared_ptr<const Choices> >;
}
diff --git a/paludis/metadata_key.hh b/paludis/metadata_key.hh
index 396edcb14..ad7794288 100644
--- a/paludis/metadata_key.hh
+++ b/paludis/metadata_key.hh
@@ -26,7 +26,6 @@
#include <paludis/name-fwd.hh>
#include <paludis/dep_spec-fwd.hh>
#include <paludis/spec_tree.hh>
-#include <paludis/contents-fwd.hh>
#include <paludis/repository-fwd.hh>
#include <paludis/metadata_key_holder.hh>
#include <paludis/choice-fwd.hh>
@@ -104,7 +103,6 @@ namespace paludis
MetadataValueKey<FSPath>,
MetadataValueKey<SlotName>,
MetadataValueKey<std::shared_ptr<const PackageID> >,
- MetadataValueKey<std::shared_ptr<const Contents> >,
MetadataValueKey<std::shared_ptr<const Choices> >,
MetadataTimeKey,
MetadataSectionKey
diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc
index 7c336f686..6d8400514 100644
--- a/paludis/user_dep_spec.cc
+++ b/paludis/user_dep_spec.cc
@@ -643,24 +643,6 @@ namespace
return false;
}
- bool visit(const MetadataValueKey<std::shared_ptr<const Contents> > & s) const
- {
- auto v(s.parse_value());
- switch (op)
- {
- case '=':
- return pattern == join(indirect_iterator(v->begin()), indirect_iterator(v->end()), " ",
- stringify_contents_entry);
- case '<':
- return indirect_iterator(v->end()) != std::find_if(
- indirect_iterator(v->begin()),
- indirect_iterator(v->end()),
- StringifyEqual(pattern));
- }
-
- return false;
- }
-
bool visit(const MetadataValueKey<std::shared_ptr<const PackageID> > & k) const
{
return pattern == stringify(*k.parse_value());