aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-12 00:58:36 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-12 01:12:11 +0100
commit8653241b4e943999757f30451f24a2ccc8d9862c (patch)
treea42e3754ff3d92340e8eb8ba35ba8f78eb0599ed
parent1bbf308315fc7c0d1e571586df9368460f3b787d (diff)
downloadpaludis-8653241b4e943999757f30451f24a2ccc8d9862c.tar.gz
paludis-8653241b4e943999757f30451f24a2ccc8d9862c.tar.xz
ProvideSpecTree is dead
-rw-r--r--paludis/dep_spec_flattener.cc9
-rw-r--r--paludis/dep_spec_flattener.hh4
-rw-r--r--paludis/spec_tree-fwd.hh8
-rw-r--r--paludis/spec_tree.cc32
-rw-r--r--paludis/spec_tree.hh2
-rw-r--r--python/dep_spec.cc10
-rw-r--r--python/nice_names.nn1
-rw-r--r--ruby/dep_spec.cc1
-rw-r--r--ruby/nice_names.nn1
9 files changed, 2 insertions, 66 deletions
diff --git a/paludis/dep_spec_flattener.cc b/paludis/dep_spec_flattener.cc
index f729fe3..7f0cab4 100644
--- a/paludis/dep_spec_flattener.cc
+++ b/paludis/dep_spec_flattener.cc
@@ -52,12 +52,6 @@ namespace paludis
};
template <>
- struct WrappedForwardIteratorTraits<DepSpecFlattener<ProvideSpecTree, PackageDepSpec>::ConstIteratorTag>
- {
- typedef std::list<std::shared_ptr<const PackageDepSpec> >::const_iterator UnderlyingIterator;
- };
-
- template <>
struct WrappedForwardIteratorTraits<DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec>::ConstIteratorTag>
{
typedef std::list<std::shared_ptr<const PlainTextDepSpec> >::const_iterator UnderlyingIterator;
@@ -272,13 +266,10 @@ DepSpecFlattener<Heirarchy_, Item_>::handle_item(const Item_ & spec)
_imp->specs.push_back(std::static_pointer_cast<const Item_>(spec.clone()));
}
-template class DepSpecFlattener<ProvideSpecTree, PackageDepSpec>;
template class DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec>;
template class DepSpecFlattener<SetSpecTree, PackageDepSpec>;
template class DepSpecFlattener<SimpleURISpecTree, SimpleURIDepSpec>;
-template class WrappedForwardIterator<DepSpecFlattener<ProvideSpecTree, PackageDepSpec>::ConstIteratorTag,
- const std::shared_ptr<const PackageDepSpec> >;
template class WrappedForwardIterator<DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec>::ConstIteratorTag,
const std::shared_ptr<const PlainTextDepSpec> >;
template class WrappedForwardIterator<DepSpecFlattener<SetSpecTree, PackageDepSpec>::ConstIteratorTag,
diff --git a/paludis/dep_spec_flattener.hh b/paludis/dep_spec_flattener.hh
index ab698ea..5871524 100644
--- a/paludis/dep_spec_flattener.hh
+++ b/paludis/dep_spec_flattener.hh
@@ -49,7 +49,6 @@ namespace paludis
*
* This template can be instantiated as:
*
- * - DepSpecFlattener<ProvideSpecTree, PackageDepSpec>
* - DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec>
* - DepSpecFlattener<SetSpecTree, PackageDepSpec>
* - DepSpecFlattener<SimpleURISpecTree, SimpleURIDepSpec>
@@ -119,13 +118,10 @@ namespace paludis
///\}
};
- extern template class DepSpecFlattener<ProvideSpecTree, PackageDepSpec>;
extern template class DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec>;
extern template class DepSpecFlattener<SetSpecTree, PackageDepSpec>;
extern template class DepSpecFlattener<SimpleURISpecTree, SimpleURIDepSpec>;
- extern template class WrappedForwardIterator<DepSpecFlattener<ProvideSpecTree, PackageDepSpec>::ConstIteratorTag,
- const std::shared_ptr<const PackageDepSpec> >;
extern template class WrappedForwardIterator<DepSpecFlattener<PlainTextSpecTree, PlainTextDepSpec>::ConstIteratorTag,
const std::shared_ptr<const PlainTextDepSpec> >;
extern template class WrappedForwardIterator<DepSpecFlattener<SetSpecTree, PackageDepSpec>::ConstIteratorTag,
diff --git a/paludis/spec_tree-fwd.hh b/paludis/spec_tree-fwd.hh
index 5a43da3..fb4bcf9 100644
--- a/paludis/spec_tree-fwd.hh
+++ b/paludis/spec_tree-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2008, 2009, 2010, 2011 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -108,12 +108,6 @@ namespace paludis
>::Type, AllDepSpec> SimpleURISpecTree;
typedef SpecTree<MakeTypeList<
- SpecTreeLeafNodeType<PackageDepSpec>,
- SpecTreeInnerNodeType<AllDepSpec>,
- SpecTreeInnerNodeType<ConditionalDepSpec>
- >::Type, AllDepSpec> ProvideSpecTree;
-
- typedef SpecTree<MakeTypeList<
SpecTreeLeafNodeType<PlainTextDepSpec>,
SpecTreeInnerNodeType<AllDepSpec>,
SpecTreeInnerNodeType<AnyDepSpec>,
diff --git a/paludis/spec_tree.cc b/paludis/spec_tree.cc
index 51f1f60..d5617fb 100644
--- a/paludis/spec_tree.cc
+++ b/paludis/spec_tree.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2008, 2009, 2010, 2011 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -421,30 +421,6 @@ template class InnerNode<RequiredUseSpecTree, AnyDepSpec>;
template class InnerNode<RequiredUseSpecTree, ExactlyOneDepSpec>;
template class InnerNode<RequiredUseSpecTree, ConditionalDepSpec>;
-/* ProvideSpecTree */
-
-template const std::shared_ptr<ProvideSpecTree::NodeType<PackageDepSpec>::Type>
- BasicInnerNode<ProvideSpecTree>::append<PackageDepSpec>(const std::shared_ptr<const PackageDepSpec> &);
-template const std::shared_ptr<ProvideSpecTree::NodeType<PackageDepSpec>::Type>
- BasicInnerNode<ProvideSpecTree>::append<PackageDepSpec>(const std::shared_ptr<PackageDepSpec> &);
-
-template const std::shared_ptr<ProvideSpecTree::NodeType<ConditionalDepSpec>::Type>
- BasicInnerNode<ProvideSpecTree>::append<ConditionalDepSpec>(const std::shared_ptr<const ConditionalDepSpec> &);
-template const std::shared_ptr<ProvideSpecTree::NodeType<ConditionalDepSpec>::Type>
- BasicInnerNode<ProvideSpecTree>::append<ConditionalDepSpec>(const std::shared_ptr<ConditionalDepSpec> &);
-
-template const std::shared_ptr<ProvideSpecTree::NodeType<AllDepSpec>::Type>
- BasicInnerNode<ProvideSpecTree>::append<AllDepSpec>(const std::shared_ptr<const AllDepSpec> &);
-template const std::shared_ptr<ProvideSpecTree::NodeType<AllDepSpec>::Type>
- BasicInnerNode<ProvideSpecTree>::append<AllDepSpec>(const std::shared_ptr<AllDepSpec> &);
-
-template class BasicInnerNode<ProvideSpecTree>;
-template class WrappedForwardIterator<BasicInnerNode<ProvideSpecTree>::ConstIteratorTag,
- const std::shared_ptr<const BasicNode<ProvideSpecTree> > >;
-template class LeafNode<ProvideSpecTree, PackageDepSpec>;
-template class InnerNode<ProvideSpecTree, ConditionalDepSpec>;
-template class InnerNode<ProvideSpecTree, AllDepSpec>;
-
/* SimpleURISpecTree */
template const std::shared_ptr<SimpleURISpecTree::NodeType<SimpleURIDepSpec>::Type>
@@ -588,9 +564,3 @@ template InnerNode<RequiredUseSpecTree, ExactlyOneDepSpec>::operator InnerNode<G
template InnerNode<RequiredUseSpecTree, ConditionalDepSpec>::operator InnerNode<GenericSpecTree, ConditionalDepSpec> () const;
template LeafNode<RequiredUseSpecTree, PlainTextDepSpec>::operator LeafNode<GenericSpecTree, PlainTextDepSpec> () const;
-/* ProvideSpecTree -> GenericSpecTree */
-
-template InnerNode<ProvideSpecTree, AllDepSpec>::operator InnerNode<GenericSpecTree, AllDepSpec> () const;
-template InnerNode<ProvideSpecTree, ConditionalDepSpec>::operator InnerNode<GenericSpecTree, ConditionalDepSpec> () const;
-template LeafNode<ProvideSpecTree, PackageDepSpec>::operator LeafNode<GenericSpecTree, PackageDepSpec> () const;
-
diff --git a/paludis/spec_tree.hh b/paludis/spec_tree.hh
index 719503b..690cce6 100644
--- a/paludis/spec_tree.hh
+++ b/paludis/spec_tree.hh
@@ -187,8 +187,6 @@ namespace paludis
const std::shared_ptr<const spec_tree_internals::BasicNode<PlainTextSpecTree> > >;
extern template class WrappedForwardIterator<spec_tree_internals::BasicInnerNode<RequiredUseSpecTree>::ConstIteratorTag,
const std::shared_ptr<const spec_tree_internals::BasicNode<RequiredUseSpecTree> > >;
- extern template class WrappedForwardIterator<spec_tree_internals::BasicInnerNode<ProvideSpecTree>::ConstIteratorTag,
- const std::shared_ptr<const spec_tree_internals::BasicNode<ProvideSpecTree> > >;
extern template class WrappedForwardIterator<spec_tree_internals::BasicInnerNode<SimpleURISpecTree>::ConstIteratorTag,
const std::shared_ptr<const spec_tree_internals::BasicNode<SimpleURISpecTree> > >;
extern template class WrappedForwardIterator<spec_tree_internals::BasicInnerNode<FetchableURISpecTree>::ConstIteratorTag,
diff --git a/python/dep_spec.cc b/python/dep_spec.cc
index b53d3a7..e42ac17 100644
--- a/python/dep_spec.cc
+++ b/python/dep_spec.cc
@@ -643,14 +643,6 @@ struct AllowedTypes<SimpleURISpecTree>
};
template<>
-struct AllowedTypes<ProvideSpecTree>
-{
- AllowedTypes(const AllDepSpec &) {};
- AllowedTypes(const ConditionalDepSpec &) {};
- AllowedTypes(const PackageDepSpec &) {};
-};
-
-template<>
struct AllowedTypes<PlainTextSpecTree>
{
AllowedTypes(const AllDepSpec &) {};
@@ -1068,7 +1060,6 @@ void expose_dep_spec()
"Options for parse_user_package_dep_spec.");
RegisterSpecTreeToPython<DependencySpecTree>();
- RegisterSpecTreeToPython<ProvideSpecTree>();
RegisterSpecTreeToPython<PlainTextSpecTree>();
RegisterSpecTreeToPython<RequiredUseSpecTree>();
RegisterSpecTreeToPython<FetchableURISpecTree>();
@@ -1077,7 +1068,6 @@ void expose_dep_spec()
RegisterSpecTreeToPython<SetSpecTree>();
RegisterSpecTreeSharedPtrFromPython<DependencySpecTree>();
- RegisterSpecTreeSharedPtrFromPython<ProvideSpecTree>();
RegisterSpecTreeSharedPtrFromPython<PlainTextSpecTree>();
RegisterSpecTreeSharedPtrFromPython<RequiredUseSpecTree>();
RegisterSpecTreeSharedPtrFromPython<FetchableURISpecTree>();
diff --git a/python/nice_names.nn b/python/nice_names.nn
index 352d322..8494d26 100644
--- a/python/nice_names.nn
+++ b/python/nice_names.nn
@@ -41,7 +41,6 @@ make_nn_NiceNames() {
name "LicenseSpecTree"
name "FetchableURISpecTree"
name "SimpleURISpecTree"
- name "ProvideSpecTree"
name "PlainTextSpecTree"
name "RequiredUseSpecTree"
name "DependencySpecTree"
diff --git a/ruby/dep_spec.cc b/ruby/dep_spec.cc
index 9f6790b..91766cc 100644
--- a/ruby/dep_spec.cc
+++ b/ruby/dep_spec.cc
@@ -1334,7 +1334,6 @@ template VALUE paludis::ruby::dep_tree_to_value<FetchableURISpecTree> (const std
template VALUE paludis::ruby::dep_tree_to_value<SimpleURISpecTree> (const std::shared_ptr<const SimpleURISpecTree> &);
template VALUE paludis::ruby::dep_tree_to_value<PlainTextSpecTree> (const std::shared_ptr<const PlainTextSpecTree> &);
template VALUE paludis::ruby::dep_tree_to_value<RequiredUseSpecTree> (const std::shared_ptr<const RequiredUseSpecTree> &);
-template VALUE paludis::ruby::dep_tree_to_value<ProvideSpecTree> (const std::shared_ptr<const ProvideSpecTree> &);
template VALUE paludis::ruby::dep_tree_to_value<LicenseSpecTree> (const std::shared_ptr<const LicenseSpecTree> &);
template std::shared_ptr<const SetSpecTree> paludis::ruby::value_to_dep_tree <SetSpecTree> (VALUE);
diff --git a/ruby/nice_names.nn b/ruby/nice_names.nn
index 55abea2..c90f18f 100644
--- a/ruby/nice_names.nn
+++ b/ruby/nice_names.nn
@@ -38,7 +38,6 @@ make_nn_NiceNames() {
name "LicenseSpecTree"
name "FetchableURISpecTree"
name "SimpleURISpecTree"
- name "ProvideSpecTree"
name "PlainTextSpecTree"
name "RequiredUseSpecTree"
name "DependencySpecTree"