aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/exheres_layout.cc
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/e/exheres_layout.cc')
-rw-r--r--paludis/repositories/e/exheres_layout.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index 386323f97..b19550499 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -25,6 +25,7 @@
#include <paludis/hashed_containers.hh>
#include <paludis/package_id.hh>
#include <paludis/package_database.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
@@ -34,12 +35,11 @@
#include <paludis/util/mutex.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/is_file_with_extension.hh>
-#include <paludis/util/iterator.hh>
+#include <paludis/util/wrapped_output_iterator.hh>
#include <paludis/util/strip.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/set.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
-#include <libwrapiter/libwrapiter_output_iterator.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/tr1_functional.hh>
#include <functional>
@@ -274,9 +274,9 @@ ExheresLayout::need_category_names_collection() const
need_category_names();
_imp->category_names_collection.reset(new CategoryNamePartSet);
- std::copy(_imp->category_names.begin(), _imp->category_names.end(),
- transform_inserter(_imp->category_names_collection->inserter(),
- tr1::mem_fn(&std::pair<const CategoryNamePart, bool>::first)));
+ std::transform(_imp->category_names.begin(), _imp->category_names.end(),
+ _imp->category_names_collection->inserter(),
+ tr1::mem_fn(&std::pair<const CategoryNamePart, bool>::first));
}
tr1::shared_ptr<const CategoryNamePartSet>