diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-04-16 14:38:08 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-04-16 14:38:08 +0000 |
| commit | 4d88b17b3f282b1023400837c3249c9f27774eca (patch) | |
| tree | eea1898f3c643cb48b3fd9d9d8e465098b016540 /pstl/test/std/algorithms/alg.merge | |
| parent | 417c88940959788bd91883b0199b9c53c67e4e29 (diff) | |
| download | bcm5719-llvm-4d88b17b3f282b1023400837c3249c9f27774eca.tar.gz bcm5719-llvm-4d88b17b3f282b1023400837c3249c9f27774eca.zip | |
[pstl] Remove the stdlib headers from the PSTL and move them to the tests
Summary:
PSTL should not provide those headers since they belong to the standard
library. Instead, we define a dummy standard library in the tests that
provides those headers.
Reviewers: rodgert, MikeDvorskiy
Subscribers: mgorny, jkorous, dexonsmith, libcxx-commits
Tags: #libc
Differential Revision: https://reviews.llvm.org/D60535
llvm-svn: 358497
Diffstat (limited to 'pstl/test/std/algorithms/alg.merge')
| -rw-r--r-- | pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp | 7 | ||||
| -rw-r--r-- | pstl/test/std/algorithms/alg.merge/merge.pass.cpp | 9 |
2 files changed, 1 insertions, 15 deletions
diff --git a/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp b/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp index 2ba7457219b..7a8d065f0de 100644 --- a/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp +++ b/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp @@ -9,15 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include <algorithm> -#include "pstl/execution" -#include "pstl/algorithm" - -#else #include <execution> #include <algorithm> -#endif // PSTL_STANDALONE_TESTS #include "support/utils.h" diff --git a/pstl/test/std/algorithms/alg.merge/merge.pass.cpp b/pstl/test/std/algorithms/alg.merge/merge.pass.cpp index 20e3a0d5054..b215beb10af 100644 --- a/pstl/test/std/algorithms/alg.merge/merge.pass.cpp +++ b/pstl/test/std/algorithms/alg.merge/merge.pass.cpp @@ -9,16 +9,9 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include <algorithm> -#include <functional> -#include "pstl/execution" -#include "pstl/algorithm" - -#else #include <execution> #include <algorithm> -#endif // PSTL_STANDALONE_TESTS +#include <functional> #include "support/utils.h" |
