fix typos, inspect

STEllAR-GROUP · Oct 17, 2023 · bf8425d · bf8425d
1 parent bf48b07
commit bf8425d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 16 deletions.
diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/uninitialized_relocate.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/uninitialized_relocate.hpp
@@ -446,7 +446,7 @@ namespace hpx::parallel {
                     hpx::experimental::util::uninitialized_relocate_primitive(
                         first, last, dest);
 
-                return util::in_out_result<InIter1, FwdIter>{first_advanced, 
+                return util::in_out_result<InIter1, FwdIter>{first_advanced,
                                 dest_advanced};
             }
 
@@ -507,7 +507,7 @@ namespace hpx::parallel {
                 hpx::experimental::util::uninitialized_relocate_backward_primitive(
                         first, last, dest_last);
 
-                return util::in_out_result<BiIter1, BiIter2>{last_advanced, 
+                return util::in_out_result<BiIter1, BiIter2>{last_advanced,
                             dest_last_advanced};
             }
 
@@ -731,10 +731,10 @@ namespace hpx::experimental {
         {
             static_assert(hpx::traits::is_bidirectional_iterator_v<BiIter1> &&
                 "The 'first' and 'last' arguments must meet the requirements "
-                "of input iterators.");
+                "of bidirectional iterators.");
             static_assert(hpx::traits::is_bidirectional_iterator_v<BiIter2>,
                 "The 'dest_last' argument must meet the requirements of a "
-                "forward iterator.");
+                "bidirectional iterator.");
             static_assert(util::detail::relocation_traits<BiIter1,
                               BiIter2>::valid_relocation,
                 "Relocating from this source type to this destination type is "
@@ -766,10 +766,10 @@ namespace hpx::experimental {
             BiIter2 dest_last) noexcept(util::detail::relocation_traits<BiIter1,
             BiIter2>::is_noexcept_relocatable_v)
         {
-            static_assert(hpx::traits::is_input_iterator_v<BiIter1>,
+            static_assert(hpx::traits::is_bidirectional_iterator_v<BiIter1>,
                 "The 'first' and 'last' arguments must meet the requirements "
                 "of bidirectional iterators.");
-            static_assert(hpx::traits::is_forward_iterator_v<BiIter2>,
+            static_assert(hpx::traits::is_bidirectional_iterator_v<BiIter2>,
                 "The 'dest' argument must meet the requirements of a "
                 "bidirectional iterator.");
             static_assert(util::detail::relocation_traits<BiIter1,

diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_relocate.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_relocate.cpp
@@ -9,8 +9,10 @@
 #include <hpx/modules/testing.hpp>
 #include <hpx/parallel/algorithms/uninitialized_relocate.hpp>
 
+#include <atomic>
 #include <random>
 #include <set>
+#include <utility>
 
 constexpr int N = 500;    // number of objects to construct
 constexpr int M = 200;    // number of objects to relocate
@@ -207,7 +209,7 @@ std::pair<T*, T*> setup()
 }
 
 template <typename Ex>
-void test(Ex&& ex)
+void test()
 {
     {    // Non-overlapping trivially relocatable
         auto [ptr1, ptr2] = setup<trivially_relocatable_struct>();
@@ -510,8 +512,8 @@ void test_overlapping()
 
 int hpx_main()
 {
-    test<>(hpx::execution::seq);
-    test<>(hpx::execution::par);
+    test<hpx::execution::sequenced_policy>();
+    test<hpx::execution::parallel_policy>();
 
     test_overlapping();
 

diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_relocate_backward.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_relocate_backward.cpp
@@ -9,8 +9,10 @@
 #include <hpx/modules/testing.hpp>
 #include <hpx/parallel/algorithms/uninitialized_relocate.hpp>
 
+#include <atomic>
 #include <random>
 #include <set>
+#include <utility>
 
 constexpr int N = 50;    // number of objects to construct
 constexpr int M = 20;    // number of objects to relocate
@@ -207,7 +209,7 @@ std::pair<T*, T*> setup()
 }
 
 template <typename Ex>
-void test(Ex&& ex)
+void test()
 {
     {    // Non-overlapping trivially relocatable
         auto [ptr1, ptr2] = setup<trivially_relocatable_struct>();
@@ -509,8 +511,8 @@ void test_overlapping()
 
 int hpx_main()
 {
-    test<>(hpx::execution::seq);
-    test<>(hpx::execution::par);
+    test<hpx::execution::sequenced_policy>();
+    test<hpx::execution::parallel_policy>();
 
     test_overlapping();
 

diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_relocaten.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_relocaten.cpp
@@ -9,8 +9,10 @@
 #include <hpx/modules/testing.hpp>
 #include <hpx/parallel/algorithms/uninitialized_relocate.hpp>
 
+#include <atomic>
 #include <random>
 #include <set>
+#include <utility>
 
 constexpr int N = 500;    // number of objects to construct
 constexpr int M = 200;    // number of objects to relocate
@@ -207,7 +209,7 @@ std::pair<T*, T*> setup()
 }
 
 template <typename Ex>
-void test(Ex&& ex)
+void test()
 {
     {    // Non-overlapping trivially relocatable
         auto [ptr1, ptr2] = setup<trivially_relocatable_struct>();
@@ -510,8 +512,8 @@ void test_overlapping()
 
 int hpx_main()
 {
-    test<>(hpx::execution::seq);
-    test<>(hpx::execution::par);
+    test<hpx::execution::sequenced_policy>();
+    test<hpx::execution::parallel_policy>();
 
     test_overlapping();
 

diff --git a/libs/core/type_support/tests/unit/uninitialized_relocate_n_primitive.cpp b/libs/core/type_support/tests/unit/uninitialized_relocate_n_primitive.cpp
@@ -7,7 +7,7 @@
 #include <hpx/init.hpp>
 #include <hpx/modules/testing.hpp>
 #include <hpx/type_support/is_trivially_relocatable.hpp>
-#include <hpx/type_support/uninitialized_relocation_primitive.hpp>
+#include <hpx/type_support/uninitialized_relocation_primitives.hpp>
 
 #define N 50
 #define K 10