aboutsummaryrefslogtreecommitdiff
path: root/libcxx/include/algorithm
diff options
context:
space:
mode:
authorLouis Dionne <ldionne@apple.com>2019-08-05 18:29:14 +0000
committerLouis Dionne <ldionne@apple.com>2019-08-05 18:29:14 +0000
commit0a06eb911b830cf693747ea6cd975bd97b454e3e (patch)
treec68150415e2565cc96801d042c3230efc0194103 /libcxx/include/algorithm
parent3de33245d2c992c9e0af60372043540b60f3a810 (diff)
downloadllvm-0a06eb911b830cf693747ea6cd975bd97b454e3e.zip
llvm-0a06eb911b830cf693747ea6cd975bd97b454e3e.tar.gz
llvm-0a06eb911b830cf693747ea6cd975bd97b454e3e.tar.bz2
[libc++] Take 2: Integrate the PSTL into libc++
Summary: This commit allows specifying LIBCXX_ENABLE_PARALLEL_ALGORITHMS when configuring libc++ in CMake. When that option is enabled, libc++ will assume that the PSTL can be found somewhere on the CMake module path, and it will provide the C++17 parallel algorithms based on the PSTL (that is assumed to be available). The commit also adds support for running the PSTL tests as part of the libc++ test suite. The first attempt to commit this failed because it exposed a bug in the tests for modules. Now that this has been fixed, it should be safe to commit this. Reviewers: EricWF Subscribers: mgorny, christof, jkorous, dexonsmith, libcxx-commits, mclow.lists, EricWF Tags: #libc Differential Revision: https://reviews.llvm.org/D60480 llvm-svn: 367903
Diffstat (limited to 'libcxx/include/algorithm')
-rw-r--r--libcxx/include/algorithm4
1 files changed, 4 insertions, 0 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm
index 0d78626..ac780af 100644
--- a/libcxx/include/algorithm
+++ b/libcxx/include/algorithm
@@ -5678,4 +5678,8 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
+#if defined(_LIBCPP_HAS_PARALLEL_ALGORITHMS) && _LIBCPP_STD_VER >= 17
+# include <pstl/internal/glue_algorithm_impl.h>
+#endif
+
#endif // _LIBCPP_ALGORITHM