summaryrefslogtreecommitdiffstats
path: root/pstl/test/std/algorithms
diff options
context:
space:
mode:
authorLouis Dionne <ldionne@apple.com>2019-06-18 19:34:04 +0000
committerLouis Dionne <ldionne@apple.com>2019-06-18 19:34:04 +0000
commit9d54063c823964cd565023fd7f2ed21431e99f90 (patch)
tree081e7a0fa14936881ecb57089b99e5db7a39bae4 /pstl/test/std/algorithms
parenta8aa58fb3d3b1a4c70941d4b5e52fc13f3cecf7d (diff)
downloadbcm5719-llvm-9d54063c823964cd565023fd7f2ed21431e99f90.tar.gz
bcm5719-llvm-9d54063c823964cd565023fd7f2ed21431e99f90.zip
[pstl] Remove stray usage of pstl::execution instead of std::execution
llvm-svn: 363723
Diffstat (limited to 'pstl/test/std/algorithms')
-rw-r--r--pstl/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp4
-rw-r--r--pstl/test/std/algorithms/alg.nonmodifying/for_each.pass.cpp2
-rw-r--r--pstl/test/std/algorithms/alg.nonmodifying/mismatch.pass.cpp2
3 files changed, 4 insertions, 4 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 08241ac39e4..4a4d07229ff 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 00e04f26227..9e7ff967921 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 f0f61ca10e2..e55ea541a59 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);
OpenPOWER on IntegriCloud