diff options
64 files changed, 50 insertions, 371 deletions
diff --git a/pstl/test/CMakeLists.txt b/pstl/test/CMakeLists.txt index 33814977495..dae99e129be 100644 --- a/pstl/test/CMakeLists.txt +++ b/pstl/test/CMakeLists.txt @@ -18,6 +18,10 @@ add_custom_target(check-pstl DEPENDS pstl-build-tests COMMENT "Build and run all the unit tests.") +add_library(test_stdlib INTERFACE) +target_include_directories(test_stdlib INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/support/stdlib") +target_link_libraries(test_stdlib INTERFACE pstl::ParallelSTL) + file(GLOB_RECURSE UNIT_TESTS "*.pass.cpp") foreach(_file IN LISTS UNIT_TESTS) file(RELATIVE_PATH _target "${CMAKE_CURRENT_SOURCE_DIR}" "${_file}") @@ -27,8 +31,7 @@ foreach(_file IN LISTS UNIT_TESTS) add_executable(${_target} EXCLUDE_FROM_ALL "${_file}") target_include_directories(${_target} PRIVATE "${CMAKE_CURRENT_LIST_DIR}") - target_link_libraries(${_target} PRIVATE pstl::ParallelSTL) - target_compile_definitions(${_target} PRIVATE -DPSTL_STANDALONE_TESTS) + target_link_libraries(${_target} PRIVATE test_stdlib) set_target_properties(${_target} PROPERTIES CXX_EXTENSIONS NO RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") add_test(${_target} "${CMAKE_CURRENT_BINARY_DIR}/${_target}") diff --git a/pstl/test/pstl/header_inclusion_order_algorithm_0.pass.cpp b/pstl/test/pstl/header_inclusion_order_algorithm_0.pass.cpp index 0b0d79b5b23..935c7e50860 100644 --- a/pstl/test/pstl/header_inclusion_order_algorithm_0.pass.cpp +++ b/pstl/test/pstl/header_inclusion_order_algorithm_0.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/execution" -#include "pstl/algorithm" -#else #include <execution> #include <algorithm> -#endif // PSTL_STANDALONE_TESTS int32_t main() diff --git a/pstl/test/pstl/header_inclusion_order_algorithm_1.pass.cpp b/pstl/test/pstl/header_inclusion_order_algorithm_1.pass.cpp index e346a3bc6ba..e1057e94191 100644 --- a/pstl/test/pstl/header_inclusion_order_algorithm_1.pass.cpp +++ b/pstl/test/pstl/header_inclusion_order_algorithm_1.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/algorithm" -#include "pstl/execution" -#else #include <algorithm> #include <execution> -#endif // PSTL_STANDALONE_TESTS int32_t main() diff --git a/pstl/test/pstl/header_inclusion_order_memory_0.pass.cpp b/pstl/test/pstl/header_inclusion_order_memory_0.pass.cpp index 1a8a117ac58..9304d0c965c 100644 --- a/pstl/test/pstl/header_inclusion_order_memory_0.pass.cpp +++ b/pstl/test/pstl/header_inclusion_order_memory_0.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/execution" -#include "pstl/memory" -#else #include <execution> #include <memory> -#endif // PSTL_STANDALONE_TESTS int32_t main() diff --git a/pstl/test/pstl/header_inclusion_order_memory_1.pass.cpp b/pstl/test/pstl/header_inclusion_order_memory_1.pass.cpp index 2e343237042..ff767c71bfb 100644 --- a/pstl/test/pstl/header_inclusion_order_memory_1.pass.cpp +++ b/pstl/test/pstl/header_inclusion_order_memory_1.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/memory" -#include "pstl/execution" -#else #include <memory> #include <execution> -#endif // PSTL_STANDALONE_TESTS int32_t main() diff --git a/pstl/test/pstl/header_inclusion_order_numeric_0.pass.cpp b/pstl/test/pstl/header_inclusion_order_numeric_0.pass.cpp index 1ff596eee51..04725e9df36 100644 --- a/pstl/test/pstl/header_inclusion_order_numeric_0.pass.cpp +++ b/pstl/test/pstl/header_inclusion_order_numeric_0.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/execution" -#include "pstl/numeric" -#else #include <execution> #include <numeric> -#endif // PSTL_STANDALONE_TESTS int32_t main() diff --git a/pstl/test/pstl/header_inclusion_order_numeric_1.pass.cpp b/pstl/test/pstl/header_inclusion_order_numeric_1.pass.cpp index 3c5b8cf8989..db38fbd928b 100644 --- a/pstl/test/pstl/header_inclusion_order_numeric_1.pass.cpp +++ b/pstl/test/pstl/header_inclusion_order_numeric_1.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/numeric" -#include "pstl/execution" -#else #include <numeric> #include <execution> -#endif // PSTL_STANDALONE_TESTS int32_t main() 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" diff --git a/pstl/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp index 2a915ca9893..d2bb83b6327 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp @@ -10,13 +10,8 @@ // Tests for copy_if and remove_copy_if #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.modifying.operations/alg.partitions/is_partitioned.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp index b1880f1d94c..874595f2f14 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.modifying.operations/alg.partitions/partition.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp index 0203fff85c6..716f6dd3e32 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp @@ -10,19 +10,13 @@ // Tests for stable_partition and partition #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/execution" -#include "pstl/algorithm" -#else #include <execution> #include <algorithm> -#endif // PSTL_STANDALONE_TESTS - -#include "support/utils.h" - #include <iterator> #include <type_traits> +#include "support/utils.h" + using namespace TestUtils; template <typename T> diff --git a/pstl/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp index e9ae0ee20e9..dfb76e3321c 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp @@ -10,19 +10,13 @@ // Tests for stable_partition and partition_copy #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/execution" -#include "pstl/algorithm" -#else #include <execution> #include <algorithm> -#endif // PSTL_STANDALONE_TESTS - -#include "support/utils.h" - #include <cstdlib> #include <iterator> +#include "support/utils.h" + using namespace TestUtils; struct test_partition_copy diff --git a/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp index 79b53d19581..9d4615c356e 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp @@ -9,15 +9,9 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS #include <iterator> - -#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.modifying.operations/alg.reverse/reverse_copy.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp index c8569a64795..3edd3e87599 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp @@ -9,15 +9,9 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS #include <iterator> - -#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.modifying.operations/copy_move.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/copy_move.pass.cpp index c54d97ac9ed..18ba11b1c5d 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/copy_move.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/copy_move.pass.cpp @@ -11,13 +11,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.modifying.operations/fill.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/fill.pass.cpp index 19bc150b31b..d54a7defb65 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/fill.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/fill.pass.cpp @@ -9,14 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS - -#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.modifying.operations/generate.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/generate.pass.cpp index 9862f14ba62..9b423df2933 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/generate.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/generate.pass.cpp @@ -9,15 +9,9 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS #include <atomic> - -#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.modifying.operations/remove.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/remove.pass.cpp index 5a5404f9bff..010e3c6f616 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/remove.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/remove.pass.cpp @@ -10,13 +10,8 @@ // Test for remove, remove_if #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.modifying.operations/remove_copy.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/remove_copy.pass.cpp index 0437292af4f..1dabb811fe9 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/remove_copy.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/remove_copy.pass.cpp @@ -9,14 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS - -#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.modifying.operations/replace.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/replace.pass.cpp index 7784d386423..9f172a4b97a 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/replace.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/replace.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.modifying.operations/replace_copy.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/replace_copy.pass.cpp index e4a147b9475..b6700f13e21 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/replace_copy.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/replace_copy.pass.cpp @@ -11,13 +11,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.modifying.operations/rotate.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp index 64f6a035ac8..08241ac39e4 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp @@ -9,15 +9,9 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS #include <iterator> - -#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.modifying.operations/rotate_copy.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/rotate_copy.pass.cpp index 3660e9d3181..3b1ce81b6ef 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/rotate_copy.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/rotate_copy.pass.cpp @@ -9,15 +9,9 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS #include <iterator> - -#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.modifying.operations/swap_ranges.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/swap_ranges.pass.cpp index b53003c4626..1f4031b4f31 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/swap_ranges.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/swap_ranges.pass.cpp @@ -9,15 +9,9 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS #include <iterator> - -#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.modifying.operations/transform_binary.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/transform_binary.pass.cpp index d44284de4e5..e440d6708c8 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/transform_binary.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/transform_binary.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.modifying.operations/transform_unary.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/transform_unary.pass.cpp index eae992c4111..48e3db4866d 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/transform_unary.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/transform_unary.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.modifying.operations/unique.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/unique.pass.cpp index 92a9cddabd6..dc1e38bcf38 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/unique.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/unique.pass.cpp @@ -10,13 +10,8 @@ // Test for unique #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.modifying.operations/unique_copy_equal.pass.cpp b/pstl/test/std/algorithms/alg.modifying.operations/unique_copy_equal.pass.cpp index 9161fff22b5..a3adb20bfc7 100644 --- a/pstl/test/std/algorithms/alg.modifying.operations/unique_copy_equal.pass.cpp +++ b/pstl/test/std/algorithms/alg.modifying.operations/unique_copy_equal.pass.cpp @@ -10,13 +10,8 @@ // Tests for unique_copy #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.nonmodifying/adjacent_find.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/adjacent_find.pass.cpp index 50b01e38bc1..1bccb530254 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/adjacent_find.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/adjacent_find.pass.cpp @@ -9,14 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS - -#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.nonmodifying/all_of.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/all_of.pass.cpp index f73166e917e..2ad0c579755 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/all_of.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/all_of.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.nonmodifying/any_of.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/any_of.pass.cpp index 8d330c2487d..9e8cbe56e87 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/any_of.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/any_of.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.nonmodifying/count.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/count.pass.cpp index 04b0f52e6c3..e1c649dacbe 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/count.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/count.pass.cpp @@ -10,13 +10,8 @@ // Tests for count and count_if #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.nonmodifying/equal.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/equal.pass.cpp index 8ddadb874cd..ea4c09ec18d 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/equal.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/equal.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.nonmodifying/find.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/find.pass.cpp index 8d7cc025e0c..a5d5b8567de 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/find.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/find.pass.cpp @@ -10,13 +10,8 @@ // Tests for find #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.nonmodifying/find_end.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/find_end.pass.cpp index a9b04f82f54..dfe499c3d1e 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/find_end.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/find_end.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.nonmodifying/find_first_of.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/find_first_of.pass.cpp index eb67c2f4781..f0903313f0f 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/find_first_of.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/find_first_of.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.nonmodifying/find_if.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/find_if.pass.cpp index 06763b16958..b0f165d5df3 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/find_if.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/find_if.pass.cpp @@ -10,13 +10,8 @@ // Tests for find_if and find_if_not #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.nonmodifying/for_each.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/for_each.pass.cpp index cb0fa06dcda..00e04f26227 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/for_each.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/for_each.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.nonmodifying/mismatch.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/mismatch.pass.cpp index ec34af08fb0..f0f61ca10e2 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/mismatch.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/mismatch.pass.cpp @@ -9,17 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS - -#include "pstl/execution" -#include "pstl/algorithm" -#include "pstl/numeric" -#include "pstl/memory" - -#else #include <execution> #include <algorithm> -#endif // PSTL_STANDALONE_TESTS #include "support/utils.h" diff --git a/pstl/test/std/algorithms/alg.nonmodifying/none_of.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/none_of.pass.cpp index 8ca113c1ae2..3abf7e3bd92 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/none_of.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/none_of.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.nonmodifying/nth_element.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/nth_element.pass.cpp index 7aee86260df..61fe8d7049d 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/nth_element.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/nth_element.pass.cpp @@ -9,16 +9,9 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include <algorithm> #include <iostream> -#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.nonmodifying/search_n.pass.cpp b/pstl/test/std/algorithms/alg.nonmodifying/search_n.pass.cpp index 846140afdcc..28fcb36ad80 100644 --- a/pstl/test/std/algorithms/alg.nonmodifying/search_n.pass.cpp +++ b/pstl/test/std/algorithms/alg.nonmodifying/search_n.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#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.sorting/alg.heap.operations/is_heap.pass.cpp b/pstl/test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp index adfe96e70c1..bfee4bdffda 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 @@ -10,13 +10,8 @@ // Tests for is_heap, is_heap_until #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/execution" -#include "pstl/algorithm" -#else #include <execution> #include <algorithm> -#endif // PSTL_STANDALONE_TESTS #include "support/utils.h" #include <iostream> 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 7adadd52417..cdfca24af72 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 @@ -9,15 +9,9 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS #include <iostream> - -#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.sorting/alg.min.max/minmax_element.pass.cpp b/pstl/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp index e3fec868375..01016b898a5 100644 --- a/pstl/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp +++ b/pstl/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp @@ -9,21 +9,14 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS - -#include "pstl/execution" -#include "pstl/algorithm" -#else #include <execution> #include <algorithm> -#endif // PSTL_STANDALONE_TESTS - -#include "support/utils.h" - #include <set> #include <cassert> #include <cmath> +#include "support/utils.h" + using namespace TestUtils; struct check_minelement diff --git a/pstl/test/std/algorithms/alg.sorting/alg.set.operations/includes.pass.cpp b/pstl/test/std/algorithms/alg.sorting/alg.set.operations/includes.pass.cpp index fff2284fe03..431ce0d11cd 100644 --- a/pstl/test/std/algorithms/alg.sorting/alg.set.operations/includes.pass.cpp +++ b/pstl/test/std/algorithms/alg.sorting/alg.set.operations/includes.pass.cpp @@ -9,16 +9,9 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS - #include <cmath> - -#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.sorting/alg.set.operations/set.pass.cpp b/pstl/test/std/algorithms/alg.sorting/alg.set.operations/set.pass.cpp index 6d8c0891ff7..dbe59d02adf 100644 --- a/pstl/test/std/algorithms/alg.sorting/alg.set.operations/set.pass.cpp +++ b/pstl/test/std/algorithms/alg.sorting/alg.set.operations/set.pass.cpp @@ -9,17 +9,10 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS - #include <cmath> #include <chrono> - -#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.sorting/is_sorted.pass.cpp b/pstl/test/std/algorithms/alg.sorting/is_sorted.pass.cpp index a5219f79669..e7d84f1441a 100644 --- a/pstl/test/std/algorithms/alg.sorting/is_sorted.pass.cpp +++ b/pstl/test/std/algorithms/alg.sorting/is_sorted.pass.cpp @@ -9,14 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS - -#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.sorting/partial_sort.pass.cpp b/pstl/test/std/algorithms/alg.sorting/partial_sort.pass.cpp index 54d30abeecc..701fee2e867 100644 --- a/pstl/test/std/algorithms/alg.sorting/partial_sort.pass.cpp +++ b/pstl/test/std/algorithms/alg.sorting/partial_sort.pass.cpp @@ -9,16 +9,9 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS - #include <cmath> - -#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.sorting/partial_sort_copy.pass.cpp b/pstl/test/std/algorithms/alg.sorting/partial_sort_copy.pass.cpp index 44a2a9991be..6045176e217 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 @@ -9,16 +9,11 @@ // Tests for partial_sort_copy -#include <cmath> #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/execution" -#include "pstl/algorithm" -#else +#include <cmath> #include <execution> #include <algorithm> -#endif // PSTL_STANDALONE_TESTS #include "support/utils.h" diff --git a/pstl/test/std/algorithms/alg.sorting/sort.pass.cpp b/pstl/test/std/algorithms/alg.sorting/sort.pass.cpp index e2eb9cecd2d..1997ec56c8b 100644 --- a/pstl/test/std/algorithms/alg.sorting/sort.pass.cpp +++ b/pstl/test/std/algorithms/alg.sorting/sort.pass.cpp @@ -9,14 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS - -#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/numerics/numeric.ops/adjacent_difference.pass.cpp b/pstl/test/std/numerics/numeric.ops/adjacent_difference.pass.cpp index 4d05c33c578..eb3a48ec334 100644 --- a/pstl/test/std/numerics/numeric.ops/adjacent_difference.pass.cpp +++ b/pstl/test/std/numerics/numeric.ops/adjacent_difference.pass.cpp @@ -9,16 +9,9 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS #include <iterator> - -#include "pstl/execution" -#include "pstl/algorithm" -#include "pstl/numeric" -#else #include <execution> -#include <algorithm> -#endif // PSTL_STANDALONE_TESTS +#include <numeric> #include "support/utils.h" diff --git a/pstl/test/std/numerics/numeric.ops/reduce.pass.cpp b/pstl/test/std/numerics/numeric.ops/reduce.pass.cpp index d4709c5ee1b..83efe032feb 100644 --- a/pstl/test/std/numerics/numeric.ops/reduce.pass.cpp +++ b/pstl/test/std/numerics/numeric.ops/reduce.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/execution" -#include "pstl/numeric" -#else #include <execution> #include <numeric> -#endif // PSTL_STANDALONE_TESTS #include "support/utils.h" diff --git a/pstl/test/std/numerics/numeric.ops/scan.pass.cpp b/pstl/test/std/numerics/numeric.ops/scan.pass.cpp index eafffcc39f5..6ae02f18b27 100644 --- a/pstl/test/std/numerics/numeric.ops/scan.pass.cpp +++ b/pstl/test/std/numerics/numeric.ops/scan.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/execution" -#include "pstl/numeric" -#else #include <execution> #include <numeric> -#endif // PSTL_STANDALONE_TESTS #include "support/utils.h" diff --git a/pstl/test/std/numerics/numeric.ops/transform_reduce.pass.cpp b/pstl/test/std/numerics/numeric.ops/transform_reduce.pass.cpp index 792190a9724..4065e722309 100644 --- a/pstl/test/std/numerics/numeric.ops/transform_reduce.pass.cpp +++ b/pstl/test/std/numerics/numeric.ops/transform_reduce.pass.cpp @@ -9,14 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS - -#include "pstl/execution" -#include "pstl/numeric" -#else #include <execution> #include <numeric> -#endif // PSTL_STANDALONE_TESTS #include "support/utils.h" diff --git a/pstl/test/std/numerics/numeric.ops/transform_scan.pass.cpp b/pstl/test/std/numerics/numeric.ops/transform_scan.pass.cpp index 282bf3448a8..748da917123 100644 --- a/pstl/test/std/numerics/numeric.ops/transform_scan.pass.cpp +++ b/pstl/test/std/numerics/numeric.ops/transform_scan.pass.cpp @@ -9,13 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/execution" -#include "pstl/numeric" -#else #include <execution> #include <numeric> -#endif // PSTL_STANDALONE_TESTS #include "support/utils.h" diff --git a/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_construct.pass.cpp b/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_construct.pass.cpp index 0e6e0c0f034..50c9db17bac 100644 --- a/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_construct.pass.cpp +++ b/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_construct.pass.cpp @@ -12,13 +12,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/execution" -#include "pstl/memory" -#else #include <execution> #include <memory> -#endif // PSTL_STANDALONE_TESTS #include "support/utils.h" diff --git a/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_copy_move.pass.cpp b/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_copy_move.pass.cpp index ce3ee1a33ad..979c2e59e1a 100644 --- a/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_copy_move.pass.cpp +++ b/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_copy_move.pass.cpp @@ -11,13 +11,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS -#include "pstl/execution" -#include "pstl/memory" -#else #include <execution> #include <memory> -#endif // PSTL_STANDALONE_TESTS #include "support/utils.h" diff --git a/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_fill_destroy.pass.cpp b/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_fill_destroy.pass.cpp index 12301f014e1..a57afcc5211 100644 --- a/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_fill_destroy.pass.cpp +++ b/pstl/test/std/utilities/memory/specialized.algorithms/uninitialized_fill_destroy.pass.cpp @@ -9,15 +9,8 @@ #include "support/pstl_test_config.h" -#ifdef PSTL_STANDALONE_TESTS - -#include "pstl/execution" -#include "pstl/memory" -#include "pstl/algorithm" -#else #include <execution> -#include <algorithm> -#endif // PSTL_STANDALONE_TESTS +#include <memory> #include "support/utils.h" diff --git a/pstl/include/pstl/algorithm b/pstl/test/support/stdlib/algorithm index 684f8eaa2e8..39e6f7471a6 100644 --- a/pstl/include/pstl/algorithm +++ b/pstl/test/support/stdlib/algorithm @@ -7,18 +7,20 @@ // //===----------------------------------------------------------------------===// -#ifndef _PSTL_ALGORITHM -#define _PSTL_ALGORITHM +#ifndef _TEST_SUPPORT_STDLIB_ALGORITHM +#define _TEST_SUPPORT_STDLIB_ALGORITHM -#include "internal/pstl_config.h" +#include_next <algorithm> + +#include <pstl/internal/pstl_config.h> #if _PSTL_EXECUTION_POLICIES_DEFINED // If <execution> has already been included, pull in implementations -# include "internal/glue_algorithm_impl.h" +# include <pstl/internal/glue_algorithm_impl.h> #else // Otherwise just pull in forward declarations -# include "internal/glue_algorithm_defs.h" +# include <pstl/internal/glue_algorithm_defs.h> # define _PSTL_ALGORITHM_FORWARD_DECLARED 1 #endif -#endif /* _PSTL_ALGORITHM */ +#endif /* _TEST_SUPPORT_STDLIB_ALGORITHM */ diff --git a/pstl/include/pstl/execution b/pstl/test/support/stdlib/execution index 333c61fbb17..ad18c450115 100644 --- a/pstl/include/pstl/execution +++ b/pstl/test/support/stdlib/execution @@ -7,30 +7,32 @@ // //===----------------------------------------------------------------------===// -#ifndef _PSTL_EXECUTION -#define _PSTL_EXECUTION +#ifndef _TEST_SUPPORT_STDLIB_EXECUTION +#define _TEST_SUPPORT_STDLIB_EXECUTION -#include "internal/pstl_config.h" -#include "internal/execution_defs.h" +// #include_next <execution> // None of the standard libraries PSTL is built on top have the <execution> header yet. + +#include <pstl/internal/pstl_config.h> +#include <pstl/internal/execution_defs.h> #define _PSTL_EXECUTION_POLICIES_DEFINED 1 #if _PSTL_ALGORITHM_FORWARD_DECLARED -# include "internal/glue_algorithm_impl.h" +# include <pstl/internal/glue_algorithm_impl.h> #endif #if _PSTL_MEMORY_FORWARD_DECLARED -# include "internal/glue_memory_impl.h" +# include <pstl/internal/glue_memory_impl.h> #endif #if _PSTL_NUMERIC_FORWARD_DECLARED -# include "internal/glue_numeric_impl.h" +# include <pstl/internal/glue_numeric_impl.h> #endif #if _PSTL_CPP17_EXECUTION_POLICIES_PRESENT _PSTL_PRAGMA_MESSAGE_POLICIES("The <Parallel STL> execution policies are defined in the namespace __pstl::execution") #else -# include "internal/glue_execution_defs.h" +# include <pstl/internal/glue_execution_defs.h> _PSTL_PRAGMA_MESSAGE_POLICIES( "The <Parallel STL> execution policies are injected into the standard namespace std::execution") #endif @@ -45,4 +47,4 @@ using namespace __pstl::execution; } } // namespace pstl -#endif /* _PSTL_EXECUTION */ +#endif /* _TEST_SUPPORT_STDLIB_EXECUTION */ diff --git a/pstl/include/pstl/memory b/pstl/test/support/stdlib/memory index 359eaf19f3b..7d110912296 100644 --- a/pstl/include/pstl/memory +++ b/pstl/test/support/stdlib/memory @@ -7,18 +7,20 @@ // //===----------------------------------------------------------------------===// -#ifndef _PSTL_MEMORY -#define _PSTL_MEMORY +#ifndef _TEST_SUPPORT_STDLIB_MEMORY +#define _TEST_SUPPORT_STDLIB_MEMORY -#include "internal/pstl_config.h" +#include_next <memory> + +#include <pstl/internal/pstl_config.h> #if _PSTL_EXECUTION_POLICIES_DEFINED // If <execution> has already been included, pull in implementations -# include "internal/glue_memory_impl.h" +# include <pstl/internal/glue_memory_impl.h> #else // Otherwise just pull in forward declarations -# include "internal/glue_memory_defs.h" +# include <pstl/internal/glue_memory_defs.h> # define _PSTL_MEMORY_FORWARD_DECLARED 1 #endif -#endif /* _PSTL_MEMORY */ +#endif /* _TEST_SUPPORT_STDLIB_MEMORY */ diff --git a/pstl/include/pstl/numeric b/pstl/test/support/stdlib/numeric index 94e9b76dc17..8f98bc75464 100644 --- a/pstl/include/pstl/numeric +++ b/pstl/test/support/stdlib/numeric @@ -7,18 +7,20 @@ // //===----------------------------------------------------------------------===// -#ifndef _PSTL_NUMERIC -#define _PSTL_NUMERIC +#ifndef _TEST_SUPPORT_STDLIB_NUMERIC +#define _TEST_SUPPORT_STDLIB_NUMERIC -#include "internal/pstl_config.h" +#include_next <numeric> + +#include <pstl/internal/pstl_config.h> #if _PSTL_EXECUTION_POLICIES_DEFINED // If <execution> has already been included, pull in implementations -# include "internal/glue_numeric_impl.h" +# include <pstl/internal/glue_numeric_impl.h> #else // Otherwise just pull in forward declarations -# include "internal/glue_numeric_defs.h" +# include <pstl/internal/glue_numeric_defs.h> # define _PSTL_NUMERIC_FORWARD_DECLARED 1 #endif -#endif /* _PSTL_NUMERIC */ +#endif /* _TEST_SUPPORT_STDLIB_NUMERIC */ |
