aboutsummaryrefslogtreecommitdiff
path: root/paludis/package_id.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-02 07:39:03 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-02 07:39:03 +0000
commitd832a1dd9e9718619bfb7bb7d0e3b48e26e65a33 (patch)
tree181f346e514cd8ff33c732f2b33ce234f1061cec /paludis/package_id.cc
parentfef0280d7576927a74b8e7d2a0a96e700348f8b3 (diff)
downloadpaludis-d832a1dd9e9718619bfb7bb7d0e3b48e26e65a33.tar.gz
paludis-d832a1dd9e9718619bfb7bb7d0e3b48e26e65a33.tar.xz
Stop using libebt, libwrapiter. C++0x compliant iterators. Use static_assert, concepts where available.
Diffstat (limited to 'paludis/package_id.cc')
-rw-r--r--paludis/package_id.cc14
1 files changed, 11 insertions, 3 deletions
diff --git a/paludis/package_id.cc b/paludis/package_id.cc
index d51c11b9e..5824e4fa7 100644
--- a/paludis/package_id.cc
+++ b/paludis/package_id.cc
@@ -20,13 +20,14 @@
#include <paludis/package_id.hh>
#include <paludis/metadata_key.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
-#include <paludis/util/iterator.hh>
#include <paludis/util/tr1_functional.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/sequence-impl.hh>
#include <paludis/util/set.hh>
#include <paludis/util/set-impl.hh>
#include <paludis/util/stringify.hh>
+#include <paludis/util/wrapped_forward_iterator-impl.hh>
+#include <paludis/util/wrapped_output_iterator-impl.hh>
#include <paludis/name.hh>
#include <paludis/version_spec.hh>
#include <paludis/repository.hh>
@@ -36,14 +37,21 @@
#include <list>
#include <algorithm>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
-
using namespace paludis;
#include <paludis/package_id-se.cc>
template class Sequence<tr1::shared_ptr<const PackageID> >;
+template class WrappedForwardIterator<Sequence<tr1::shared_ptr<const PackageID> >::ConstIteratorTag,
+ const tr1::shared_ptr<const PackageID> >;
+template class WrappedOutputIterator<Sequence<tr1::shared_ptr<const PackageID> >::InserterTag,
+ tr1::shared_ptr<const PackageID> >;
+
template class Set<tr1::shared_ptr<const PackageID>, PackageIDSetComparator>;
+template class WrappedForwardIterator<Set<tr1::shared_ptr<const PackageID> >::ConstIteratorTag,
+ const tr1::shared_ptr<const PackageID> >;
+template class WrappedOutputIterator<Set<tr1::shared_ptr<const PackageID> >::InserterTag,
+ tr1::shared_ptr<const PackageID> >;
namespace paludis
{