change relocation primitives filename

STEllAR-GROUP · Oct 19, 2023 · 659e0ea · 659e0ea
1 parent 32a3f98
commit 659e0ea
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 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
@@ -274,7 +274,7 @@ namespace hpx {
 #include <hpx/parallel/util/result_types.hpp>
 #include <hpx/parallel/util/zip_iterator.hpp>
 #include <hpx/type_support/construct_at.hpp>
-#include <hpx/type_support/uninitialized_relocate_n_primitive.hpp>
+#include <hpx/type_support/uninitialized_relocation_primitives.hpp>
 
 #include <algorithm>
 #include <cstddef>
@@ -446,7 +446,8 @@ namespace hpx::parallel {
                     hpx::experimental::util::uninitialized_relocate_primitive(
                         first, last, dest);
 
-                return util::in_out_result<InIter1, FwdIter>{first_advanced, dest_advanced};
+                return util::in_out_result<InIter1, FwdIter>{first_advanced, 
+                                dest_advanced};
             }
 
             template <typename ExPolicy, typename InIter1, typename InIter2,
@@ -502,12 +503,12 @@ namespace hpx::parallel {
                 BiIter2 dest_last) noexcept(hpx::experimental::util::detail::
                 relocation_traits<BiIter1, BiIter2>::is_noexcept_relocatable_v)
             {
-                auto [last_advanced, dest_last_advanced] = 
+                auto [last_advanced, dest_last_advanced] =
                 hpx::experimental::util::uninitialized_relocate_backward_primitive(
                         first, last, dest_last);
 
-                return util::in_out_result<BiIter1, BiIter2>{last_advanced, dest_last_advanced
-                    };
+                return util::in_out_result<BiIter1, BiIter2>{last_advanced, 
+                            dest_last_advanced};
             }
 
             template <typename ExPolicy, typename BiIter1, typename BiIter2,

diff --git a/libs/core/type_support/CMakeLists.txt b/libs/core/type_support/CMakeLists.txt
@@ -25,7 +25,7 @@ set(type_support_headers
     hpx/type_support/meta.hpp
     hpx/type_support/relocate_at.hpp
     hpx/type_support/static.hpp
-    hpx/type_support/uninitialized_relocate_n_primitive.hpp
+    hpx/type_support/uninitialized_relocation_primitives.hpp
     hpx/type_support/unwrap_ref.hpp
     hpx/type_support/unused.hpp
     hpx/type_support/void_guard.hpp

diff --git a/...rt/uninitialized_relocate_n_primitive.hpp → ...t/uninitialized_relocation_primitives.hpp b/...rt/uninitialized_relocate_n_primitive.hpp → ...t/uninitialized_relocation_primitives.hpp
@@ -143,8 +143,8 @@ namespace hpx::experimental::util {
         typename Dummy>    // Dummy is used retain the same signature
                            // as the implementation before P1144
     // clang-format off
-    std::tuple<BiIter1, BiIter2> uninitialized_relocate_backward_primitive(BiIter1 first, BiIter1 last,
-        BiIter2 dst_last, Dummy) noexcept(
+    std::tuple<BiIter1, BiIter2> uninitialized_relocate_backward_primitive(
+        BiIter1 first, BiIter1 last,BiIter2 dst_last, Dummy) noexcept(
             detail::relocation_traits<BiIter1, BiIter2>::is_noexcept_relocatable_v)
     // clang-format on
     {
@@ -461,11 +461,10 @@ namespace hpx::experimental::util {
     /////////////////////////////////////
     template <typename BiIter1, typename BiIter2,
         typename iterators_are_contiguous_t>
-    // clang-format off
-    std::tuple<BiIter1, BiIter2> uninitialized_relocate_backward_primitive(BiIter1 first, BiIter1 last,
-        BiIter2 dst_last, iterators_are_contiguous_t) noexcept(
-            detail::relocation_traits<BiIter1, BiIter2>::is_noexcept_relocatable_v)
-    // clang-format on
+    std::tuple<BiIter1, BiIter2> uninitialized_relocate_backward_primitive(
+        BiIter1 first, BiIter1 last, BiIter2 dst_last,
+        iterators_are_contiguous_t) noexcept(detail::relocation_traits<BiIter1,
+        BiIter2>::is_noexcept_relocatable_v)
     {
         // TODO CHECK SENT
         static_assert(

diff --git a/libs/core/type_support/tests/unit/fail_uninitialized_relocate.cpp b/libs/core/type_support/tests/unit/fail_uninitialized_relocate.cpp
@@ -7,7 +7,7 @@
 // This test should fail to compile
 
 #include <hpx/init.hpp>
-#include <hpx/type_support/uninitialized_relocate_n_primitive.hpp>
+#include <hpx/type_support/uninitialized_relocation_primitives.hpp>
 
 using hpx::experimental::util::uninitialized_relocate_n_primitive;
 

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_relocate_n_primitive.hpp>
+#include <hpx/type_support/uninitialized_relocation_primitive.hpp>
 
 #define N 50
 #define K 10