diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-07-18 20:22:28 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-07-18 20:22:28 +0000 |
| commit | 01963cec9b3fbc8ec98da449180d95be224dfadd (patch) | |
| tree | eb8fa0aff7173862b588f43301e80985513dd02e /pstl/include | |
| parent | 96f497081351e01f70af275abbf98847d25a5158 (diff) | |
| download | llvm-01963cec9b3fbc8ec98da449180d95be224dfadd.tar.gz | |
[NFC][pstl] Run clang-format on the sources, including the tests
llvm-svn: 366492
Diffstat (limited to 'pstl/include')
| -rw-r--r-- | pstl/include/pstl/internal/algorithm_impl.h | 6 | ||||
| -rw-r--r-- | pstl/include/pstl/internal/pstl_config.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pstl/include/pstl/internal/algorithm_impl.h b/pstl/include/pstl/internal/algorithm_impl.h index a9bf29a6fb27..883f03d8247d 100644 --- a/pstl/include/pstl/internal/algorithm_impl.h +++ b/pstl/include/pstl/internal/algorithm_impl.h @@ -2181,11 +2181,11 @@ __pattern_partial_sort_copy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __j1 = __first + (__j - __d_first); // 1. Copy elements from input to output -# if !_PSTL_ICC_18_OMP_SIMD_BROKEN +#if !_PSTL_ICC_18_OMP_SIMD_BROKEN __internal::__brick_copy(__i1, __j1, __i, __is_vector); -# else +#else std::copy(__i1, __j1, __i); -# endif +#endif // 2. Sort elements in output sequence std::sort(__i, __j, __comp); }, diff --git a/pstl/include/pstl/internal/pstl_config.h b/pstl/include/pstl/internal/pstl_config.h index 31dd47acfc72..ba964912e668 100644 --- a/pstl/include/pstl/internal/pstl_config.h +++ b/pstl/include/pstl/internal/pstl_config.h @@ -52,7 +52,8 @@ #endif // Enable SIMD for compilers that support OpenMP 4.0 -#if (_OPENMP >= 201307) || (__INTEL_COMPILER >= 1600) || (!defined(__INTEL_COMPILER) && _PSTL_GCC_VERSION >= 40900) || defined(__clang__) +#if (_OPENMP >= 201307) || (__INTEL_COMPILER >= 1600) || (!defined(__INTEL_COMPILER) && _PSTL_GCC_VERSION >= 40900) || \ + defined(__clang__) # define _PSTL_PRAGMA_SIMD _PSTL_PRAGMA(omp simd) # define _PSTL_PRAGMA_DECLARE_SIMD _PSTL_PRAGMA(omp declare simd) # define _PSTL_PRAGMA_SIMD_REDUCTION(PRM) _PSTL_PRAGMA(omp simd reduction(PRM)) |