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.merge/merge.pass.cpp | |
| 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.merge/merge.pass.cpp')
| -rw-r--r-- | pstl/test/std/algorithms/alg.merge/merge.pass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pstl/test/std/algorithms/alg.merge/merge.pass.cpp b/pstl/test/std/algorithms/alg.merge/merge.pass.cpp index a80bbae07f8..20e3a0d5054 100644 --- a/pstl/test/std/algorithms/alg.merge/merge.pass.cpp +++ b/pstl/test/std/algorithms/alg.merge/merge.pass.cpp @@ -107,7 +107,7 @@ main() test_merge_by_type<int32_t>([](size_t v) { return (v % 2 == 0 ? v : -v) * 3; }, [](size_t v) { return v * 2; }); test_merge_by_type<float64_t>([](size_t v) { return float64_t(v); }, [](size_t v) { return float64_t(v - 100); }); -#if !__PSTL_ICC_16_17_TEST_64_TIMEOUT +#if !_PSTL_ICC_16_17_TEST_64_TIMEOUT test_merge_by_type<Wrapper<int16_t>>([](size_t v) { return Wrapper<int16_t>(v % 100); }, [](size_t v) { return Wrapper<int16_t>(v % 10); }); #endif |
