Replacing all uses of boost::iterator_[adaptor|facade] with new facil…

…ities

hpx/components/containers/partitioned_vector/partitioned_vector_segmented_iterator.hpp

@@ -17,14 +17,13 @@
 #include <hpx/runtime/naming/id_type.hpp>
 #include <hpx/traits/segmented_iterator_traits.hpp>
 #include <hpx/util/assert.hpp>
+#include <hpx/util/iterator_adaptor.hpp>
+#include <hpx/util/iterator_facade.hpp>
 
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_fwd.hpp>
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_component.hpp>
 
 #include <boost/integer.hpp>
-#include <boost/iterator/filter_iterator.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/iterator/iterator_facade.hpp>
 
 #include <cstdint>
 #include <iterator>
@@ -39,12 +38,12 @@ namespace hpx
     // This class wraps plain a vector<>::iterator or vector<>::const_iterator
     template <typename T, typename Data, typename BaseIter>
     class local_raw_vector_iterator
-      : public boost::iterator_adaptor<
+      : public hpx::util::iterator_adaptor<
             local_raw_vector_iterator<T, Data, BaseIter>, BaseIter
         >
     {
     private:
-        typedef boost::iterator_adaptor<
+        typedef hpx::util::iterator_adaptor<
                 local_raw_vector_iterator<T, Data, BaseIter>, BaseIter
             > base_type;
         typedef BaseIter base_iterator;
@@ -83,12 +82,12 @@ namespace hpx
 
     template <typename T, typename Data, typename BaseIter>
     class const_local_raw_vector_iterator
-      : public boost::iterator_adaptor<
+      : public hpx::util::iterator_adaptor<
             const_local_raw_vector_iterator<T, Data, BaseIter>, BaseIter
         >
     {
     private:
-        typedef boost::iterator_adaptor<
+        typedef hpx::util::iterator_adaptor<
                 const_local_raw_vector_iterator<T, Data, BaseIter>, BaseIter
             > base_type;
         typedef BaseIter base_iterator;
@@ -217,14 +216,14 @@ namespace hpx
     /// partitioned backend of a hpx::vector.
     template <typename T, typename Data>
     class local_vector_iterator
-      : public boost::iterator_facade<
+      : public hpx::util::iterator_facade<
             local_vector_iterator<T, Data>, T,
             std::random_access_iterator_tag,
             detail::local_vector_value_proxy<T, Data>
         >
     {
     private:
-        typedef boost::iterator_facade<
+        typedef hpx::util::iterator_facade<
                 local_vector_iterator<T, Data>, T,
                 std::random_access_iterator_tag,
                 detail::local_vector_value_proxy<T, Data>
@@ -284,7 +283,7 @@ namespace hpx
         HPX_SERIALIZATION_SPLIT_MEMBER()
 
     protected:
-        friend class boost::iterator_core_access;
+        friend class hpx::util::iterator_core_access;
 
         bool equal(local_vector_iterator const& other) const
         {
@@ -351,14 +350,14 @@ namespace hpx
 
     template <typename T, typename Data>
     class const_local_vector_iterator
-      : public boost::iterator_facade<
+      : public hpx::util::iterator_facade<
             const_local_vector_iterator<T, Data>, T const,
             std::random_access_iterator_tag,
             detail::const_local_vector_value_proxy<T, Data>
         >
     {
     private:
-        typedef boost::iterator_facade<
+        typedef hpx::util::iterator_facade<
                 const_local_vector_iterator<T, Data>, T const,
                 std::random_access_iterator_tag,
                 detail::const_local_vector_value_proxy<T, Data>
@@ -423,7 +422,7 @@ namespace hpx
         HPX_SERIALIZATION_SPLIT_MEMBER()
 
     protected:
-        friend class boost::iterator_core_access;
+        friend class hpx::util::iterator_core_access;
 
         bool equal(const_local_vector_iterator const& other) const
         {
@@ -493,12 +492,12 @@ namespace hpx
     /// This class implement the segmented iterator for the hpx::vector
     template <typename T, typename Data, typename BaseIter>
     class segment_vector_iterator
-      : public boost::iterator_adaptor<
+      : public hpx::util::iterator_adaptor<
             segment_vector_iterator<T, Data, BaseIter>, BaseIter
         >
     {
     private:
-        typedef boost::iterator_adaptor<
+        typedef hpx::util::iterator_adaptor<
                 segment_vector_iterator<T, Data, BaseIter>, BaseIter
             > base_type;
 
@@ -527,12 +526,12 @@ namespace hpx
 
     template <typename T, typename Data, typename BaseIter>
     class const_segment_vector_iterator
-      : public boost::iterator_adaptor<
+      : public hpx::util::iterator_adaptor<
             const_segment_vector_iterator<T, Data, BaseIter>, BaseIter
         >
     {
     private:
-        typedef boost::iterator_adaptor<
+        typedef hpx::util::iterator_adaptor<
                 const_segment_vector_iterator<T, Data, BaseIter>, BaseIter
             > base_type;
 
@@ -585,13 +584,13 @@ namespace hpx
     /// This class implement the local segmented iterator for the hpx::vector
     template <typename T, typename Data, typename BaseIter>
     class local_segment_vector_iterator
-      : public boost::iterator_adaptor<
+      : public hpx::util::iterator_adaptor<
             local_segment_vector_iterator<T, Data, BaseIter>, BaseIter,
             Data, std::forward_iterator_tag
         >
     {
     private:
-        typedef boost::iterator_adaptor<
+        typedef hpx::util::iterator_adaptor<
                 local_segment_vector_iterator<T, Data, BaseIter>, BaseIter,
                 Data, std::forward_iterator_tag
             > base_type;
@@ -619,7 +618,7 @@ namespace hpx
         }
 
     private:
-        friend class boost::iterator_core_access;
+        friend class hpx::util::iterator_core_access;
 
         typename base_type::reference dereference() const
         {
@@ -654,13 +653,13 @@ namespace hpx
     /// This class implements the (global) iterator functionality for hpx::vector.
     template <typename T, typename Data>
     class vector_iterator
-      : public boost::iterator_facade<
+      : public hpx::util::iterator_facade<
             vector_iterator<T, Data>, T, std::random_access_iterator_tag,
             detail::vector_value_proxy<T, Data>
         >
     {
     private:
-        typedef boost::iterator_facade<
+        typedef hpx::util::iterator_facade<
                 vector_iterator<T, Data>, T, std::random_access_iterator_tag,
                 detail::vector_value_proxy<T, Data>
             > base_type;
@@ -690,7 +689,7 @@ namespace hpx
         size_type get_global_index() const { return global_index_; }
 
     protected:
-        friend class boost::iterator_core_access;
+        friend class hpx::util::iterator_core_access;
 
         bool equal(vector_iterator const& other) const
         {
@@ -739,13 +738,13 @@ namespace hpx
     ///////////////////////////////////////////////////////////////////////////
     template <typename T, typename Data>
     class const_vector_iterator
-      : public boost::iterator_facade<
+      : public hpx::util::iterator_facade<
             const_vector_iterator<T, Data>, T const,
             std::random_access_iterator_tag, T const
         >
     {
     private:
-        typedef boost::iterator_facade<
+        typedef hpx::util::iterator_facade<
                 const_vector_iterator<T, Data>, T const,
                 std::random_access_iterator_tag, T const
             > base_type;
@@ -773,7 +772,7 @@ namespace hpx
         size_type get_global_index() const { return global_index_; }
 
     protected:
-        friend class boost::iterator_core_access;
+        friend class hpx::util::iterator_core_access;
 
         bool equal(const_vector_iterator const& other) const
         {

hpx/components/containers/unordered/unordered_map_segmented_iterator.hpp

@@ -11,11 +11,12 @@
 /// \brief This file contains the implementation of iterators for hpx::unordered_map.
 
  // The idea for these iterators is taken from
- // http://afstern.org/matt/segmented.pdf.
+ // http://lafstern.org/matt/segmented.pdf.
 
 #include <hpx/config.hpp>
 //#include <hpx/runtime/naming/id_type.hpp>
 #include <hpx/util/assert.hpp>
+#include <hpx/util/iterator_adaptor.hpp>
 
 #include <hpx/components/containers/unordered/partition_unordered_map_component.hpp>
 
@@ -27,9 +28,6 @@
 #include <vector>
 
 #include <boost/integer.hpp>
-// #include <boost/iterator/iterator_facade.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-// #include <boost/iterator/filter_iterator.hpp>
 
 namespace hpx
 {
@@ -52,13 +50,13 @@ namespace hpx
     template <typename Key, typename T, typename Hash, typename KeyEqual,
         typename BaseIter>
     class segment_unordered_map_iterator
-      : public boost::iterator_adaptor<
+      : public hpx::util::iterator_adaptor<
             segment_unordered_map_iterator<Key, T, Hash, KeyEqual, BaseIter>,
             BaseIter
         >
     {
     private:
-        typedef boost::iterator_adaptor<
+        typedef hpx::util::iterator_adaptor<
                 segment_unordered_map_iterator<Key, T, Hash, KeyEqual, BaseIter>,
                 BaseIter
             > base_type;
@@ -91,14 +89,14 @@ namespace hpx
     template <typename Key, typename T, typename Hash, typename KeyEqual,
         typename BaseIter>
     class const_segment_unordered_map_iterator
-      : public boost::iterator_adaptor<
+      : public hpx::util::iterator_adaptor<
             const_segment_unordered_map_iterator<
                 Key, T, Hash, KeyEqual, BaseIter>,
             BaseIter
         >
     {
     private:
-        typedef boost::iterator_adaptor<
+        typedef hpx::util::iterator_adaptor<
                 const_segment_unordered_map_iterator<
                     Key, T, Hash, KeyEqual, BaseIter>,
                 BaseIter
@@ -152,13 +150,13 @@ namespace hpx
 //     /// This class implement the local segmented iterator for the hpx::vector
 //     template <typename T, typename BaseIter>
 //     class local_segment_vector_iterator
-//       : public boost::iterator_adaptor<
+//       : public hpx::util::iterator_adaptor<
 //             local_segment_vector_iterator<T, BaseIter>, BaseIter,
 //             std::vector<T>, std::forward_iterator_tag
 //         >
 //     {
 //     private:
-//         typedef boost::iterator_adaptor<
+//         typedef hpx::util::iterator_adaptor<
 //                 local_segment_vector_iterator<T, BaseIter>, BaseIter,
 //                 std::vector<T>, std::forward_iterator_tag
 //             > base_type;
@@ -183,7 +181,7 @@ namespace hpx
 //         }
 //
 //     private:
-//         friend class boost::iterator_core_access;
+//         friend class hpx::util::iterator_core_access;
 //
 //         typename base_type::reference dereference() const
 //         {

hpx/include/util.hpp

@@ -17,6 +17,8 @@
 #include <hpx/util/high_resolution_clock.hpp>
 #include <hpx/util/high_resolution_timer.hpp>
 #include <hpx/util/interval_timer.hpp>
+#include <hpx/util/iterator_adaptor.hpp>
+#include <hpx/util/iterator_facade.hpp>
 #include <hpx/util/parse_command_line.hpp>
 #include <hpx/util/safe_lexical_cast.hpp>
 #include <hpx/util/thread_aware_timer.hpp>

hpx/util/iterator_facade.hpp

@@ -50,10 +50,9 @@ namespace hpx { namespace util
             it.decrement();
         }
 
-        template <typename Iterator>
+        template <typename Reference, typename Iterator>
         HPX_HOST_DEVICE HPX_FORCEINLINE
-        static auto dereference(Iterator const& it)
-        ->  decltype(it.dereference())
+        static Reference dereference(Iterator const& it)
         {
             return it.dereference();
         }
@@ -67,8 +66,8 @@ namespace hpx { namespace util
 
         template <typename Iterator1, typename Iterator2>
         HPX_HOST_DEVICE HPX_FORCEINLINE
-        static auto distance_to(Iterator1 const& lhs, Iterator2 const& rhs)
-        ->  decltype(lhs.distance_to(rhs))
+        static typename std::iterator_traits<Iterator1>::difference_type
+        distance_to(Iterator1 const& lhs, Iterator2 const& rhs)
         {
             return lhs.distance_to(rhs);
         }
@@ -148,7 +147,8 @@ namespace hpx { namespace util
         public:
             HPX_HOST_DEVICE reference operator*() const
             {
-                return iterator_core_access::dereference(this->derived());
+                return iterator_core_access::
+                    template dereference<reference>(this->derived());
             }
 
             HPX_HOST_DEVICE pointer operator->() const
@@ -304,8 +304,6 @@ namespace hpx { namespace util
             > iterator_adaptor_;
 
     public:
-        typedef base_type iterator_core_access;
-
         HPX_HOST_DEVICE iterator_facade()
           : base_type()
         {
@@ -520,7 +518,7 @@ namespace hpx { namespace util
         static_assert(
             hpx::traits::is_random_access_iterator<Derived1>::value,
             "Iterator needs to be random access");
-        return 0 <=
+        return 0 <
             iterator_core_access::distance_to(
                 static_cast<Derived1 const&>(lhs),
                 static_cast<Derived2 const&>(rhs));
@@ -531,7 +529,7 @@ namespace hpx { namespace util
         static_assert(
             hpx::traits::is_random_access_iterator<Derived1>::value,
             "Iterator needs to be random access");
-        return 0 >=
+        return 0 >
             iterator_core_access::distance_to(
                 static_cast<Derived1 const&>(lhs),
                 static_cast<Derived2 const&>(rhs));
@@ -542,7 +540,7 @@ namespace hpx { namespace util
         static_assert(
             hpx::traits::is_random_access_iterator<Derived1>::value,
             "Iterator needs to be random access");
-        return 0 <
+        return 0 <=
             iterator_core_access::distance_to(
                 static_cast<Derived1 const&>(lhs),
                 static_cast<Derived2 const&>(rhs));
@@ -559,6 +557,17 @@ namespace hpx { namespace util
                 static_cast<Derived2 const&>(rhs));
     }
 
+    HPX_UTIL_ITERATOR_FACADE_INTEROP_HEAD(inline, -,
+        typename std::iterator_traits<Derived2>::difference_type)
+    {
+        static_assert(
+            hpx::traits::is_random_access_iterator<Derived1>::value,
+            "Iterator needs to be random access");
+        return iterator_core_access::distance_to(
+            static_cast<Derived1 const&>(rhs),
+            static_cast<Derived2 const&>(lhs));
+    }
+
 #undef HPX_UTIL_ITERATOR_FACADE_INTEROP_HEAD
 
     template <typename Derived,