Fix some uses of begin/end, remove unnecessary includes

STEllAR-GROUP · Jul 17, 2017 · e2af7e5 · e2af7e5
1 parent 944eb27
commit e2af7e5
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 18 deletions.
diff --git a/hpx/parallel/algorithms/reduce_by_key.hpp b/hpx/parallel/algorithms/reduce_by_key.hpp
@@ -16,6 +16,7 @@
 #include <hpx/parallel/algorithms/inclusive_scan.hpp>
 #include <hpx/parallel/algorithms/sort.hpp>
 #include <hpx/parallel/util/zip_iterator.hpp>
+#include <hpx/util/range.hpp>
 #include <hpx/util/transform_iterator.hpp>
 #include <hpx/util/tuple.hpp>
 //
@@ -346,11 +347,11 @@ namespace hpx { namespace parallel { inline namespace v1
                 typedef typename std::iterator_traits<RanIter2>::value_type value_type;
 
                 zip_iterator_in states_begin = make_zip_iterator(values_first,
-                    std::begin(key_state));
+                    hpx::util::begin(key_state));
                 zip_iterator_in states_end = make_zip_iterator(
-                    values_first + number_of_keys, std::end(key_state));
+                    values_first + number_of_keys, hpx::util::end(key_state));
                 zip_iterator_vout states_out_begin = make_zip_iterator(values_output,
-                    std::begin(key_state));
+                    hpx::util::begin(key_state));
                 //
 
                 zip_type_in initial;
@@ -398,11 +399,11 @@ namespace hpx { namespace parallel { inline namespace v1
                 return make_pair_result(
                     hpx::parallel::copy_if(sync_policy,
                         make_zip_iterator(key_first, values_output,
-                            std::begin(key_state)),
+                            hpx::util::begin(key_state)),
                         make_zip_iterator(key_last, values_output + number_of_keys,
-                            std::end(key_state)),
+                            hpx::util::end(key_state)),
                         make_zip_iterator(keys_output, values_output,
-                            std::begin(key_state)),
+                            hpx::util::begin(key_state)),
                         // copies to dest only when 'end' state is true
                         [](zip2_ref it)
                         {

diff --git a/hpx/parallel/container_algorithms/partition.hpp b/hpx/parallel/container_algorithms/partition.hpp
@@ -20,8 +20,6 @@
 #include <hpx/parallel/traits/projected.hpp>
 #include <hpx/parallel/traits/projected_range.hpp>
 
-#include <boost/range/functions.hpp>
-
 #include <type_traits>
 #include <utility>
 
@@ -131,7 +129,7 @@ namespace hpx { namespace parallel { inline namespace v1
         Proj && proj = Proj())
     {
         return partition_copy(std::forward<ExPolicy>(policy),
-            std::begin(rng), std::end(rng), dest_true, dest_false,
+            hpx::util::begin(rng), hpx::util::end(rng), dest_true, dest_false,
             std::forward<Pred>(pred),
             std::forward<Proj>(proj));
     }

diff --git a/hpx/parallel/container_algorithms/unique.hpp b/hpx/parallel/container_algorithms/unique.hpp
@@ -20,8 +20,6 @@
 #include <hpx/parallel/traits/projected.hpp>
 #include <hpx/parallel/traits/projected_range.hpp>
 
-#include <boost/range/functions.hpp>
-
 #include <type_traits>
 #include <utility>
 
@@ -124,7 +122,7 @@ namespace hpx { namespace parallel { inline namespace v1
         Proj && proj = Proj())
     {
         return unique_copy(std::forward<ExPolicy>(policy),
-            std::begin(rng), std::end(rng), dest,
+            hpx::util::begin(rng), hpx::util::end(rng), dest,
             std::forward<Pred>(pred),
             std::forward<Proj>(proj));
     }

diff --git a/tests/unit/parallel/algorithms/destroy_tests.hpp b/tests/unit/parallel/algorithms/destroy_tests.hpp
@@ -13,7 +13,6 @@
 #include <hpx/util/lightweight_test.hpp>
 
 #include <boost/atomic.hpp>
-#include <boost/range/functions.hpp>
 
 #include <cstddef>
 #include <cstdint>

diff --git a/tests/unit/parallel/algorithms/destroyn.cpp b/tests/unit/parallel/algorithms/destroyn.cpp
@@ -9,7 +9,6 @@
 #include <hpx/util/lightweight_test.hpp>
 
 #include <boost/atomic.hpp>
-#include <boost/range/functions.hpp>
 
 #include <cstddef>
 #include <cstdint>

diff --git a/tests/unit/parallel/algorithms/uninitialized_default_construct_tests.hpp b/tests/unit/parallel/algorithms/uninitialized_default_construct_tests.hpp
@@ -13,7 +13,6 @@
 #include <hpx/util/lightweight_test.hpp>
 
 #include <boost/atomic.hpp>
-#include <boost/range/functions.hpp>
 
 #include <cstddef>
 #include <cstdint>

diff --git a/tests/unit/parallel/algorithms/uninitialized_default_constructn.cpp b/tests/unit/parallel/algorithms/uninitialized_default_constructn.cpp
@@ -9,7 +9,6 @@
 #include <hpx/util/lightweight_test.hpp>
 
 #include <boost/atomic.hpp>
-#include <boost/range/functions.hpp>
 
 #include <cstddef>
 #include <cstdint>

diff --git a/tests/unit/parallel/algorithms/uninitialized_value_construct_tests.hpp b/tests/unit/parallel/algorithms/uninitialized_value_construct_tests.hpp
@@ -13,7 +13,6 @@
 #include <hpx/util/lightweight_test.hpp>
 
 #include <boost/atomic.hpp>
-#include <boost/range/functions.hpp>
 
 #include <cstddef>
 #include <cstring>

diff --git a/tests/unit/parallel/algorithms/uninitialized_value_constructn.cpp b/tests/unit/parallel/algorithms/uninitialized_value_constructn.cpp
@@ -9,7 +9,6 @@
 #include <hpx/util/lightweight_test.hpp>
 
 #include <boost/atomic.hpp>
-#include <boost/range/functions.hpp>
 
 #include <cstddef>
 #include <cstring>