maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[pstl] Remove stray usage of pstl::execution instead of std::execution 

llvm-svn: 363723
This commit is contained in:
Louis Dionne 2019-06-18 19:34:04 +00:00
parent a8aa58fb3d
commit 9d54063c82
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pstl/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp
View File

@ -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)

2
pstl/test/std/algorithms/alg.nonmodifying/for_each.pass.cpp
View File

@ -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");
}

2
pstl/test/std/algorithms/alg.nonmodifying/mismatch.pass.cpp
View File

@ -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);

6
pstl/test/std/numerics/numeric.ops/transform_scan.pass.cpp
View File

@ -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);