diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-04-10 19:51:40 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-04-10 19:51:40 +0000 |
| commit | 3dee12e4a57241e4a53687f4a4e463b581dabf46 (patch) | |
| tree | 67f01614fe364c0f768a0a5961791c7cd28b2a32 /pstl/test/std/algorithms/alg.sorting | |
| parent | 0352f201dd3cf9ec83bf527eeef0b464214ff243 (diff) | |
| download | bcm5719-llvm-3dee12e4a57241e4a53687f4a4e463b581dabf46.tar.gz bcm5719-llvm-3dee12e4a57241e4a53687f4a4e463b581dabf46.zip | |
[pstl] Move to single underscore-capital for macros and include guards
Summary: Per the LLVM convention.
Reviewers: rodgert
Subscribers: jkorous, dexonsmith, jdoerfert, libcxx-commits
Tags: #libc
Differential Revision: https://reviews.llvm.org/D60521
llvm-svn: 358131
Diffstat (limited to 'pstl/test/std/algorithms/alg.sorting')
4 files changed, 6 insertions, 6 deletions
diff --git a/pstl/test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp b/pstl/test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp index 0c70342426e..adfe96e70c1 100644 --- a/pstl/test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp +++ b/pstl/test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp @@ -38,8 +38,8 @@ struct WithCmpOp struct test_is_heap { -#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ - __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ + _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) diff --git a/pstl/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp b/pstl/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp index 236e34290ae..7adadd52417 100644 --- a/pstl/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp +++ b/pstl/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp @@ -165,7 +165,7 @@ main() { test<uint16_t, float64_t>(std::less<float64_t>()); test<float32_t, int32_t>(std::greater<float32_t>()); -#if !__PSTL_ICC_18_TEST_EARLY_EXIT_AVX_RELEASE_BROKEN +#if !_PSTL_ICC_18_TEST_EARLY_EXIT_AVX_RELEASE_BROKEN test<float64_t, int32_t>([](const float64_t x, const int32_t y) { return x * x < y * y; }); #endif test<LocalWrapper<int32_t>, LocalWrapper<int32_t>>( diff --git a/pstl/test/std/algorithms/alg.sorting/partial_sort.pass.cpp b/pstl/test/std/algorithms/alg.sorting/partial_sort.pass.cpp index 6e9d7d21d66..54d30abeecc 100644 --- a/pstl/test/std/algorithms/alg.sorting/partial_sort.pass.cpp +++ b/pstl/test/std/algorithms/alg.sorting/partial_sort.pass.cpp @@ -86,7 +86,7 @@ struct test_brick_partial_sort if (m1 - first > 1) { auto complex = std::ceil(n * std::log(float32_t(m1 - first))); -#if defined(__PSTL_PAR_BACKEND_TBB) +#if defined(_PSTL_PAR_BACKEND_TBB) auto p = tbb::this_task_arena::max_concurrency(); #else auto p = 1; diff --git a/pstl/test/std/algorithms/alg.sorting/partial_sort_copy.pass.cpp b/pstl/test/std/algorithms/alg.sorting/partial_sort_copy.pass.cpp index 8f132022c64..44a2a9991be 100644 --- a/pstl/test/std/algorithms/alg.sorting/partial_sort_copy.pass.cpp +++ b/pstl/test/std/algorithms/alg.sorting/partial_sort_copy.pass.cpp @@ -59,8 +59,8 @@ struct test_one_policy : d_first(b1), d_last(e1), exp_first(b2), exp_last(e2) { } -#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ - __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ + _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, |
