diff options
author | Louis Dionne <ldionne@apple.com> | 2019-06-18 19:34:04 +0000 |
---|---|---|
committer | Louis Dionne <ldionne@apple.com> | 2019-06-18 19:34:04 +0000 |
commit | 9d54063c823964cd565023fd7f2ed21431e99f90 (patch) | |
tree | 081e7a0fa14936881ecb57089b99e5db7a39bae4 /pstl | |
parent | a8aa58fb3d3b1a4c70941d4b5e52fc13f3cecf7d (diff) | |
download | llvm-9d54063c823964cd565023fd7f2ed21431e99f90.tar.gz |
[pstl] Remove stray usage of pstl::execution instead of std::execution
llvm-svn: 363723
Diffstat (limited to 'pstl')
4 files changed, 7 insertions, 7 deletions
diff --git a/pstl/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp index 08241ac39e4d..4a4d07229ff3 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp @@ -112,7 +112,7 @@ struct test_one_policy template <typename ExecutionPolicy, typename Iterator, typename Size> typename std::enable_if< is_same_iterator_category<Iterator, std::random_access_iterator_tag>::value && - !std::is_same<ExecutionPolicy, pstl::execution::sequenced_policy>::value && + !std::is_same<ExecutionPolicy, std::execution::sequenced_policy>::value && std::is_same<typename std::iterator_traits<Iterator>::value_type, wrapper<float32_t>>::value, bool>::type check_move(ExecutionPolicy&& exec, Iterator b, Iterator e, Size shift) @@ -128,7 +128,7 @@ struct test_one_policy template <typename ExecutionPolicy, typename Iterator, typename Size> typename std::enable_if< !(is_same_iterator_category<Iterator, std::random_access_iterator_tag>::value && - !std::is_same<ExecutionPolicy, pstl::execution::sequenced_policy>::value && + !std::is_same<ExecutionPolicy, std::execution::sequenced_policy>::value && std::is_same<typename std::iterator_traits<Iterator>::value_type, wrapper<float32_t>>::value), bool>::type check_move(ExecutionPolicy&& exec, Iterator b, Iterator e, Size shift) diff --git a/pstl/test/std/algorithms/alg.nonmodifying/for_each.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/for_each.pass.cpp index 00e04f262276..9e7ff9679213 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/for_each.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/for_each.pass.cpp @@ -52,7 +52,7 @@ struct test_one_policy EXPECT_EQ_N(expected_first, first, n, "wrong effect from for_each"); // Try for_each_n - std::for_each_n(pstl::execution::seq, expected_first, n, Flip<T>(1)); + std::for_each_n(std::execution::seq, expected_first, n, Flip<T>(1)); for_each_n(exec, first, n, Flip<T>(1)); EXPECT_EQ_N(expected_first, first, n, "wrong effect from for_each_n"); } diff --git a/pstl/test/std/algorithms/alg.nonmodifying/mismatch.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/mismatch.pass.cpp index f0f61ca10e22..e55ea541a597 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/mismatch.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/mismatch.pass.cpp @@ -39,7 +39,7 @@ struct test_mismatch using namespace std; typedef typename iterator_traits<Iterator1>::value_type T; { - const auto expected = mismatch(pstl::execution::seq, first1, last1, first2, last2, std::equal_to<T>()); + const auto expected = mismatch(std::execution::seq, first1, last1, first2, last2, std::equal_to<T>()); const auto res1 = mismatch(exec, first1, last1, first2, last2, std::equal_to<T>()); EXPECT_TRUE(expected == res1, "wrong return result from mismatch"); const auto res2 = mismatch(exec, first1, last1, first2, last2); diff --git a/pstl/test/std/numerics/numeric.ops/transform_scan.pass.cpp b/pstl/test/std/numerics/numeric.ops/transform_scan.pass.cpp index 748da917123b..01920e1902b6 100644 --- a/pstl/test/std/numerics/numeric.ops/transform_scan.pass.cpp +++ b/pstl/test/std/numerics/numeric.ops/transform_scan.pass.cpp @@ -42,9 +42,9 @@ struct test_transform_scan { using namespace std; - auto orr1 = inclusive ? transform_inclusive_scan(pstl::execution::seq, first, last, expected_first, binary_op, + auto orr1 = inclusive ? transform_inclusive_scan(std::execution::seq, first, last, expected_first, binary_op, unary_op, init) - : transform_exclusive_scan(pstl::execution::seq, first, last, expected_first, init, + : transform_exclusive_scan(std::execution::seq, first, last, expected_first, init, binary_op, unary_op); auto orr2 = inclusive ? transform_inclusive_scan(exec, first, last, out_first, binary_op, unary_op, init) : transform_exclusive_scan(exec, first, last, out_first, init, binary_op, unary_op); @@ -54,7 +54,7 @@ struct test_transform_scan // Checks inclusive scan if init is not provided if (inclusive && n > 0) { - orr1 = transform_inclusive_scan(pstl::execution::seq, first, last, expected_first, binary_op, unary_op); + orr1 = transform_inclusive_scan(std::execution::seq, first, last, expected_first, binary_op, unary_op); orr2 = transform_inclusive_scan(exec, first, last, out_first, binary_op, unary_op); EXPECT_TRUE(out_last == orr2, "transform...scan returned wrong iterator"); check_and_reset(expected_first, out_first, n, trash); |