aboutsummaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-02 08:39:19 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-02 08:39:19 +0000
commitea7d4ab21e1fcad22161a1443869b6c74a0dae65 (patch)
tree0127b71bdf46fa33edbb5a5e5e95958bf1a68a7a /python
parente07358f56f589f148d4d9505526b37f5a647ce49 (diff)
downloadpaludis-ea7d4ab21e1fcad22161a1443869b6c74a0dae65.tar.gz
paludis-ea7d4ab21e1fcad22161a1443869b6c74a0dae65.tar.xz
Fix
Diffstat (limited to 'python')
-rw-r--r--python/contents.cc3
-rw-r--r--python/dep_list.cc2
-rw-r--r--python/dep_spec.cc6
-rw-r--r--python/dep_spec.hh2
-rw-r--r--python/dep_tag.cc2
-rw-r--r--python/environment.cc1
-rw-r--r--python/fs_entry.cc1
-rw-r--r--python/iterable.hh1
-rw-r--r--python/mask.cc12
-rw-r--r--python/metadata_key.cc2
-rw-r--r--python/name.cc2
-rw-r--r--python/package_database.cc2
-rw-r--r--python/package_id.cc3
-rw-r--r--python/repository.cc2
-rw-r--r--python/version_requirements.cc2
-rw-r--r--python/version_spec.cc2
16 files changed, 23 insertions, 22 deletions
diff --git a/python/contents.cc b/python/contents.cc
index 5229dea58..89da71e3a 100644
--- a/python/contents.cc
+++ b/python/contents.cc
@@ -18,9 +18,8 @@
*/
#include <python/paludis_python.hh>
-
+#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/contents.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
using namespace paludis;
using namespace paludis::python;
diff --git a/python/dep_list.cc b/python/dep_list.cc
index 8db5f15e8..29f111c51 100644
--- a/python/dep_list.cc
+++ b/python/dep_list.cc
@@ -22,7 +22,7 @@
#include <paludis/dep_list.hh>
#include <paludis/dep_list_exceptions.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
using namespace paludis;
diff --git a/python/dep_spec.cc b/python/dep_spec.cc
index 987c94968..8d21e423e 100644
--- a/python/dep_spec.cc
+++ b/python/dep_spec.cc
@@ -30,8 +30,7 @@
#include <paludis/util/save.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/tr1_type_traits.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
-#include <libwrapiter/libwrapiter_output_iterator.hh>
+#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <list>
@@ -68,6 +67,9 @@ template class Visits<const PythonURILabelsDepSpec>;
template class Visits<const PythonDependencyLabelsDepSpec>;
template class Visits<const PythonNamedSetDepSpec>;
+template class WrappedForwardIterator<PythonCompositeDepSpec::ConstIteratorTag,
+ const tr1::shared_ptr<const PythonDepSpec> >;
+
PythonDepSpec::PythonDepSpec()
{
}
diff --git a/python/dep_spec.hh b/python/dep_spec.hh
index 14cf34ba9..d69283b22 100644
--- a/python/dep_spec.hh
+++ b/python/dep_spec.hh
@@ -93,7 +93,7 @@ namespace paludis
void add_child(const tr1::shared_ptr<const PythonDepSpec>);
- typedef libwrapiter::ForwardIterator<PythonCompositeDepSpec,
+ typedef WrappedForwardIterator<enum ConstIteratorTag { },
const tr1::shared_ptr<const PythonDepSpec> > ConstIterator;
ConstIterator begin() const
diff --git a/python/dep_tag.cc b/python/dep_tag.cc
index 404f02f59..fe77bbf1b 100644
--- a/python/dep_tag.cc
+++ b/python/dep_tag.cc
@@ -23,7 +23,7 @@
#include <paludis/dep_tag.hh>
#include <paludis/dep_spec.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
using namespace paludis;
using namespace paludis::python;
diff --git a/python/environment.cc b/python/environment.cc
index c40505fc4..d8751f9a6 100644
--- a/python/environment.cc
+++ b/python/environment.cc
@@ -30,6 +30,7 @@
#include <paludis/environments/test/test_environment.hh>
#include <paludis/hook.hh>
#include <paludis/package_id.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
using namespace paludis;
using namespace paludis::python;
diff --git a/python/fs_entry.cc b/python/fs_entry.cc
index 709374294..d633d6c6a 100644
--- a/python/fs_entry.cc
+++ b/python/fs_entry.cc
@@ -22,6 +22,7 @@
#include <python/iterable.hh>
#include <paludis/util/fs_entry.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
using namespace paludis;
using namespace paludis::python;
diff --git a/python/iterable.hh b/python/iterable.hh
index b7e25da1b..ced4fe352 100644
--- a/python/iterable.hh
+++ b/python/iterable.hh
@@ -26,7 +26,6 @@
#include <paludis/util/tr1_type_traits.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/set.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
#include <paludis/util/validated.hh>
namespace paludis
diff --git a/python/mask.cc b/python/mask.cc
index a54bcd704..585182afe 100644
--- a/python/mask.cc
+++ b/python/mask.cc
@@ -87,7 +87,7 @@ struct MaskWrapper :
Mask,
bp::wrapper<Mask>
{
- virtual const char key() const
+ virtual char key() const
{
Lock l(get_mutex());
@@ -112,7 +112,7 @@ struct UserMaskWrapper :
UserMask,
bp::wrapper<UserMask>
{
- virtual const char key() const
+ virtual char key() const
{
Lock l(get_mutex());
@@ -147,7 +147,7 @@ struct UnacceptedMaskWrapper :
throw PythonMethodNotImplemented("UnacceptedMask", "unaccepted_key");
}
- virtual const char key() const
+ virtual char key() const
{
Lock l(get_mutex());
@@ -182,7 +182,7 @@ struct RepositoryMaskWrapper :
throw PythonMethodNotImplemented("RepositoryMask", "mask_key");
}
- virtual const char key() const
+ virtual char key() const
{
Lock l(get_mutex());
@@ -216,7 +216,7 @@ struct UnsupportedMaskWrapper :
throw PythonMethodNotImplemented("UnsupportedMask", "explanation");
}
- virtual const char key() const
+ virtual char key() const
{
Lock l(get_mutex());
@@ -251,7 +251,7 @@ struct AssociationMaskWrapper :
throw PythonMethodNotImplemented("AssociationMask", "associated_package");
}
- virtual const char key() const
+ virtual char key() const
{
Lock l(get_mutex());
diff --git a/python/metadata_key.cc b/python/metadata_key.cc
index a03b2028a..4df0d4fad 100644
--- a/python/metadata_key.cc
+++ b/python/metadata_key.cc
@@ -202,7 +202,7 @@ struct MetadataTimeKeyWrapper :
{
}
- virtual const time_t value() const
+ virtual time_t value() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
diff --git a/python/name.cc b/python/name.cc
index d9f1d60b3..6fa1e4736 100644
--- a/python/name.cc
+++ b/python/name.cc
@@ -21,9 +21,9 @@
#include <python/exception.hh>
#include <python/validated.hh>
#include <python/iterable.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/name.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
using namespace paludis;
using namespace paludis::python;
diff --git a/python/package_database.cc b/python/package_database.cc
index 715843bcf..e0cedcdf0 100644
--- a/python/package_database.cc
+++ b/python/package_database.cc
@@ -25,7 +25,7 @@
#include <paludis/environment.hh>
#include <paludis/package_id.hh>
#include <paludis/package_database.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
using namespace paludis;
using namespace paludis::python;
diff --git a/python/package_id.cc b/python/package_id.cc
index a69205f8f..16f06211b 100644
--- a/python/package_id.cc
+++ b/python/package_id.cc
@@ -26,8 +26,7 @@
#include <paludis/name.hh>
#include <paludis/version_spec.hh>
#include <paludis/action.hh>
-#include <paludis/util/iterator.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
using namespace paludis;
using namespace paludis::python;
diff --git a/python/repository.cc b/python/repository.cc
index 4d2186c2a..adcfbe9cf 100644
--- a/python/repository.cc
+++ b/python/repository.cc
@@ -30,7 +30,7 @@
#include <paludis/environment.hh>
#include <paludis/qa.hh>
#include <paludis/util/options.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
using namespace paludis;
using namespace paludis::python;
diff --git a/python/version_requirements.cc b/python/version_requirements.cc
index 1ea30d46f..3c6a8cbef 100644
--- a/python/version_requirements.cc
+++ b/python/version_requirements.cc
@@ -21,7 +21,7 @@
#include <python/iterable.hh>
#include <paludis/version_requirements.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
using namespace paludis;
using namespace paludis::python;
diff --git a/python/version_spec.cc b/python/version_spec.cc
index a2f39d0a9..b96095e5e 100644
--- a/python/version_spec.cc
+++ b/python/version_spec.cc
@@ -21,7 +21,7 @@
#include <python/exception.hh>
#include <paludis/version_spec.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
using namespace paludis;
using namespace paludis::python;