These tests should refer to std::execution instead of the internal name,
__pstl::execution.
libstdc++-v3/ChangeLog:
*
testsuite/20_util/specialized_algorithms/pstl/uninitialized_copy_move.cc:
Replace references to namespace __pstl with std.
* testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_modifying_operations/copy_if.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_modifying_operations/copy_move.cc:
Likewise.
*
testsuite/25_algorithms/pstl/alg_modifying_operations/is_partitioned.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_modifying_operations/partition.cc:
Likewise.
*
testsuite/25_algorithms/pstl/alg_modifying_operations/partition_copy.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_modifying_operations/remove.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_modifying_operations/rotate.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_modifying_operations/unique.cc:
Likewise.
*
testsuite/25_algorithms/pstl/alg_modifying_operations/unique_copy_equal.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_nonmodifying/find.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_nonmodifying/find_end.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_nonmodifying/find_first_of.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_nonmodifying/find_if.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_nonmodifying/nth_element.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_nonmodifying/reverse.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_nonmodifying/reverse_copy.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_nonmodifying/search_n.cc:
Likewise.
* testsuite/25_algorithms/pstl/alg_sorting/is_heap.cc: Likewise.
* testsuite/25_algorithms/pstl/alg_sorting/partial_sort_copy.cc:
Likewise.
* testsuite/26_numerics/pstl/numeric_ops/adjacent_difference.cc:
Likewise.
* testsuite/26_numerics/pstl/numeric_ops/reduce.cc: Likewise.
* testsuite/util/pstl/test_utils.h: Likewise.
---
Tested x86_64-linux. Pushed to trunk.
.../pstl/uninitialized_copy_move.cc | 4 ++--
.../25_algorithms/pstl/alg_merge/inplace_merge.cc | 4 ++--
.../pstl/alg_modifying_operations/copy_if.cc | 4 ++--
.../pstl/alg_modifying_operations/copy_move.cc | 12 ++++++------
.../pstl/alg_modifying_operations/is_partitioned.cc | 4 ++--
.../pstl/alg_modifying_operations/partition.cc | 8 ++++----
.../pstl/alg_modifying_operations/partition_copy.cc | 4 ++--
.../pstl/alg_modifying_operations/remove.cc | 8 ++++----
.../pstl/alg_modifying_operations/rotate.cc | 4 ++--
.../pstl/alg_modifying_operations/rotate_copy.cc | 4 ++--
.../pstl/alg_modifying_operations/unique.cc | 8 ++++----
.../alg_modifying_operations/unique_copy_equal.cc | 4 ++--
.../25_algorithms/pstl/alg_nonmodifying/find.cc | 4 ++--
.../25_algorithms/pstl/alg_nonmodifying/find_end.cc | 4 ++--
.../pstl/alg_nonmodifying/find_first_of.cc | 4 ++--
.../25_algorithms/pstl/alg_nonmodifying/find_if.cc | 4 ++--
.../pstl/alg_nonmodifying/nth_element.cc | 4 ++--
.../25_algorithms/pstl/alg_nonmodifying/reverse.cc | 4 ++--
.../pstl/alg_nonmodifying/reverse_copy.cc | 4 ++--
.../25_algorithms/pstl/alg_nonmodifying/search_n.cc | 4 ++--
.../25_algorithms/pstl/alg_sorting/is_heap.cc | 4 ++--
.../pstl/alg_sorting/partial_sort_copy.cc | 8 ++++----
.../pstl/numeric_ops/adjacent_difference.cc | 4 ++--
.../testsuite/26_numerics/pstl/numeric_ops/reduce.cc | 4 ++--
libstdc++-v3/testsuite/util/pstl/test_utils.h | 2 +-
25 files changed, 61 insertions(+), 61 deletions(-)
diff --git
a/libstdc++-v3/testsuite/20_util/specialized_algorithms/pstl/uninitialized_copy_move.cc
b/libstdc++-v3/testsuite/20_util/specialized_algorithms/pstl/uninitialized_copy_move.cc
index 38c1bf136df2..53d297b7e8be 100644
---
a/libstdc++-v3/testsuite/20_util/specialized_algorithms/pstl/uninitialized_copy_move.cc
+++
b/libstdc++-v3/testsuite/20_util/specialized_algorithms/pstl/uninitialized_copy_move.cc
@@ -84,13 +84,13 @@ struct test_uninitialized_copy_move
#if defined(_PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) ||
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN)
template <typename InputIterator, typename OutputIterator>
void
- operator()(__pstl::execution::unsequenced_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
+ operator()(std::execution::unsequenced_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
size_t n, /*is_trivial<T>=*/std::true_type)
{
}
template <typename InputIterator, typename OutputIterator>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
+ operator()(std::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
OutputIterator out_first, size_t n,
/*is_trivial<T>=*/std::true_type)
{
}
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc
index a9205553574a..a01974552d38 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc
@@ -34,14 +34,14 @@ struct test_one_policy
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) // dummy
specialization by policy type, in case of broken configuration
template <typename BiDirIt1, typename Size, typename Generator1, typename
Generator2, typename Compare>
void
- operator()(__pstl::execution::unsequenced_policy, BiDirIt1 first1,
BiDirIt1 last1, BiDirIt1 first2, BiDirIt1 last2,
+ operator()(std::execution::unsequenced_policy, BiDirIt1 first1, BiDirIt1
last1, BiDirIt1 first2, BiDirIt1 last2,
Size n, Size m, Generator1 generator1, Generator2 generator2,
Compare comp)
{
}
template <typename BiDirIt1, typename Size, typename Generator1, typename
Generator2, typename Compare>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, BiDirIt1
first1, BiDirIt1 last1, BiDirIt1 first2,
+ operator()(std::execution::parallel_unsequenced_policy, BiDirIt1 first1,
BiDirIt1 last1, BiDirIt1 first2,
BiDirIt1 last2, Size n, Size m, Generator1 generator1,
Generator2 generator2, Compare comp)
{
}
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/copy_if.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/copy_if.cc
index 9c1f1725ac21..d554cb29925a 100644
---
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/copy_if.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/copy_if.cc
@@ -33,7 +33,7 @@ struct run_copy_if
template <typename InputIterator, typename OutputIterator, typename
OutputIterator2, typename Size,
typename Predicate, typename T>
void
- operator()(__pstl::execution::parallel_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
+ operator()(std::execution::parallel_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
OutputIterator out_last, OutputIterator2 expected_first,
OutputIterator2 expected_last, Size n,
Predicate pred, T trash)
{
@@ -41,7 +41,7 @@ struct run_copy_if
template <typename InputIterator, typename OutputIterator, typename
OutputIterator2, typename Size,
typename Predicate, typename T>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
+ operator()(std::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
OutputIterator out_first, OutputIterator out_last,
OutputIterator2 expected_first,
OutputIterator2 expected_last, Size n, Predicate pred, T trash)
{
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/copy_move.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/copy_move.cc
index 5f4f984ae067..6c0e4048b544 100644
---
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/copy_move.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/copy_move.cc
@@ -35,7 +35,7 @@ struct run_copy
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) //dummy
specialization by policy type, in case of broken configuration
template <typename InputIterator, typename OutputIterator, typename
OutputIterator2, typename Size, typename T>
void
- operator()(__pstl::execution::unsequenced_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
+ operator()(std::execution::unsequenced_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
OutputIterator out_last, OutputIterator2 expected_first,
OutputIterator2 expected_last, Size size,
Size n, T trash)
{
@@ -43,7 +43,7 @@ struct run_copy
template <typename InputIterator, typename OutputIterator, typename
OutputIterator2, typename Size, typename T>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
+ operator()(std::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
OutputIterator out_first, OutputIterator out_last,
OutputIterator2 expected_first,
OutputIterator2 expected_last, Size size, Size n, T trash)
{
@@ -87,7 +87,7 @@ struct run_move
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) //dummy
specialization by policy type, in case of broken configuration
template <typename InputIterator, typename OutputIterator, typename
OutputIterator2, typename Size>
void
- operator()(__pstl::execution::unsequenced_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
+ operator()(std::execution::unsequenced_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
OutputIterator out_last, OutputIterator2 expected_first,
OutputIterator2 expected_last, Size size,
Size n, T trash)
{
@@ -95,7 +95,7 @@ struct run_move
template <typename InputIterator, typename OutputIterator, typename
OutputIterator2, typename Size>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
+ operator()(std::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
OutputIterator out_first, OutputIterator out_last,
OutputIterator2 expected_first,
OutputIterator2 expected_last, Size size, Size n, T trash)
{
@@ -129,7 +129,7 @@ struct run_move<Wrapper<T>>
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) //dummy
specialization by policy type, in case of broken configuration
template <typename InputIterator, typename OutputIterator, typename
OutputIterator2, typename Size>
void
- operator()(__pstl::execution::unsequenced_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
+ operator()(std::execution::unsequenced_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
OutputIterator out_last, OutputIterator2 expected_first,
OutputIterator2 expected_last, Size size,
Size n, Wrapper<T> trash)
{
@@ -137,7 +137,7 @@ struct run_move<Wrapper<T>>
template <typename InputIterator, typename OutputIterator, typename
OutputIterator2, typename Size>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
+ operator()(std::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
OutputIterator out_first, OutputIterator out_last,
OutputIterator2 expected_first,
OutputIterator2 expected_last, Size size, Size n, Wrapper<T>
trash)
{
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/is_partitioned.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/is_partitioned.cc
index 20ee7d296f7e..b4d85d93bfdc 100644
---
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/is_partitioned.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/is_partitioned.cc
@@ -33,12 +33,12 @@ struct test_one_policy
template <typename Iterator1, typename Predicate>
void
- operator()(__pstl::execution::unsequenced_policy, Iterator1 begin1,
Iterator1 end1, Predicate pred)
+ operator()(std::execution::unsequenced_policy, Iterator1 begin1, Iterator1
end1, Predicate pred)
{
}
template <typename Iterator1, typename Predicate>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, Iterator1
begin1, Iterator1 end1, Predicate pred)
+ operator()(std::execution::parallel_unsequenced_policy, Iterator1 begin1,
Iterator1 end1, Predicate pred)
{
}
#endif
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/partition.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/partition.cc
index 58979bac2b00..d69f4060a10f 100644
---
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/partition.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/partition.cc
@@ -86,28 +86,28 @@ struct test_one_policy
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) //dummy
specializations to skip testing in case of broken configuration
template <typename BiDirIt, typename Size, typename UnaryOp, typename
Generator>
void
- operator()(__pstl::execution::unsequenced_policy, BiDirIt first, BiDirIt
last, BiDirIt exp_first, BiDirIt exp_last,
+ operator()(std::execution::unsequenced_policy, BiDirIt first, BiDirIt
last, BiDirIt exp_first, BiDirIt exp_last,
Size n, UnaryOp unary_op, Generator generator)
{
}
template <typename BiDirIt, typename Size, typename UnaryOp, typename
Generator>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, BiDirIt first,
BiDirIt last, BiDirIt exp_first,
+ operator()(std::execution::parallel_unsequenced_policy, BiDirIt first,
BiDirIt last, BiDirIt exp_first,
BiDirIt exp_last, Size n, UnaryOp unary_op, Generator generator)
{
}
#elif defined(_PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN) //dummy
specializations to skip testing in case of broken configuration
template <typename BiDirIt, typename Size, typename UnaryOp, typename
Generator>
void
- operator()(__pstl::execution::parallel_policy, BiDirIt first, BiDirIt
last, BiDirIt exp_first, BiDirIt exp_last,
+ operator()(std::execution::parallel_policy, BiDirIt first, BiDirIt last,
BiDirIt exp_first, BiDirIt exp_last,
Size n, UnaryOp unary_op, Generator generator)
{
}
template <typename BiDirIt, typename Size, typename UnaryOp, typename
Generator>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, BiDirIt first,
BiDirIt last, BiDirIt exp_first,
+ operator()(std::execution::parallel_unsequenced_policy, BiDirIt first,
BiDirIt last, BiDirIt exp_first,
BiDirIt exp_last, Size n, UnaryOp unary_op, Generator generator)
{
}
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/partition_copy.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/partition_copy.cc
index 804fcba2bf2b..597de6833fe7 100644
---
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/partition_copy.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/partition_copy.cc
@@ -51,7 +51,7 @@ struct test_partition_copy
#if defined(_PSTL_ICC_1800_TEST_MONOTONIC_RELEASE_64_BROKEN)
template <typename InputIterator, typename OutputIterator, typename
OutputIterator2, typename UnaryOp>
void
- operator()(__pstl::execution::unsequenced_policy,
std::reverse_iterator<InputIterator> first,
+ operator()(std::execution::unsequenced_policy,
std::reverse_iterator<InputIterator> first,
std::reverse_iterator<InputIterator> last,
std::reverse_iterator<OutputIterator> true_first,
std::reverse_iterator<OutputIterator> true_last,
std::reverse_iterator<OutputIterator2> false_first,
OutputIterator2 false_last, UnaryOp unary_op)
@@ -59,7 +59,7 @@ struct test_partition_copy
}
template <typename InputIterator, typename OutputIterator, typename
OutputIterator2, typename UnaryOp>
void
- operator()(__pstl::execution::parallel_unsequenced_policy,
std::reverse_iterator<InputIterator> first,
+ operator()(std::execution::parallel_unsequenced_policy,
std::reverse_iterator<InputIterator> first,
std::reverse_iterator<InputIterator> last,
std::reverse_iterator<OutputIterator> true_first,
std::reverse_iterator<OutputIterator> true_last,
std::reverse_iterator<OutputIterator2> false_first,
OutputIterator2 false_last, UnaryOp unary_op)
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/remove.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/remove.cc
index 9d8e5b9b305e..c8ad1c71e050 100644
---
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/remove.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/remove.cc
@@ -33,14 +33,14 @@ struct run_remove
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) //dummy
specialization by policy type, in case of broken configuration
template <typename InputIterator, typename OutputIterator, typename Size,
typename T>
void
- operator()(__pstl::execution::unsequenced_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
+ operator()(std::execution::unsequenced_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
OutputIterator out_last, OutputIterator expected_first,
OutputIterator expected_last, Size n,
const T& value)
{
}
template <typename InputIterator, typename OutputIterator, typename Size,
typename T>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
+ operator()(std::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
OutputIterator out_first, OutputIterator out_last,
OutputIterator expected_first,
OutputIterator expected_last, Size n, const T& value)
{
@@ -71,14 +71,14 @@ struct run_remove_if
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) //dummy
specialization by policy type, in case of broken configuration
template <typename InputIterator, typename OutputIterator, typename Size,
typename Predicate>
void
- operator()(__pstl::execution::unsequenced_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
+ operator()(std::execution::unsequenced_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
OutputIterator out_last, OutputIterator expected_first,
OutputIterator expected_last, Size n,
Predicate pred)
{
}
template <typename InputIterator, typename OutputIterator, typename Size,
typename Predicate>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
+ operator()(std::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
OutputIterator out_first, OutputIterator out_last,
OutputIterator expected_first,
OutputIterator expected_last, Size n, Predicate pred)
{
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate.cc
index 9ec9b3bcc9b4..6b2fe8f6ea4c 100644
---
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate.cc
@@ -87,13 +87,13 @@ struct test_one_policy
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) // dummy
specializations to skip testing in case of broken configuration
template <typename Iterator, typename Size>
void
- operator()(__pstl::execution::unsequenced_policy, Iterator data_b,
Iterator data_e, Iterator actual_b,
+ operator()(std::execution::unsequenced_policy, Iterator data_b, Iterator
data_e, Iterator actual_b,
Iterator actual_e, Size shift)
{
}
template <typename Iterator, typename Size>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, Iterator
data_b, Iterator data_e, Iterator actual_b,
+ operator()(std::execution::parallel_unsequenced_policy, Iterator data_b,
Iterator data_e, Iterator actual_b,
Iterator actual_e, Size shift)
{
}
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc
index 1b788e1b7ee5..297670458708 100644
---
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/rotate_copy.cc
@@ -83,13 +83,13 @@ struct test_one_policy
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) // dummy
specialization by policy type, in case of broken configuration
template <typename Iterator1, typename Iterator2>
typename std::enable_if<is_same_iterator_category<Iterator1,
std::random_access_iterator_tag>::value, void>::type
- operator()(__pstl::execution::unsequenced_policy, Iterator1 data_b,
Iterator1 data_e, Iterator2 actual_b,
+ operator()(std::execution::unsequenced_policy, Iterator1 data_b, Iterator1
data_e, Iterator2 actual_b,
Iterator2 actual_e, std::size_t shift)
{
}
template <typename Iterator1, typename Iterator2>
typename std::enable_if<is_same_iterator_category<Iterator1,
std::random_access_iterator_tag>::value, void>::type
- operator()(__pstl::execution::parallel_unsequenced_policy, Iterator1
data_b, Iterator1 data_e, Iterator2 actual_b,
+ operator()(std::execution::parallel_unsequenced_policy, Iterator1 data_b,
Iterator1 data_e, Iterator2 actual_b,
Iterator2 actual_e, std::size_t shift)
{
}
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/unique.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/unique.cc
index 0f21e0450896..16fd5e5dcf34 100644
---
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/unique.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/unique.cc
@@ -33,28 +33,28 @@ struct run_unique
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) //dummy
specialization by policy type, in case of broken configuration
template <typename ForwardIt, typename Generator>
void
- operator()(__pstl::execution::unsequenced_policy, ForwardIt first1,
ForwardIt last1, ForwardIt first2,
+ operator()(std::execution::unsequenced_policy, ForwardIt first1, ForwardIt
last1, ForwardIt first2,
ForwardIt last2, Generator generator)
{
}
template <typename ForwardIt, typename Generator>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, ForwardIt
first1, ForwardIt last1, ForwardIt first2,
+ operator()(std::execution::parallel_unsequenced_policy, ForwardIt first1,
ForwardIt last1, ForwardIt first2,
ForwardIt last2, Generator generator)
{
}
template <typename ForwardIt, typename BinaryPred, typename Generator>
void
- operator()(__pstl::execution::unsequenced_policy, ForwardIt first1,
ForwardIt last1, ForwardIt first2,
+ operator()(std::execution::unsequenced_policy, ForwardIt first1, ForwardIt
last1, ForwardIt first2,
ForwardIt last2, BinaryPred pred, Generator generator)
{
}
template <typename ForwardIt, typename BinaryPred, typename Generator>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, ForwardIt
first1, ForwardIt last1, ForwardIt first2,
+ operator()(std::execution::parallel_unsequenced_policy, ForwardIt first1,
ForwardIt last1, ForwardIt first2,
ForwardIt last2, BinaryPred pred, Generator generator)
{
}
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/unique_copy_equal.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/unique_copy_equal.cc
index c5bc25c9140c..782726ee63b1 100644
---
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/unique_copy_equal.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_modifying_operations/unique_copy_equal.cc
@@ -33,7 +33,7 @@ struct run_unique_copy
template <typename InputIterator, typename OutputIterator, typename
OutputIterator2, typename Size,
typename Predicate, typename T>
void
- operator()(__pstl::execution::parallel_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
+ operator()(std::execution::parallel_policy, InputIterator first,
InputIterator last, OutputIterator out_first,
OutputIterator out_last, OutputIterator2 expected_first,
OutputIterator2 expected_last, Size n,
Predicate pred, T trash)
{
@@ -42,7 +42,7 @@ struct run_unique_copy
template <typename InputIterator, typename OutputIterator, typename
OutputIterator2, typename Size,
typename Predicate, typename T>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
+ operator()(std::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last,
OutputIterator out_first, OutputIterator out_last,
OutputIterator2 expected_first,
OutputIterator2 expected_last, Size n, Predicate pred, T trash)
{
diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find.cc
index c303ba689d7c..1ad06768cd41 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find.cc
@@ -33,12 +33,12 @@ struct test_find
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) //dummy
specialization by policy type, in case of broken configuration
template <typename Iterator, typename Value>
void
- operator()(__pstl::execution::unsequenced_policy, Iterator first, Iterator
last, Value value)
+ operator()(std::execution::unsequenced_policy, Iterator first, Iterator
last, Value value)
{
}
template <typename Iterator, typename Value>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, Iterator first,
Iterator last, Value value)
+ operator()(std::execution::parallel_unsequenced_policy, Iterator first,
Iterator last, Value value)
{
}
#endif
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find_end.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find_end.cc
index e6a65a9848b6..765927c3b670 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find_end.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find_end.cc
@@ -32,12 +32,12 @@ struct test_find
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) //dummy
specialization by policy type, in case of broken configuration
template <typename Iterator, typename Value>
void
- operator()(__pstl::execution::unsequenced_policy, Iterator first, Iterator
last, Value value)
+ operator()(std::execution::unsequenced_policy, Iterator first, Iterator
last, Value value)
{
}
template <typename Iterator, typename Value>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, Iterator first,
Iterator last, Value value)
+ operator()(std::execution::parallel_unsequenced_policy, Iterator first,
Iterator last, Value value)
{
}
#endif
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find_first_of.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find_first_of.cc
index 5a4a81a8db7e..83f197e9a492 100644
---
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find_first_of.cc
+++
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find_first_of.cc
@@ -32,13 +32,13 @@ struct test_one_policy
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) //dummy
specialization by policy type, in case of broken configuration
template <typename Iterator1, typename Iterator2, typename Predicate>
void
- operator()(__pstl::execution::unsequenced_policy, Iterator1 b, Iterator1
e, Iterator2 bsub, Iterator2 esub,
+ operator()(std::execution::unsequenced_policy, Iterator1 b, Iterator1 e,
Iterator2 bsub, Iterator2 esub,
Predicate pred)
{
}
template <typename Iterator1, typename Iterator2, typename Predicate>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, Iterator1 b,
Iterator1 e, Iterator2 bsub, Iterator2 esub,
+ operator()(std::execution::parallel_unsequenced_policy, Iterator1 b,
Iterator1 e, Iterator2 bsub, Iterator2 esub,
Predicate pred)
{
}
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find_if.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find_if.cc
index 04ef148b5f3c..3ad7c99dff69 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find_if.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/find_if.cc
@@ -33,13 +33,13 @@ struct test_find_if
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) //dummy
specialization by policy type, in case of broken configuration
template <typename Iterator, typename Predicate, typename NotPredicate>
void
- operator()(__pstl::execution::unsequenced_policy, Iterator first, Iterator
last, Predicate pred,
+ operator()(std::execution::unsequenced_policy, Iterator first, Iterator
last, Predicate pred,
NotPredicate not_pred)
{
}
template <typename Iterator, typename Predicate, typename NotPredicate>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, Iterator first,
Iterator last, Predicate pred,
+ operator()(std::execution::parallel_unsequenced_policy, Iterator first,
Iterator last, Predicate pred,
NotPredicate not_pred)
{
}
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/nth_element.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/nth_element.cc
index 63e6abe2ea46..517499b76d24 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/nth_element.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/nth_element.cc
@@ -82,13 +82,13 @@ struct test_one_policy
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) // dummy
specialization by policy type, in case of broken configuration
template <typename Iterator1, typename Size, typename Generator1, typename
Generator2, typename Compare>
typename std::enable_if<is_same_iterator_category<Iterator1,
std::random_access_iterator_tag>::value, void>::type
- operator()(__pstl::execution::unsequenced_policy, Iterator1 first1,
Iterator1 last1, Iterator1 first2,
+ operator()(std::execution::unsequenced_policy, Iterator1 first1, Iterator1
last1, Iterator1 first2,
Iterator1 last2, Size n, Size m, Generator1 generator1,
Generator2 generator2, Compare comp)
{
}
template <typename Iterator1, typename Size, typename Generator1, typename
Generator2, typename Compare>
typename std::enable_if<is_same_iterator_category<Iterator1,
std::random_access_iterator_tag>::value, void>::type
- operator()(__pstl::execution::parallel_unsequenced_policy, Iterator1
first1, Iterator1 last1, Iterator1 first2,
+ operator()(std::execution::parallel_unsequenced_policy, Iterator1 first1,
Iterator1 last1, Iterator1 first2,
Iterator1 last2, Size n, Size m, Generator1 generator1,
Generator2 generator2, Compare comp)
{
}
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/reverse.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/reverse.cc
index f3cc5d3bc0fe..be6bb95d8b06 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/reverse.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/reverse.cc
@@ -34,13 +34,13 @@ struct test_one_policy
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) // dummy
specialization by policy type, in case of broken configuration
template <typename Iterator1, typename Iterator2>
typename std::enable_if<is_same_iterator_category<Iterator1,
std::random_access_iterator_tag>::value, void>::type
- operator()(__pstl::execution::unsequenced_policy, Iterator1 data_b,
Iterator1 data_e, Iterator2 actual_b,
+ operator()(std::execution::unsequenced_policy, Iterator1 data_b, Iterator1
data_e, Iterator2 actual_b,
Iterator2 actual_e)
{
}
template <typename Iterator1, typename Iterator2>
typename std::enable_if<is_same_iterator_category<Iterator1,
std::random_access_iterator_tag>::value, void>::type
- operator()(__pstl::execution::parallel_unsequenced_policy, Iterator1
data_b, Iterator1 data_e, Iterator2 actual_b,
+ operator()(std::execution::parallel_unsequenced_policy, Iterator1 data_b,
Iterator1 data_e, Iterator2 actual_b,
Iterator2 actual_e)
{
}
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/reverse_copy.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/reverse_copy.cc
index a6c39a2268ba..be29230806e4 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/reverse_copy.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/reverse_copy.cc
@@ -74,12 +74,12 @@ struct test_one_policy
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) // dummy
specialization by policy type, in case of broken configuration
template <typename Iterator1>
typename std::enable_if<is_same_iterator_category<Iterator1,
std::random_access_iterator_tag>::value, void>::type
- operator()(__pstl::execution::unsequenced_policy, Iterator1 actual_b,
Iterator1 actual_e)
+ operator()(std::execution::unsequenced_policy, Iterator1 actual_b,
Iterator1 actual_e)
{
}
template <typename Iterator1>
typename std::enable_if<is_same_iterator_category<Iterator1,
std::random_access_iterator_tag>::value, void>::type
- operator()(__pstl::execution::parallel_unsequenced_policy, Iterator1
actual_b, Iterator1 actual_e)
+ operator()(std::execution::parallel_unsequenced_policy, Iterator1
actual_b, Iterator1 actual_e)
{
}
#endif
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/search_n.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/search_n.cc
index fab146fc74c4..899c754c0b1e 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/search_n.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_nonmodifying/search_n.cc
@@ -32,12 +32,12 @@ struct test_one_policy
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) //dummy
specialization by policy type, in case of broken configuration
template <typename Iterator, typename Size, typename T, typename Predicate>
void
- operator()(__pstl::execution::unsequenced_policy, Iterator b, Iterator e,
Size count, const T& value, Predicate pred)
+ operator()(std::execution::unsequenced_policy, Iterator b, Iterator e,
Size count, const T& value, Predicate pred)
{
}
template <typename Iterator, typename Size, typename T, typename Predicate>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, Iterator b,
Iterator e, Size count, const T& value,
+ operator()(std::execution::parallel_unsequenced_policy, Iterator b,
Iterator e, Size count, const T& value,
Predicate pred)
{
}
diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/is_heap.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/is_heap.cc
index bb3c3a57ecab..251896ff25b6 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/is_heap.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/is_heap.cc
@@ -47,12 +47,12 @@ struct test_is_heap
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) //dummy
specialization by policy type, in case of broken configuration
template <typename Iterator, typename Predicate>
typename std::enable_if<is_same_iterator_category<Iterator,
std::random_access_iterator_tag>::value, void>::type
- operator()(__pstl::execution::unsequenced_policy, Iterator first, Iterator
last, Predicate pred)
+ operator()(std::execution::unsequenced_policy, Iterator first, Iterator
last, Predicate pred)
{
}
template <typename Iterator, typename Predicate>
typename std::enable_if<is_same_iterator_category<Iterator,
std::random_access_iterator_tag>::value, void>::type
- operator()(__pstl::execution::parallel_unsequenced_policy, Iterator first,
Iterator last, Predicate pred)
+ operator()(std::execution::parallel_unsequenced_policy, Iterator first,
Iterator last, Predicate pred)
{
}
#endif
diff --git
a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/partial_sort_copy.cc
b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/partial_sort_copy.cc
index 72336d628856..6c1ec46607bc 100644
--- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/partial_sort_copy.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_sorting/partial_sort_copy.cc
@@ -68,28 +68,28 @@ struct test_one_policy
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) // dummy
specialization by policy type, in case of broken configuration
template <typename InputIterator, typename Size, typename T, typename
Compare>
void
- operator()(__pstl::execution::unsequenced_policy, InputIterator first,
InputIterator last, Size n1, Size n2,
+ operator()(std::execution::unsequenced_policy, InputIterator first,
InputIterator last, Size n1, Size n2,
const T& trash, Compare compare)
{
}
template <typename InputIterator, typename Size, typename T, typename
Compare>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last, Size n1, Size n2,
+ operator()(std::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last, Size n1, Size n2,
const T& trash, Compare compare)
{
}
template <typename InputIterator, typename Size, typename T>
void
- operator()(__pstl::execution::unsequenced_policy, InputIterator first,
InputIterator last, Size n1, Size n2,
+ operator()(std::execution::unsequenced_policy, InputIterator first,
InputIterator last, Size n1, Size n2,
const T& trash)
{
}
template <typename InputIterator, typename Size, typename T>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last, Size n1, Size n2,
+ operator()(std::execution::parallel_unsequenced_policy, InputIterator
first, InputIterator last, Size n1, Size n2,
const T& trash)
{
}
diff --git
a/libstdc++-v3/testsuite/26_numerics/pstl/numeric_ops/adjacent_difference.cc
b/libstdc++-v3/testsuite/26_numerics/pstl/numeric_ops/adjacent_difference.cc
index cf42b716acf6..22a235a7978e 100644
--- a/libstdc++-v3/testsuite/26_numerics/pstl/numeric_ops/adjacent_difference.cc
+++ b/libstdc++-v3/testsuite/26_numerics/pstl/numeric_ops/adjacent_difference.cc
@@ -108,13 +108,13 @@ struct test_one_policy
defined(_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN) // dummy
specialization by policy type, in case of broken configuration
template <typename Iterator1, typename Iterator2, typename T, typename
Function>
typename std::enable_if<is_same_iterator_category<Iterator1,
std::random_access_iterator_tag>::value, void>::type
- operator()(__pstl::execution::unsequenced_policy, Iterator1 data_b,
Iterator1 data_e, Iterator2 actual_b,
+ operator()(std::execution::unsequenced_policy, Iterator1 data_b, Iterator1
data_e, Iterator2 actual_b,
Iterator2 actual_e, T trash, Function f)
{
}
template <typename Iterator1, typename Iterator2, typename T, typename
Function>
typename std::enable_if<is_same_iterator_category<Iterator1,
std::random_access_iterator_tag>::value, void>::type
- operator()(__pstl::execution::parallel_unsequenced_policy, Iterator1
data_b, Iterator1 data_e, Iterator2 actual_b,
+ operator()(std::execution::parallel_unsequenced_policy, Iterator1 data_b,
Iterator1 data_e, Iterator2 actual_b,
Iterator2 actual_e, T trash, Function f)
{
}
diff --git a/libstdc++-v3/testsuite/26_numerics/pstl/numeric_ops/reduce.cc
b/libstdc++-v3/testsuite/26_numerics/pstl/numeric_ops/reduce.cc
index 5a8f921e8cd2..b43e5bb4e34e 100644
--- a/libstdc++-v3/testsuite/26_numerics/pstl/numeric_ops/reduce.cc
+++ b/libstdc++-v3/testsuite/26_numerics/pstl/numeric_ops/reduce.cc
@@ -65,12 +65,12 @@ struct test_two_short_forms
#if defined(_PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN) //dummy
specialization by policy type, in case of broken configuration
template <typename Iterator>
void
- operator()(__pstl::execution::parallel_policy, Iterator first, Iterator
last, Sum init, Sum expected)
+ operator()(std::execution::parallel_policy, Iterator first, Iterator last,
Sum init, Sum expected)
{
}
template <typename Iterator>
void
- operator()(__pstl::execution::parallel_unsequenced_policy, Iterator first,
Iterator last, Sum init, Sum expected)
+ operator()(std::execution::parallel_unsequenced_policy, Iterator first,
Iterator last, Sum init, Sum expected)
{
}
#endif
diff --git a/libstdc++-v3/testsuite/util/pstl/test_utils.h
b/libstdc++-v3/testsuite/util/pstl/test_utils.h
index 9c61a7145f59..02861178e344 100644
--- a/libstdc++-v3/testsuite/util/pstl/test_utils.h
+++ b/libstdc++-v3/testsuite/util/pstl/test_utils.h
@@ -1115,7 +1115,7 @@ template <typename Op, typename... T>
void
invoke_on_all_policies(Op op, T&&... rest)
{
- using namespace __pstl::execution;
+ using namespace std::execution;
// Try static execution policies
invoke_on_all_iterator_types()(seq, op, std::forward<T>(rest)...);
--
2.56.0
