remove tagspec includes from files

STEllAR-GROUP · Nov 17, 2021 · 1bdaccb · 1bdaccb
1 parent 2ebe7b7
commit 1bdaccb
Show file tree

Hide file tree

Showing 21 changed files with 12 additions and 58 deletions.
diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/detail/transfer.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/detail/transfer.hpp
@@ -13,7 +13,6 @@
 #endif
 
 #include <hpx/algorithms/traits/projected.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>
 #include <hpx/parallel/util/result_types.hpp>
 

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/minmax.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/minmax.hpp
@@ -376,7 +376,6 @@ namespace hpx {
 #include <hpx/executors/execution_policy.hpp>
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>
 #include <hpx/parallel/algorithms/detail/distance.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/compare_projected.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>
 #include <hpx/parallel/util/loop.hpp>

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/partition.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/partition.hpp
@@ -465,7 +465,6 @@ namespace hpx {
 #include <hpx/parallel/algorithms/detail/advance_to_sentinel.hpp>
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>
 #include <hpx/parallel/algorithms/detail/distance.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>
 #include <hpx/parallel/util/detail/chunk_size.hpp>
 #include <hpx/parallel/util/detail/handle_local_exceptions.hpp>
@@ -513,7 +512,7 @@ namespace hpx { namespace parallel { inline namespace v1 {
             std::pair<typename hpx::tuple_element<1, Tuple>::type,
                 typename hpx::tuple_element<2, Tuple>::type>;
 
-        return lcos::make_future<result_type>(
+        return hpx::make_future<result_type>(
             HPX_MOVE(f), [](Tuple&& t) -> result_type {
                 return tuple_to_pair(HPX_MOVE(t));
             });

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/remove.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/remove.hpp
@@ -222,7 +222,6 @@ namespace hpx {
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>
 #include <hpx/parallel/algorithms/detail/find.hpp>
 #include <hpx/parallel/algorithms/detail/transfer.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>
 #include <hpx/parallel/util/foreach_partitioner.hpp>
 #include <hpx/parallel/util/invoke_projected.hpp>

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/remove_copy.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/remove_copy.hpp
@@ -260,7 +260,6 @@ namespace hpx {
 #include <hpx/executors/execution_policy.hpp>
 #include <hpx/parallel/algorithms/copy.hpp>
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>
 #include <hpx/parallel/util/projection_identity.hpp>
 #include <hpx/parallel/util/result_types.hpp>

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/replace.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/replace.hpp
@@ -480,7 +480,6 @@ namespace hpx {
 #include <hpx/executors/execution_policy.hpp>
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>
 #include <hpx/parallel/algorithms/for_each.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>
 #include <hpx/parallel/util/projection_identity.hpp>
 #include <hpx/parallel/util/zip_iterator.hpp>

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/reverse.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/reverse.hpp
@@ -188,7 +188,6 @@ namespace hpx {
 #include <hpx/parallel/algorithms/detail/advance_to_sentinel.hpp>
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>
 #include <hpx/parallel/algorithms/for_each.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>
 #include <hpx/parallel/util/projection_identity.hpp>
 #include <hpx/parallel/util/ranges_facilities.hpp>

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/rotate.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/rotate.hpp
@@ -191,7 +191,6 @@ namespace hpx {
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>
 #include <hpx/parallel/algorithms/detail/rotate.hpp>
 #include <hpx/parallel/algorithms/reverse.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>
 #include <hpx/parallel/util/detail/sender_util.hpp>
 #include <hpx/parallel/util/result_types.hpp>

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/shift_left.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/shift_left.hpp
@@ -115,7 +115,6 @@ namespace hpx {
 #include <hpx/executors/execution_policy.hpp>
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>
 #include <hpx/parallel/algorithms/reverse.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>
 #include <hpx/parallel/util/result_types.hpp>
 #include <hpx/parallel/util/transfer.hpp>

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/shift_right.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/shift_right.hpp
@@ -115,7 +115,6 @@ namespace hpx {
 #include <hpx/parallel/algorithms/copy.hpp>
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>
 #include <hpx/parallel/algorithms/reverse.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>
 #include <hpx/parallel/util/result_types.hpp>
 #include <hpx/parallel/util/transfer.hpp>

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/sort_by_key.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/sort_by_key.hpp
@@ -11,7 +11,6 @@
 #include <hpx/datastructures/tuple.hpp>
 
 #include <hpx/parallel/algorithms/sort.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/zip_iterator.hpp>
 
 #include <algorithm>
@@ -20,6 +19,10 @@
 #include <utility>
 
 namespace hpx { namespace parallel { inline namespace v1 {
+
+    template <typename KeyIter, typename ValueIter>
+    using sort_by_key_result = std::pair<KeyIter, ValueIter>;
+
     ///////////////////////////////////////////////////////////////////////////
     // sort
     namespace detail {
@@ -99,11 +102,11 @@ namespace hpx { namespace parallel { inline namespace v1 {
     /// threads, and indeterminately sequenced within each thread.
     ///
     /// \returns  The \a sort_by-key algorithm returns a
-    /// \a hpx::future<std::pair<KeyIter, ValueIter>>
+    /// \a hpx::future<sort_by_key_result<KeyIter, ValueIter>>
     ///           if the execution policy is of type
     ///           \a sequenced_task_policy or
     ///           \a parallel_task_policy and returns \a
-    ///           \a std::pair<KeyIter, ValueIter>
+    ///           \a sort_by_key_result<KeyIter, ValueIter>
     ///           otherwise.
     ///           The algorithm returns a pair holding an iterator pointing to
     ///           the first element after the last element in the input key
@@ -113,7 +116,8 @@ namespace hpx { namespace parallel { inline namespace v1 {
 
     template <typename ExPolicy, typename KeyIter, typename ValueIter,
         typename Compare = detail::less>
-    util::detail::algorithm_result_t<ExPolicy, std::pair<KeyIter, ValueIter>>
+    util::detail::algorithm_result_t<ExPolicy,
+        sort_by_key_result<KeyIter, ValueIter>>
     sort_by_key(ExPolicy&& policy, KeyIter key_first, KeyIter key_last,
         ValueIter value_first, Compare&& comp = Compare())
     {

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/transform.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/transform.hpp
@@ -189,7 +189,6 @@ namespace hpx {
 #include <hpx/executors/execution_policy.hpp>
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>
 #include <hpx/parallel/algorithms/detail/distance.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>
 #include <hpx/parallel/util/foreach_partitioner.hpp>
 #include <hpx/parallel/util/projection_identity.hpp>

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/uninitialized_move.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/uninitialized_move.hpp
@@ -203,7 +203,6 @@ namespace hpx {
 #include <hpx/executors/execution_policy.hpp>
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>
 #include <hpx/parallel/algorithms/detail/distance.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>
 #include <hpx/parallel/util/detail/sender_util.hpp>
 #include <hpx/parallel/util/loop.hpp>

diff --git a/libs/core/algorithms/include/hpx/parallel/algorithms/unique.hpp b/libs/core/algorithms/include/hpx/parallel/algorithms/unique.hpp
@@ -472,7 +472,6 @@ namespace hpx {
 #include <hpx/parallel/algorithms/detail/dispatch.hpp>
 #include <hpx/parallel/algorithms/detail/distance.hpp>
 #include <hpx/parallel/algorithms/detail/transfer.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/compare_projected.hpp>
 #include <hpx/parallel/util/detail/algorithm_result.hpp>
 #include <hpx/parallel/util/detail/sender_util.hpp>

diff --git a/libs/core/algorithms/include/hpx/parallel/container_algorithms/partition.hpp b/libs/core/algorithms/include/hpx/parallel/container_algorithms/partition.hpp
@@ -909,7 +909,6 @@ namespace hpx {
 #include <hpx/algorithms/traits/projected.hpp>
 #include <hpx/algorithms/traits/projected_range.hpp>
 #include <hpx/parallel/algorithms/partition.hpp>
-#include <hpx/parallel/tagspec.hpp>
 
 #include <type_traits>
 #include <utility>
@@ -969,15 +968,14 @@ namespace hpx { namespace parallel { inline namespace v1 {
         Proj&& proj = Proj())
     {
         using iterator = hpx::traits::range_iterator_t<Rng>;
-        using result_type = hpx::tuple<iterator, FwdIter2, FwdIter3>;
-
-        static_assert(hpx::traits::is_forward_iterator_v<iterator>,
-            "Requires at least forward iterator.");
 
 #if defined(HPX_GCC_VERSION) && HPX_GCC_VERSION >= 100000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
+        static_assert(hpx::traits::is_forward_iterator_v<iterator>,
+            "Requires at least forward iterator.");
+
         return parallel::util::make_in_out_out_result(
             partition_copy(HPX_FORWARD(ExPolicy, policy), hpx::util::begin(rng),
                 hpx::util::end(rng), dest_true, dest_false,

diff --git a/libs/core/algorithms/include/hpx/parallel/container_algorithms/remove_copy.hpp b/libs/core/algorithms/include/hpx/parallel/container_algorithms/remove_copy.hpp
@@ -581,7 +581,6 @@ namespace hpx { namespace ranges {
 #include <hpx/algorithms/traits/projected.hpp>
 #include <hpx/algorithms/traits/projected_range.hpp>
 #include <hpx/parallel/algorithms/remove_copy.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/detail/sender_util.hpp>
 #include <hpx/parallel/util/projection_identity.hpp>
 #include <hpx/parallel/util/result_types.hpp>

diff --git a/libs/core/algorithms/include/hpx/parallel/container_algorithms/replace.hpp b/libs/core/algorithms/include/hpx/parallel/container_algorithms/replace.hpp
@@ -1075,7 +1075,6 @@ namespace hpx { namespace ranges {
 
 #include <hpx/algorithms/traits/projected_range.hpp>
 #include <hpx/parallel/algorithms/replace.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/projection_identity.hpp>
 
 #include <type_traits>

diff --git a/libs/core/algorithms/include/hpx/parallel/container_algorithms/reverse.hpp b/libs/core/algorithms/include/hpx/parallel/container_algorithms/reverse.hpp
@@ -375,7 +375,6 @@ namespace hpx { namespace ranges {
 
 #include <hpx/algorithms/traits/projected_range.hpp>
 #include <hpx/parallel/algorithms/reverse.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/projection_identity.hpp>
 
 #include <type_traits>

diff --git a/libs/core/algorithms/include/hpx/parallel/container_algorithms/rotate.hpp b/libs/core/algorithms/include/hpx/parallel/container_algorithms/rotate.hpp
@@ -393,7 +393,6 @@ namespace hpx { namespace ranges {
 #include <hpx/algorithms/traits/projected_range.hpp>
 #include <hpx/iterator_support/iterator_range.hpp>
 #include <hpx/parallel/algorithms/rotate.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/detail/sender_util.hpp>
 #include <hpx/parallel/util/projection_identity.hpp>
 #include <hpx/parallel/util/result_types.hpp>

diff --git a/libs/core/algorithms/include/hpx/parallel/container_algorithms/transform.hpp b/libs/core/algorithms/include/hpx/parallel/container_algorithms/transform.hpp
@@ -400,7 +400,6 @@ namespace hpx { namespace ranges {
 
 #include <hpx/algorithms/traits/projected_range.hpp>
 #include <hpx/parallel/algorithms/transform.hpp>
-#include <hpx/parallel/tagspec.hpp>
 #include <hpx/parallel/util/detail/sender_util.hpp>
 #include <hpx/parallel/util/projection_identity.hpp>
 

diff --git a/libs/full/segmented_algorithms/include/hpx/parallel/segmented_algorithms/detail/dispatch.hpp b/libs/full/segmented_algorithms/include/hpx/parallel/segmented_algorithms/detail/dispatch.hpp
@@ -189,36 +189,6 @@ namespace hpx { namespace parallel { inline namespace v1 { namespace detail {
         }
     };
 
-    template <typename Iterator1, typename Iterator2, typename Iterator3>
-    struct algorithm_result_helper<
-        future<hpx::tuple<Iterator1, Iterator2, Iterator3>>,
-        std::enable_if_t<
-            hpx::traits::is_segmented_local_iterator_v<Iterator1> ||
-            hpx::traits::is_segmented_local_iterator_v<Iterator2> ||
-            hpx::traits::is_segmented_local_iterator_v<Iterator3>>>
-    {
-        using traits1 = hpx::traits::segmented_local_iterator_traits<Iterator1>;
-        using traits2 = hpx::traits::segmented_local_iterator_traits<Iterator2>;
-        using traits3 = hpx::traits::segmented_local_iterator_traits<Iterator3>;
-
-        using arg_type = hpx::tuple<typename traits1::local_raw_iterator,
-            typename traits2::local_raw_iterator,
-            typename traits3::local_raw_iterator>;
-        using result_type = hpx::tuple<typename traits1::local_iterator,
-            typename traits2::local_iterator, typename traits3::local_iterator>;
-
-        HPX_FORCEINLINE static future<result_type> call(future<arg_type>&& f)
-        {
-            return hpx::make_future<result_type>(
-                HPX_MOVE(f), [](arg_type&& p) -> result_type {
-                    return hpx::make_tuple(
-                        traits1::remote(HPX_MOVE(hpx::get<0>(p))),
-                        traits2::remote(HPX_MOVE(hpx::get<1>(p))),
-                        traits3::remote(HPX_MOVE(hpx::get<2>(p))));
-                });
-        }
-    };
-
     template <typename Iterator1, typename Iterator2, typename Iterator3>
     struct algorithm_result_helper<
         future<util::in_in_out_result<Iterator1, Iterator2, Iterator3>>,