Index: libcxx/benchmarks/filesystem.bench.cpp =================================================================== --- libcxx/benchmarks/filesystem.bench.cpp +++ libcxx/benchmarks/filesystem.bench.cpp @@ -1,7 +1,7 @@ #include "benchmark/benchmark.h" #include "GenerateInput.hpp" #include "test_iterators.h" -#include "filesystem_include.hpp" +#include "filesystem_include.h" static const size_t TestNumInputs = 1024; Index: libcxx/test/libcxx/algorithms/half_positive.pass.cpp =================================================================== --- libcxx/test/libcxx/algorithms/half_positive.pass.cpp +++ libcxx/test/libcxx/algorithms/half_positive.pass.cpp @@ -17,7 +17,7 @@ #include #include "test_macros.h" -#include "user_defined_integral.hpp" +#include "user_defined_integral.h" namespace { Index: libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp =================================================================== --- libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp +++ libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" void test_default_does_not_allocate() { DisableAllocationGuard g; Index: libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp =================================================================== --- libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp +++ libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" void test_default_does_not_allocate() { DisableAllocationGuard g; Index: libcxx/test/libcxx/containers/sequences/deque/spare_block_handling.pass.cpp =================================================================== --- libcxx/test/libcxx/containers/sequences/deque/spare_block_handling.pass.cpp +++ libcxx/test/libcxx/containers/sequences/deque/spare_block_handling.pass.cpp @@ -21,7 +21,7 @@ #include #include "min_allocator.h" -#include "rapid-cxx-test.hpp" +#include "rapid-cxx-test.h" template struct ContainerAdaptor : public Adaptor { Index: libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp =================================================================== --- libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp +++ libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp @@ -22,7 +22,7 @@ #include #include #include -#include "container_debug_tests.hpp" +#include "container_debug_tests.h" #include "test_macros.h" #include "debug_mode_helper.h" Index: libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp =================================================================== --- libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp +++ libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "container_debug_tests.hpp" +#include "container_debug_tests.h" #include "test_macros.h" Index: libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp =================================================================== --- libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp +++ libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp @@ -22,7 +22,7 @@ #include #include #include -#include "container_debug_tests.hpp" +#include "container_debug_tests.h" #include "test_macros.h" #include "debug_mode_helper.h" Index: libcxx/test/libcxx/debug/containers/db_string.pass.cpp =================================================================== --- libcxx/test/libcxx/debug/containers/db_string.pass.cpp +++ libcxx/test/libcxx/debug/containers/db_string.pass.cpp @@ -21,7 +21,7 @@ #include #include "test_macros.h" -#include "container_debug_tests.hpp" +#include "container_debug_tests.h" #include "debug_mode_helper.h" using namespace IteratorDebugChecks; Index: libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp =================================================================== --- libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp +++ libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp @@ -21,7 +21,7 @@ #include #include #include -#include "container_debug_tests.hpp" +#include "container_debug_tests.h" #include "test_macros.h" #include "debug_mode_helper.h" Index: libcxx/test/libcxx/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_piecewise_pair.pass.cpp =================================================================== --- libcxx/test/libcxx/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_piecewise_pair.pass.cpp +++ libcxx/test/libcxx/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_piecewise_pair.pass.cpp @@ -45,7 +45,7 @@ #include #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/libcxx/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/db_deallocate.pass.cpp =================================================================== --- libcxx/test/libcxx/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/db_deallocate.pass.cpp +++ libcxx/test/libcxx/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/db_deallocate.pass.cpp @@ -22,7 +22,7 @@ #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/libcxx/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/db_deallocate.pass.cpp =================================================================== --- libcxx/test/libcxx/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/db_deallocate.pass.cpp +++ libcxx/test/libcxx/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/db_deallocate.pass.cpp @@ -22,7 +22,7 @@ #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/libcxx/input.output/filesystems/class.directory_entry/directory_entry.mods/last_write_time.sh.cpp =================================================================== --- libcxx/test/libcxx/input.output/filesystems/class.directory_entry/directory_entry.mods/last_write_time.sh.cpp +++ libcxx/test/libcxx/input.output/filesystems/class.directory_entry/directory_entry.mods/last_write_time.sh.cpp @@ -15,13 +15,13 @@ // RUN: %build -I%libcxx_src_root/src/filesystem // RUN: %run -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" #include "filesystem_common.h" Index: libcxx/test/libcxx/input.output/filesystems/class.path/path.itr/iterator_db.pass.cpp =================================================================== --- libcxx/test/libcxx/input.output/filesystems/class.path/path.itr/iterator_db.pass.cpp +++ libcxx/test/libcxx/input.output/filesystems/class.path/path.itr/iterator_db.pass.cpp @@ -16,13 +16,13 @@ // class path #define _LIBCPP_DEBUG 0 -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "filesystem_test_helper.hpp" +#include "filesystem_test_helper.h" #include "debug_mode_helper.h" int main(int, char**) { Index: libcxx/test/libcxx/input.output/filesystems/class.path/path.itr/reverse_iterator_produces_diagnostic.fail.cpp =================================================================== --- libcxx/test/libcxx/input.output/filesystems/class.path/path.itr/reverse_iterator_produces_diagnostic.fail.cpp +++ libcxx/test/libcxx/input.output/filesystems/class.path/path.itr/reverse_iterator_produces_diagnostic.fail.cpp @@ -12,7 +12,7 @@ // class path -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include Index: libcxx/test/libcxx/input.output/filesystems/class.path/path.req/is_pathable.pass.cpp =================================================================== --- libcxx/test/libcxx/input.output/filesystems/class.path/path.req/is_pathable.pass.cpp +++ libcxx/test/libcxx/input.output/filesystems/class.path/path.req/is_pathable.pass.cpp @@ -20,14 +20,14 @@ // * A character array, which points to a NTCTS after array-to-pointer decay. -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" #include "test_iterators.h" #include "min_allocator.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" using fs::__is_pathable; Index: libcxx/test/libcxx/type_traits/convert_to_integral.pass.cpp =================================================================== --- libcxx/test/libcxx/type_traits/convert_to_integral.pass.cpp +++ libcxx/test/libcxx/type_traits/convert_to_integral.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "user_defined_integral.hpp" +#include "user_defined_integral.h" #include "test_macros.h" Index: libcxx/test/libcxx/utilities/optional/optional.object/triviality.abi.pass.cpp =================================================================== --- libcxx/test/libcxx/utilities/optional/optional.object/triviality.abi.pass.cpp +++ libcxx/test/libcxx/utilities/optional/optional.object/triviality.abi.pass.cpp @@ -24,7 +24,7 @@ #include #include -#include "archetypes.hpp" +#include "archetypes.h" #include "test_macros.h" Index: libcxx/test/libcxx/utilities/tuple/tuple.tuple/tuple.cnstr/disable_reduced_arity_initialization_extension.pass.cpp =================================================================== --- libcxx/test/libcxx/utilities/tuple/tuple.tuple/tuple.cnstr/disable_reduced_arity_initialization_extension.pass.cpp +++ libcxx/test/libcxx/utilities/tuple/tuple.tuple/tuple.cnstr/disable_reduced_arity_initialization_extension.pass.cpp @@ -22,7 +22,7 @@ #include #include "test_macros.h" -#include "test_convertible.hpp" +#include "test_convertible.h" #include "MoveOnly.h" #if defined(_LIBCPP_ENABLE_TUPLE_IMPLICIT_REDUCED_ARITY_EXTENSION) Index: libcxx/test/libcxx/utilities/tuple/tuple.tuple/tuple.cnstr/enable_reduced_arity_initialization_extension.pass.cpp =================================================================== --- libcxx/test/libcxx/utilities/tuple/tuple.tuple/tuple.cnstr/enable_reduced_arity_initialization_extension.pass.cpp +++ libcxx/test/libcxx/utilities/tuple/tuple.tuple/tuple.cnstr/enable_reduced_arity_initialization_extension.pass.cpp @@ -24,7 +24,7 @@ #include #include "test_macros.h" -#include "test_convertible.hpp" +#include "test_convertible.h" #include "MoveOnly.h" Index: libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/assign_tuple_like.pass.cpp =================================================================== --- libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/assign_tuple_like.pass.cpp +++ libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/assign_tuple_like.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "archetypes.hpp" +#include "archetypes.h" #include "test_macros.h" Index: libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp =================================================================== --- libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp +++ libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/piecewise.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "archetypes.hpp" +#include "archetypes.h" #include "test_macros.h" Index: libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp =================================================================== --- libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp +++ libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "test_iterators.h" -#include "user_defined_integral.hpp" +#include "user_defined_integral.h" // #if TEST_STD_VER > 17 // TEST_CONSTEXPR bool test_constexpr() { Index: libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp =================================================================== --- libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp +++ libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp @@ -17,7 +17,7 @@ #include "test_macros.h" #include "test_iterators.h" -#include "user_defined_integral.hpp" +#include "user_defined_integral.h" // #if TEST_STD_VER > 17 // TEST_CONSTEXPR bool test_constexpr() { Index: libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp =================================================================== --- libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp +++ libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "test_iterators.h" -#include "user_defined_integral.hpp" +#include "user_defined_integral.h" #if TEST_STD_VER > 17 TEST_CONSTEXPR bool test_constexpr() { Index: libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp =================================================================== --- libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp +++ libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp @@ -24,7 +24,7 @@ #include #include "test_iterators.h" -#include "user_defined_integral.hpp" +#include "user_defined_integral.h" struct gen_test { Index: libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp =================================================================== --- libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp +++ libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp @@ -19,7 +19,7 @@ #include "test_macros.h" #include "test_iterators.h" -#include "counting_predicates.hpp" +#include "counting_predicates.h" struct is_odd { TEST_CONSTEXPR bool operator()(const int &i) const { return i & 1; } Index: libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp =================================================================== --- libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp +++ libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp @@ -21,7 +21,7 @@ #include "test_macros.h" #include "test_iterators.h" -#include "counting_predicates.hpp" +#include "counting_predicates.h" TEST_CONSTEXPR bool equal2 ( int i ) { return i == 2; } Index: libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n.pass.cpp =================================================================== --- libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n.pass.cpp +++ libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "test_iterators.h" -#include "user_defined_integral.hpp" +#include "user_defined_integral.h" #if TEST_STD_VER > 17 TEST_CONSTEXPR bool test_constexpr() { Index: libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp =================================================================== --- libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp +++ libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "test_iterators.h" -#include "user_defined_integral.hpp" +#include "user_defined_integral.h" #if TEST_STD_VER > 17 TEST_CONSTEXPR bool eq(int a, int b) { return a == b; } Index: libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp =================================================================== --- libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp +++ libcxx/test/std/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp @@ -24,7 +24,7 @@ #include "test_macros.h" #include "test_iterators.h" -#include "counting_predicates.hpp" +#include "counting_predicates.h" #if TEST_STD_VER > 17 TEST_CONSTEXPR bool eq(int a, int b) { return a == b; } Index: libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp =================================================================== --- libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp +++ libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp @@ -20,7 +20,7 @@ #include #include "test_macros.h" -#include "counting_predicates.hpp" +#include "counting_predicates.h" struct indirect_less { Index: libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp =================================================================== --- libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp +++ libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp @@ -56,7 +56,7 @@ #endif // TEST_STD_VER >= 11 #include "test_iterators.h" -#include "counting_predicates.hpp" +#include "counting_predicates.h" std::mt19937 randomness; Index: libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp =================================================================== --- libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp +++ libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp @@ -26,7 +26,7 @@ #include "test_macros.h" #include "test_iterators.h" -#include "counting_predicates.hpp" +#include "counting_predicates.h" // #if TEST_STD_VER > 17 // TEST_CONSTEXPR bool test_constexpr() { Index: libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_init_list_comp.pass.cpp =================================================================== --- libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_init_list_comp.pass.cpp +++ libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_init_list_comp.pass.cpp @@ -21,7 +21,7 @@ #include #include "test_macros.h" -#include "counting_predicates.hpp" +#include "counting_predicates.h" bool all_equal(int, int) { return false; } // everything is equal Index: libcxx/test/std/containers/associative/map/map.access/index_key.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/map/map.access/index_key.pass.cpp +++ libcxx/test/std/containers/associative/map/map.access/index_key.pass.cpp @@ -16,9 +16,9 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #if TEST_STD_VER >= 11 #include "container_test_types.h" #endif Index: libcxx/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp +++ libcxx/test/std/containers/associative/map/map.access/index_rv_key.pass.cpp @@ -18,7 +18,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" #include "MoveOnly.h" #include "min_allocator.h" #include "container_test_types.h" Index: libcxx/test/std/containers/associative/map/map.ops/count.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/map/map.ops/count.pass.cpp +++ libcxx/test/std/containers/associative/map/map.ops/count.pass.cpp @@ -17,7 +17,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "is_transparent.h" int main(int, char**) Index: libcxx/test/std/containers/associative/map/map.ops/count_transparent.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/map/map.ops/count_transparent.pass.cpp +++ libcxx/test/std/containers/associative/map/map.ops/count_transparent.pass.cpp @@ -20,7 +20,7 @@ #include #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "test_macros.h" struct Comp { Index: libcxx/test/std/containers/associative/map/map.ops/equal_range.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/map/map.ops/equal_range.pass.cpp +++ libcxx/test/std/containers/associative/map/map.ops/equal_range.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "is_transparent.h" int main(int, char**) Index: libcxx/test/std/containers/associative/map/map.ops/equal_range_transparent.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/map/map.ops/equal_range_transparent.pass.cpp +++ libcxx/test/std/containers/associative/map/map.ops/equal_range_transparent.pass.cpp @@ -23,7 +23,7 @@ #include #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "test_macros.h" struct Comp { Index: libcxx/test/std/containers/associative/map/map.ops/find.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/map/map.ops/find.pass.cpp +++ libcxx/test/std/containers/associative/map/map.ops/find.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "is_transparent.h" int main(int, char**) Index: libcxx/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp +++ libcxx/test/std/containers/associative/map/map.ops/lower_bound.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "is_transparent.h" int main(int, char**) Index: libcxx/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp +++ libcxx/test/std/containers/associative/map/map.ops/upper_bound.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" int main(int, char**) { Index: libcxx/test/std/containers/associative/multimap/multimap.ops/count.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/multimap/multimap.ops/count.pass.cpp +++ libcxx/test/std/containers/associative/multimap/multimap.ops/count.pass.cpp @@ -17,7 +17,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "is_transparent.h" int main(int, char**) Index: libcxx/test/std/containers/associative/multimap/multimap.ops/count_transparent.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/multimap/multimap.ops/count_transparent.pass.cpp +++ libcxx/test/std/containers/associative/multimap/multimap.ops/count_transparent.pass.cpp @@ -20,7 +20,7 @@ #include #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "test_macros.h" struct Comp { Index: libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp +++ libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "is_transparent.h" int main(int, char**) Index: libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range_transparent.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range_transparent.pass.cpp +++ libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range_transparent.pass.cpp @@ -23,7 +23,7 @@ #include #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "test_macros.h" struct Comp { Index: libcxx/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp +++ libcxx/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "is_transparent.h" int main(int, char**) Index: libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp +++ libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "is_transparent.h" int main(int, char**) Index: libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp +++ libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "is_transparent.h" int main(int, char**) Index: libcxx/test/std/containers/associative/multiset/count.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/multiset/count.pass.cpp +++ libcxx/test/std/containers/associative/multiset/count.pass.cpp @@ -17,7 +17,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" int main(int, char**) { Index: libcxx/test/std/containers/associative/multiset/count_transparent.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/multiset/count_transparent.pass.cpp +++ libcxx/test/std/containers/associative/multiset/count_transparent.pass.cpp @@ -22,7 +22,7 @@ #include #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "test_macros.h" struct Comp { Index: libcxx/test/std/containers/associative/multiset/equal_range.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/multiset/equal_range.pass.cpp +++ libcxx/test/std/containers/associative/multiset/equal_range.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" int main(int, char**) { Index: libcxx/test/std/containers/associative/multiset/equal_range_transparent.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/multiset/equal_range_transparent.pass.cpp +++ libcxx/test/std/containers/associative/multiset/equal_range_transparent.pass.cpp @@ -24,7 +24,7 @@ #include #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "test_macros.h" struct Comp { Index: libcxx/test/std/containers/associative/multiset/find.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/multiset/find.pass.cpp +++ libcxx/test/std/containers/associative/multiset/find.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" int main(int, char**) { Index: libcxx/test/std/containers/associative/multiset/lower_bound.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/multiset/lower_bound.pass.cpp +++ libcxx/test/std/containers/associative/multiset/lower_bound.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" int main(int, char**) { Index: libcxx/test/std/containers/associative/multiset/upper_bound.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/multiset/upper_bound.pass.cpp +++ libcxx/test/std/containers/associative/multiset/upper_bound.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" int main(int, char**) { Index: libcxx/test/std/containers/associative/set/count.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/set/count.pass.cpp +++ libcxx/test/std/containers/associative/set/count.pass.cpp @@ -17,7 +17,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" int main(int, char**) { Index: libcxx/test/std/containers/associative/set/count_transparent.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/set/count_transparent.pass.cpp +++ libcxx/test/std/containers/associative/set/count_transparent.pass.cpp @@ -22,7 +22,7 @@ #include #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "test_macros.h" struct Comp { Index: libcxx/test/std/containers/associative/set/equal_range.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/set/equal_range.pass.cpp +++ libcxx/test/std/containers/associative/set/equal_range.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" int main(int, char**) { Index: libcxx/test/std/containers/associative/set/equal_range_transparent.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/set/equal_range_transparent.pass.cpp +++ libcxx/test/std/containers/associative/set/equal_range_transparent.pass.cpp @@ -24,7 +24,7 @@ #include #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" #include "test_macros.h" struct Comp { Index: libcxx/test/std/containers/associative/set/find.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/set/find.pass.cpp +++ libcxx/test/std/containers/associative/set/find.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" int main(int, char**) { Index: libcxx/test/std/containers/associative/set/lower_bound.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/set/lower_bound.pass.cpp +++ libcxx/test/std/containers/associative/set/lower_bound.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" int main(int, char**) { Index: libcxx/test/std/containers/associative/set/upper_bound.pass.cpp =================================================================== --- libcxx/test/std/containers/associative/set/upper_bound.pass.cpp +++ libcxx/test/std/containers/associative/set/upper_bound.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "private_constructor.hpp" +#include "private_constructor.h" int main(int, char**) { Index: libcxx/test/std/containers/map_allocator_requirement_test_templates.h =================================================================== --- libcxx/test/std/containers/map_allocator_requirement_test_templates.h +++ libcxx/test/std/containers/map_allocator_requirement_test_templates.h @@ -23,7 +23,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" #include "container_test_types.h" #include "assert_checkpoint.h" Index: libcxx/test/std/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp =================================================================== --- libcxx/test/std/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp +++ libcxx/test/std/containers/sequences/forwardlist/forwardlist.ops/remove_if.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "counting_predicates.hpp" +#include "counting_predicates.h" template Index: libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp =================================================================== --- libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp +++ libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_iter_iter.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "test_iterators.h" #include "min_allocator.h" -#include "count_new.hpp" +#include "count_new.h" template void test() { Index: libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp =================================================================== --- libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp +++ libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_size_value.pass.cpp @@ -17,7 +17,7 @@ #include #include "min_allocator.h" -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" template Index: libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp =================================================================== --- libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp +++ libcxx/test/std/containers/sequences/list/list.modifiers/insert_iter_value.pass.cpp @@ -16,7 +16,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "count_new.hpp" +#include "count_new.h" template void test() Index: libcxx/test/std/containers/sequences/list/list.ops/remove_if.pass.cpp =================================================================== --- libcxx/test/std/containers/sequences/list/list.ops/remove_if.pass.cpp +++ libcxx/test/std/containers/sequences/list/list.ops/remove_if.pass.cpp @@ -17,7 +17,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "counting_predicates.hpp" +#include "counting_predicates.h" bool even(int i) { Index: libcxx/test/std/containers/sequences/vector.bool/enabled_hash.pass.cpp =================================================================== --- libcxx/test/std/containers/sequences/vector.bool/enabled_hash.pass.cpp +++ libcxx/test/std/containers/sequences/vector.bool/enabled_hash.pass.cpp @@ -15,7 +15,7 @@ #include -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "test_macros.h" #include "min_allocator.h" Index: libcxx/test/std/containers/set_allocator_requirement_test_templates.h =================================================================== --- libcxx/test/std/containers/set_allocator_requirement_test_templates.h +++ libcxx/test/std/containers/set_allocator_requirement_test_templates.h @@ -22,7 +22,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" #include "container_test_types.h" #include "assert_checkpoint.h" Index: libcxx/test/std/containers/unord/unord.map/unord.map.elem/index.pass.cpp =================================================================== --- libcxx/test/std/containers/unord/unord.map/unord.map.elem/index.pass.cpp +++ libcxx/test/std/containers/unord/unord.map/unord.map.elem/index.pass.cpp @@ -22,7 +22,7 @@ #include "test_macros.h" #include "MoveOnly.h" #include "min_allocator.h" -#include "count_new.hpp" +#include "count_new.h" #if TEST_STD_VER >= 11 #include "container_test_types.h" Index: libcxx/test/std/diagnostics/syserr/syserr.hash/enabled_hash.pass.cpp =================================================================== --- libcxx/test/std/diagnostics/syserr/syserr.hash/enabled_hash.pass.cpp +++ libcxx/test/std/diagnostics/syserr/syserr.hash/enabled_hash.pass.cpp @@ -15,7 +15,7 @@ #include -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/default.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/default.pass.cpp +++ libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/default.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/memory_resource_convert.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/memory_resource_convert.pass.cpp +++ libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.ctor/memory_resource_convert.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/equal.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/equal.pass.cpp +++ libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/equal.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/not_equal.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/not_equal.pass.cpp +++ libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.eq/not_equal.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/allocate.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/allocate.pass.cpp +++ libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/allocate.pass.cpp @@ -22,7 +22,7 @@ #include #include "test_macros.h" -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" namespace ex = std::experimental::pmr; Index: libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair.pass.cpp +++ libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair.pass.cpp @@ -21,7 +21,7 @@ #include #include #include -#include "uses_alloc_types.hpp" +#include "uses_alloc_types.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair_const_lvalue_pair.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair_const_lvalue_pair.pass.cpp +++ libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair_const_lvalue_pair.pass.cpp @@ -23,9 +23,9 @@ #include #include "test_macros.h" -#include "test_memory_resource.hpp" -#include "uses_alloc_types.hpp" -#include "controlled_allocators.hpp" +#include "test_memory_resource.h" +#include "uses_alloc_types.h" +#include "controlled_allocators.h" #include "test_allocator.h" namespace ex = std::experimental::pmr; Index: libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair_rvalue.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair_rvalue.pass.cpp +++ libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair_rvalue.pass.cpp @@ -23,9 +23,9 @@ #include #include "test_macros.h" -#include "test_memory_resource.hpp" -#include "uses_alloc_types.hpp" -#include "controlled_allocators.hpp" +#include "test_memory_resource.h" +#include "uses_alloc_types.h" +#include "controlled_allocators.h" #include "test_allocator.h" namespace ex = std::experimental::pmr; Index: libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair_values.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair_values.pass.cpp +++ libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_pair_values.pass.cpp @@ -23,9 +23,9 @@ #include #include "test_macros.h" -#include "test_memory_resource.hpp" -#include "uses_alloc_types.hpp" -#include "controlled_allocators.hpp" +#include "test_memory_resource.h" +#include "uses_alloc_types.h" +#include "controlled_allocators.h" #include "test_allocator.h" namespace ex = std::experimental::pmr; Index: libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_piecewise_pair.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_piecewise_pair.pass.cpp +++ libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_piecewise_pair.pass.cpp @@ -24,9 +24,9 @@ #include #include "test_macros.h" -#include "test_memory_resource.hpp" -#include "uses_alloc_types.hpp" -#include "controlled_allocators.hpp" +#include "test_memory_resource.h" +#include "uses_alloc_types.h" +#include "controlled_allocators.h" #include "test_allocator.h" namespace ex = std::experimental::pmr; Index: libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_types.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_types.pass.cpp +++ libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/construct_types.pass.cpp @@ -21,9 +21,9 @@ #include #include "test_macros.h" -#include "test_memory_resource.hpp" -#include "uses_alloc_types.hpp" -#include "controlled_allocators.hpp" +#include "test_memory_resource.h" +#include "uses_alloc_types.h" +#include "controlled_allocators.h" #include "test_allocator.h" namespace ex = std::experimental::pmr; Index: libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/deallocate.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/deallocate.pass.cpp +++ libcxx/test/std/experimental/memory/memory.polymorphic.allocator.class/memory.polymorphic.allocator.mem/deallocate.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_copy.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_copy.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_copy.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_move.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_move.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/alloc_move.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/default.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/default.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.ctor/default.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/do_allocate_and_deallocate.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/do_allocate_and_deallocate.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/do_allocate_and_deallocate.pass.cpp @@ -27,7 +27,7 @@ #include #include "test_macros.h" -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" namespace ex = std::experimental::pmr; Index: libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/do_is_equal.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/do_is_equal.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource.adaptor/memory.resource.adaptor.mem/do_is_equal.pass.cpp @@ -18,7 +18,7 @@ #include #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.resource.aliases/header_string_synop.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource.aliases/header_string_synop.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource.aliases/header_string_synop.pass.cpp @@ -28,7 +28,7 @@ #include #include -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.resource.global/default_resource.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource.global/default_resource.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource.global/default_resource.pass.cpp @@ -31,7 +31,7 @@ #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.resource.global/new_delete_resource.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource.global/new_delete_resource.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource.global/new_delete_resource.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.resource.global/null_memory_resource.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource.global/null_memory_resource.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource.global/null_memory_resource.pass.cpp @@ -18,7 +18,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" namespace ex = std::experimental::pmr; Index: libcxx/test/std/experimental/memory/memory.resource/memory.resource.eq/equal.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource/memory.resource.eq/equal.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource/memory.resource.eq/equal.pass.cpp @@ -17,7 +17,7 @@ #include #include "test_macros.h" -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" namespace ex = std::experimental::pmr; Index: libcxx/test/std/experimental/memory/memory.resource/memory.resource.eq/not_equal.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource/memory.resource.eq/not_equal.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource/memory.resource.eq/not_equal.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/allocate.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/allocate.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/allocate.pass.cpp @@ -27,7 +27,7 @@ #include #include "test_macros.h" -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" using std::experimental::pmr::memory_resource; Index: libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/deallocate.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/deallocate.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/deallocate.pass.cpp @@ -26,7 +26,7 @@ #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/dtor.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/dtor.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/dtor.pass.cpp @@ -22,7 +22,7 @@ #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/is_equal.pass.cpp =================================================================== --- libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/is_equal.pass.cpp +++ libcxx/test/std/experimental/memory/memory.resource/memory.resource.public/is_equal.pass.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "test_memory_resource.hpp" +#include "test_memory_resource.h" #include "test_macros.h" Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/copy.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/copy.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/copy.pass.cpp @@ -14,14 +14,14 @@ // directory_entry(const directory_entry&) = default; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" -#include "test_convertible.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" +#include "test_convertible.h" TEST_SUITE(directory_entry_path_ctor_suite) Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/copy_assign.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/copy_assign.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/copy_assign.pass.cpp @@ -17,13 +17,13 @@ // void assign(path const&); // void replace_filename(path const&); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" TEST_SUITE(directory_entry_ctor_suite) Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/default.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/default.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/default.pass.cpp @@ -14,7 +14,7 @@ // directory_entry() noexcept = default; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/default_const.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/default_const.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/default_const.pass.cpp @@ -15,7 +15,7 @@ // directory_entry() noexcept = default; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/move.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/move.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/move.pass.cpp @@ -14,14 +14,14 @@ // directory_entry(directory_entry&&) noexcept = default; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" -#include "test_convertible.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" +#include "test_convertible.h" TEST_SUITE(directory_entry_path_ctor_suite) Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/move_assign.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/move_assign.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/move_assign.pass.cpp @@ -17,13 +17,13 @@ // void assign(path const&); // void replace_filename(path const&); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" TEST_SUITE(directory_entry_ctor_suite) Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/path.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/path.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.cons/path.pass.cpp @@ -15,14 +15,14 @@ // explicit directory_entry(const path); // directory_entry(const path&, error_code& ec); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" -#include "test_convertible.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" +#include "test_convertible.h" TEST_SUITE(directory_entry_path_ctor_suite) Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/assign.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/assign.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/assign.pass.cpp @@ -17,13 +17,13 @@ // void assign(path const&); // void replace_filename(path const&); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" TEST_SUITE(directory_entry_mods_suite) Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/refresh.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/refresh.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/refresh.pass.cpp @@ -17,13 +17,13 @@ // void assign(path const&); // void replace_filename(path const&); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" TEST_SUITE(directory_entry_mods_suite) Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/replace_filename.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/replace_filename.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/replace_filename.pass.cpp @@ -17,13 +17,13 @@ // void assign(path const&); // void replace_filename(path const&); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" TEST_SUITE(directory_entry_mods_suite) Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/comparisons.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/comparisons.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/comparisons.pass.cpp @@ -20,7 +20,7 @@ // bool operator>=(directory_entry const&) const noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp @@ -15,12 +15,12 @@ // uintmax_t file_size() const; // uintmax_t file_size(error_code const&) const noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include -#include "filesystem_test_helper.hpp" -#include "rapid-cxx-test.hpp" +#include "filesystem_test_helper.h" +#include "rapid-cxx-test.h" #include Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_type_obs.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_type_obs.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_type_obs.pass.cpp @@ -15,12 +15,12 @@ // file_status status() const; // file_status status(error_code const&) const noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include -#include "filesystem_test_helper.hpp" -#include "rapid-cxx-test.hpp" +#include "filesystem_test_helper.h" +#include "rapid-cxx-test.h" #include "test_macros.h" Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp @@ -15,12 +15,12 @@ // uintmax_t hard_link_count() const; // uintmax_t hard_link_count(error_code const&) const noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include -#include "filesystem_test_helper.hpp" -#include "rapid-cxx-test.hpp" +#include "filesystem_test_helper.h" +#include "rapid-cxx-test.h" #include "test_macros.h" Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp @@ -15,12 +15,12 @@ // file_time_type last_write_time() const; // file_time_type last_write_time(error_code const&) const noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include -#include "filesystem_test_helper.hpp" -#include "rapid-cxx-test.hpp" +#include "filesystem_test_helper.h" +#include "rapid-cxx-test.h" #include "test_macros.h" Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/path.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/path.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/path.pass.cpp @@ -15,7 +15,7 @@ // const path& path() const noexcept; // operator const path&() const noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/status.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/status.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/status.pass.cpp @@ -15,12 +15,12 @@ // file_status status() const; // file_status status(error_code const&) const noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include -#include "filesystem_test_helper.hpp" -#include "rapid-cxx-test.hpp" +#include "filesystem_test_helper.h" +#include "rapid-cxx-test.h" #include "test_macros.h" Index: libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/symlink_status.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/symlink_status.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/symlink_status.pass.cpp @@ -15,12 +15,12 @@ // file_status symlink_status() const; // file_status symlink_status(error_code&) const noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include -#include "filesystem_test_helper.hpp" -#include "rapid-cxx-test.hpp" +#include "filesystem_test_helper.h" +#include "rapid-cxx-test.h" #include "test_macros.h" Index: libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/copy.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/copy.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/copy.pass.cpp @@ -14,14 +14,14 @@ // directory_iterator(directory_iterator const&); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/copy_assign.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/copy_assign.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/copy_assign.pass.cpp @@ -14,14 +14,14 @@ // directory_iterator& operator=(directory_iterator const&); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/ctor.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/ctor.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/ctor.pass.cpp @@ -17,14 +17,14 @@ // directory_iterator(const path& p, error_code& ec); // directory_iterator(const path& p, directory_options options, error_code& ec); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/default_ctor.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/default_ctor.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/default_ctor.pass.cpp @@ -15,7 +15,7 @@ // directory_iterator::directory_iterator() noexcept -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/increment.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/increment.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/increment.pass.cpp @@ -15,14 +15,14 @@ // directory_iterator& operator++(); // directory_iterator& increment(error_code& ec); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" #include using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/move.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/move.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/move.pass.cpp @@ -14,14 +14,14 @@ // directory_iterator(directory_iterator&&) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp @@ -14,14 +14,14 @@ // directory_iterator& operator=(directory_iterator const&); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" // The filesystem specification explicitly allows for self-move on // the directory iterators. Turn off this warning so we can test it. Index: libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.nonmembers/begin_end.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.nonmembers/begin_end.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_iterator/directory_iterator.nonmembers/begin_end.pass.cpp @@ -15,14 +15,14 @@ // directory_iterator begin(directory_iterator iter) noexcept; // directory_iterator end(directory_iterator iter) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" #include using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.directory_iterator/types.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.directory_iterator/types.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.directory_iterator/types.pass.cpp @@ -18,7 +18,7 @@ // typedef ... reference; // typedef ... iterator_category -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/class.file_status/file_status.cons.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.file_status/file_status.cons.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.file_status/file_status.cons.pass.cpp @@ -15,11 +15,11 @@ // explicit file_status() noexcept; // explicit file_status(file_type, perms prms = perms::unknown) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include -#include "test_convertible.hpp" +#include "test_convertible.h" #include "test_macros.h" Index: libcxx/test/std/input.output/filesystems/class.file_status/file_status.mods.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.file_status/file_status.mods.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.file_status/file_status.mods.pass.cpp @@ -15,7 +15,7 @@ // void type(file_type) noexcept; // void permissions(perms) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/class.file_status/file_status.obs.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.file_status/file_status.obs.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.file_status/file_status.obs.pass.cpp @@ -15,7 +15,7 @@ // file_type type() const noexcept; // perms permissions(p) const noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/class.filesystem_error/filesystem_error.members.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.filesystem_error/filesystem_error.members.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.filesystem_error/filesystem_error.members.pass.cpp @@ -20,7 +20,7 @@ // const path& path1() const noexcept; // const path& path2() const noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/class.path/path.itr/iterator.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.itr/iterator.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.itr/iterator.pass.cpp @@ -18,13 +18,13 @@ // path(InputIterator first, InputIterator last); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "filesystem_test_helper.hpp" +#include "filesystem_test_helper.h" Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp @@ -21,15 +21,15 @@ // path& append(InputIterator first, InputIterator last); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" #include "verbose_assert.h" Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/braced_init.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/braced_init.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/braced_init.pass.cpp @@ -14,12 +14,12 @@ // path& operator=(path const&); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" int main(int, char**) { Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/copy.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/copy.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/copy.pass.cpp @@ -14,7 +14,7 @@ // path& operator=(path const&); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/move.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/move.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/move.pass.cpp @@ -14,12 +14,12 @@ // path& operator=(path&&) noexcept -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" int main(int, char**) { Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp @@ -21,15 +21,15 @@ // path& assign(InputIterator first, InputIterator last); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" #include Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.compare.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.compare.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.compare.pass.cpp @@ -26,15 +26,15 @@ // size_t hash_value(path const&) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" #include "verbose_assert.h" struct PathCompareTest { Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp @@ -27,7 +27,7 @@ // path& concat(InputIterator first, InputIterator last); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include @@ -35,8 +35,8 @@ #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" struct ConcatOperatorTestcase { Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/copy.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/copy.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/copy.pass.cpp @@ -14,7 +14,7 @@ // path(path const&) -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/default.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/default.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/default.pass.cpp @@ -14,7 +14,7 @@ // path() noexcept -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/move.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/move.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/move.pass.cpp @@ -14,12 +14,12 @@ // path(path&&) noexcept -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" int main(int, char**) { Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/source.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/source.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/source.pass.cpp @@ -18,14 +18,14 @@ // path(InputIterator first, InputIterator last); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" #include "test_iterators.h" #include "min_allocator.h" -#include "filesystem_test_helper.hpp" +#include "filesystem_test_helper.h" template Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.decompose/empty.fail.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.decompose/empty.fail.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.decompose/empty.fail.cpp @@ -16,7 +16,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14, c++17 // UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8 -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include "test_macros.h" Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.decompose/path.decompose.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.decompose/path.decompose.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.decompose/path.decompose.pass.cpp @@ -43,15 +43,15 @@ // iterator end() const; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" #include "assert_checkpoint.h" #include "verbose_assert.h" Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.gen/lexically_normal.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.gen/lexically_normal.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.gen/lexically_normal.pass.cpp @@ -14,7 +14,7 @@ // path lexically_normal() const; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include @@ -22,8 +22,8 @@ #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" int main(int, char**) { Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.gen/lexically_relative_and_proximate.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.gen/lexically_relative_and_proximate.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.gen/lexically_relative_and_proximate.pass.cpp @@ -15,7 +15,7 @@ // path lexically_relative(const path& p) const; // path lexically_proximate(const path& p) const; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include @@ -23,8 +23,8 @@ #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" int main(int, char**) { Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp @@ -17,15 +17,15 @@ // basic_string // generic_string(const Allocator& a = Allocator()) const; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" +#include "count_new.h" #include "min_allocator.h" -#include "filesystem_test_helper.hpp" +#include "filesystem_test_helper.h" MultiStringType longString = MKSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/123456789/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/named_overloads.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/named_overloads.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/named_overloads.pass.cpp @@ -19,15 +19,15 @@ // std::u32string generic_u32string() const; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" +#include "count_new.h" #include "min_allocator.h" -#include "filesystem_test_helper.hpp" +#include "filesystem_test_helper.h" MultiStringType longString = MKSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/123456789/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/clear.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/clear.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/clear.pass.cpp @@ -14,14 +14,14 @@ // void clear() noexcept -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" int main(int, char**) { Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/make_preferred.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/make_preferred.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/make_preferred.pass.cpp @@ -14,14 +14,14 @@ // path& make_preferred() -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" struct MakePreferredTestcase { Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/remove_filename.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/remove_filename.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/remove_filename.pass.cpp @@ -14,14 +14,14 @@ // path& remove_filename() -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" #include "verbose_assert.h" struct RemoveFilenameTestcase { Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/replace_extension.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/replace_extension.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/replace_extension.pass.cpp @@ -14,14 +14,14 @@ // path& replace_extension(path const& p = path()) -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" struct ReplaceExtensionTestcase { Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/replace_filename.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/replace_filename.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/replace_filename.pass.cpp @@ -14,14 +14,14 @@ // path& replace_filename() -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" #include "assert_checkpoint.h" #include "verbose_assert.h" Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/swap.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/swap.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.modifiers/swap.pass.cpp @@ -14,14 +14,14 @@ // void swap(path& rhs) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" struct SwapTestcase { Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/c_str.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/c_str.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/c_str.pass.cpp @@ -15,12 +15,12 @@ // const value_type* c_str() const noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "filesystem_test_helper.hpp" +#include "filesystem_test_helper.h" int main(int, char**) Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/named_overloads.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/named_overloads.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/named_overloads.pass.cpp @@ -19,15 +19,15 @@ // std::u32string u32string() const; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" +#include "count_new.h" #include "min_allocator.h" -#include "filesystem_test_helper.hpp" +#include "filesystem_test_helper.h" MultiStringType longString = MKSTR("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/123456789/abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/native.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/native.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/native.pass.cpp @@ -14,12 +14,12 @@ // const string_type& native() const noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "filesystem_test_helper.hpp" +#include "filesystem_test_helper.h" int main(int, char**) Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/operator_string.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/operator_string.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/operator_string.pass.cpp @@ -15,12 +15,12 @@ // operator string_type() const; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "filesystem_test_helper.hpp" +#include "filesystem_test_helper.h" int main(int, char**) Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp @@ -17,15 +17,15 @@ // basic_string // string(const Allocator& a = Allocator()) const; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" +#include "count_new.h" #include "min_allocator.h" -#include "filesystem_test_helper.hpp" +#include "filesystem_test_helper.h" // the SSO is always triggered for strings of size 2. Index: libcxx/test/std/input.output/filesystems/class.path/path.nonmember/append_op.fail.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.nonmember/append_op.fail.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.nonmember/append_op.fail.cpp @@ -10,7 +10,7 @@ // -#include "filesystem_include.hpp" +#include "filesystem_include.h" using namespace fs; @@ -25,4 +25,4 @@ (void)(LHS / RHS); // expected-error {{invalid operands to binary expression}} return 0; -} \ No newline at end of file +} Index: libcxx/test/std/input.output/filesystems/class.path/path.nonmember/append_op.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.nonmember/append_op.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.nonmember/append_op.pass.cpp @@ -12,12 +12,12 @@ // path operator/(path const&, path const&); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "filesystem_test_helper.hpp" +#include "filesystem_test_helper.h" // This is mainly tested via the member append functions. int main(int, char**) Index: libcxx/test/std/input.output/filesystems/class.path/path.nonmember/comparison_ops.fail.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.nonmember/comparison_ops.fail.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.nonmember/comparison_ops.fail.cpp @@ -11,7 +11,7 @@ // -#include "filesystem_include.hpp" +#include "filesystem_include.h" using namespace fs; @@ -31,4 +31,4 @@ (void)(LHS >= RHS); // expected-error {{invalid operands to binary expression}} return 0; -} \ No newline at end of file +} Index: libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.factory.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.factory.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.factory.pass.cpp @@ -15,14 +15,14 @@ // template // path u8path(InputIter, InputIter); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" int main(int, char**) Index: libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.io.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.io.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.io.pass.cpp @@ -21,7 +21,7 @@ // operator>>(basic_istream& is, path& p) // -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include @@ -29,8 +29,8 @@ #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" MultiStringType InStr = MKSTR("abcdefg/\"hijklmnop\"/qrstuvwxyz/123456789"); MultiStringType OutStr = MKSTR("\"abcdefg/\\\"hijklmnop\\\"/qrstuvwxyz/123456789\""); Index: libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.io.unicode_bug.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.io.unicode_bug.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.io.unicode_bug.pass.cpp @@ -26,15 +26,15 @@ // passes. // XFAIL: * -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" MultiStringType InStr = MKSTR("abcdefg/\"hijklmnop\"/qrstuvwxyz/123456789"); MultiStringType OutStr = MKSTR("\"abcdefg/\\\"hijklmnop\\\"/qrstuvwxyz/123456789\""); Index: libcxx/test/std/input.output/filesystems/class.path/path.nonmember/swap.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.nonmember/swap.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.nonmember/swap.pass.cpp @@ -12,13 +12,13 @@ // void swap(path& lhs, path& rhs) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" // NOTE: this is tested in path.members/path.modifiers via the member swap. Index: libcxx/test/std/input.output/filesystems/class.path/synop.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/synop.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/synop.pass.cpp @@ -16,7 +16,7 @@ // typedef basic_string string_type; // static constexpr value_type preferred_separator = ...; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/copy.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/copy.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/copy.pass.cpp @@ -14,14 +14,14 @@ // recursive_recursive_directory_iterator(recursive_recursive_directory_iterator const&); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/copy_assign.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/copy_assign.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/copy_assign.pass.cpp @@ -14,14 +14,14 @@ // recursive_directory_iterator& operator=(recursive_directory_iterator const&); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/ctor.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/ctor.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/ctor.pass.cpp @@ -19,14 +19,14 @@ // recursive_directory_iterator(const path& p, directory_options options, error_code& ec); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/depth.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/depth.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/depth.pass.cpp @@ -14,14 +14,14 @@ // int depth() const -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/disable_recursion_pending.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/disable_recursion_pending.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/disable_recursion_pending.pass.cpp @@ -14,14 +14,14 @@ // void disable_recursion_pending(); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp @@ -15,14 +15,14 @@ // recursive_directory_iterator& operator++(); // recursive_directory_iterator& increment(error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/move.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/move.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/move.pass.cpp @@ -14,14 +14,14 @@ // recursive_directory_iterator(recursive_directory_iterator&&) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp @@ -14,14 +14,14 @@ // recursive_directory_iterator& operator=(recursive_directory_iterator const&); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" // The filesystem specification explicitly allows for self-move on // the directory iterators. Turn off this warning so we can test it. Index: libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/pop.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/pop.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/pop.pass.cpp @@ -15,13 +15,13 @@ // void pop(); // void pop(error_code& ec); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/recursion_pending.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/recursion_pending.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/recursion_pending.pass.cpp @@ -14,14 +14,14 @@ // bool recursion_pending() const; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.nonmembers/begin_end.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.nonmembers/begin_end.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.nonmembers/begin_end.pass.cpp @@ -15,14 +15,14 @@ // recursive_directory_iterator begin(recursive_directory_iterator iter) noexcept; // recursive_directory_iterator end(recursive_directory_iterator iter) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" #include using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.enum/enum.copy_options.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.enum/enum.copy_options.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.enum/enum.copy_options.pass.cpp @@ -12,7 +12,7 @@ // enum class copy_options; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/fs.enum/enum.directory_options.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.enum/enum.directory_options.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.enum/enum.directory_options.pass.cpp @@ -12,7 +12,7 @@ // enum class directory_options; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include Index: libcxx/test/std/input.output/filesystems/fs.enum/enum.file_type.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.enum/enum.file_type.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.enum/enum.file_type.pass.cpp @@ -12,7 +12,7 @@ // enum class file_type; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/fs.enum/enum.path.format.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.enum/enum.path.format.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.enum/enum.path.format.pass.cpp @@ -13,7 +13,7 @@ // class path; // enum class format; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/fs.enum/enum.perm_options.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.enum/enum.perm_options.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.enum/enum.perm_options.pass.cpp @@ -12,7 +12,7 @@ // enum class perm_options; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include Index: libcxx/test/std/input.output/filesystems/fs.enum/enum.perms.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.enum/enum.perms.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.enum/enum.perms.pass.cpp @@ -12,7 +12,7 @@ // enum class perms; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include Index: libcxx/test/std/input.output/filesystems/fs.filesystem.synopsis/file_time_type.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.filesystem.synopsis/file_time_type.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.filesystem.synopsis/file_time_type.pass.cpp @@ -12,7 +12,7 @@ // typedef TrivialClock file_time_type; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp @@ -13,13 +13,13 @@ // uintmax_t hard_link_count(const path& p); // uintmax_t hard_link_count(const path& p, std::error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.absolute/absolute.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.absolute/absolute.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.absolute/absolute.pass.cpp @@ -12,13 +12,13 @@ // path absolute(const path& p, const path& base=current_path()); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.canonical/canonical.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.canonical/canonical.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.canonical/canonical.pass.cpp @@ -13,13 +13,13 @@ // path canonical(const path& p); // path canonical(const path& p, error_code& ec); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy/copy.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy/copy.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy/copy.pass.cpp @@ -16,14 +16,14 @@ // void copy(const path& from, const path& to, copy_options options, // error_code& ec); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp @@ -16,14 +16,14 @@ // bool copy_file(const path& from, const path& to, copy_options options, // error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" #include Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file_large.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file_large.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file_large.pass.cpp @@ -17,14 +17,14 @@ // bool copy_file(const path& from, const path& to, copy_options options, // error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_symlink/copy_symlink.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_symlink/copy_symlink.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_symlink/copy_symlink.pass.cpp @@ -14,13 +14,13 @@ // void copy_symlink(const path& existing_symlink, const path& new_symlink, // error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directories/create_directories.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directories/create_directories.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directories/create_directories.pass.cpp @@ -13,13 +13,13 @@ // bool create_directories(const path& p); // bool create_directories(const path& p, error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory.pass.cpp @@ -15,13 +15,13 @@ // bool create_directory(const path& p, const path& attr); // bool create_directory(const path& p, const path& attr, error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" #include #include Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory_with_attributes.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory_with_attributes.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory_with_attributes.pass.cpp @@ -13,13 +13,13 @@ // bool create_directory(const path& p, const path& attr); // bool create_directory(const path& p, const path& attr, error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory_symlink/create_directory_symlink.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory_symlink/create_directory_symlink.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory_symlink/create_directory_symlink.pass.cpp @@ -14,12 +14,12 @@ // void create_directory_symlink(const path& existing_symlink, const path& new_symlink, // error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp @@ -14,11 +14,11 @@ // void create_hard_link(const path& existing_symlink, const path& new_symlink, // error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_symlink/create_symlink.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_symlink/create_symlink.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_symlink/create_symlink.pass.cpp @@ -14,12 +14,12 @@ // void create_symlink(const path& existing_symlink, const path& new_symlink, // error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.current_path/current_path.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.current_path/current_path.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.current_path/current_path.pass.cpp @@ -15,13 +15,13 @@ // void current_path(path const&); // void current_path(path const&, std::error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp @@ -13,13 +13,13 @@ // bool equivalent(path const& lhs, path const& rhs); // bool equivalent(path const& lhs, path const& rhs, std::error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.exists/exists.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.exists/exists.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.exists/exists.pass.cpp @@ -14,13 +14,13 @@ // bool exists(path const& p); // bool exists(path const& p, std::error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.file_size/file_size.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.file_size/file_size.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.file_size/file_size.pass.cpp @@ -13,13 +13,13 @@ // uintmax_t file_size(const path& p); // uintmax_t file_size(const path& p, std::error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_block_file/is_block_file.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_block_file/is_block_file.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_block_file/is_block_file.pass.cpp @@ -14,13 +14,13 @@ // bool is_block_file(path const& p); // bool is_block_file(path const& p, std::error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_char_file/is_character_file.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_char_file/is_character_file.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_char_file/is_character_file.pass.cpp @@ -14,13 +14,13 @@ // bool is_character_file(path const& p); // bool is_character_file(path const& p, std::error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_directory/is_directory.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_directory/is_directory.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_directory/is_directory.pass.cpp @@ -14,13 +14,13 @@ // bool is_directory(path const& p); // bool is_directory(path const& p, std::error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp @@ -13,13 +13,13 @@ // bool is_empty(path const& p); // bool is_empty(path const& p, std::error_code& ec); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_fifo/is_fifo.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_fifo/is_fifo.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_fifo/is_fifo.pass.cpp @@ -14,13 +14,13 @@ // bool is_fifo(path const& p); // bool is_fifo(path const& p, std::error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_other/is_other.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_other/is_other.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_other/is_other.pass.cpp @@ -14,13 +14,13 @@ // bool is_other(path const& p); // bool is_other(path const& p, std::error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_regular_file/is_regular_file.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_regular_file/is_regular_file.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_regular_file/is_regular_file.pass.cpp @@ -14,13 +14,13 @@ // bool is_regular_file(path const& p); // bool is_regular_file(path const& p, std::error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_socket/is_socket.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_socket/is_socket.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_socket/is_socket.pass.cpp @@ -14,13 +14,13 @@ // bool is_socket(path const& p); // bool is_socket(path const& p, std::error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_symlink/is_symlink.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_symlink/is_symlink.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_symlink/is_symlink.pass.cpp @@ -14,13 +14,13 @@ // bool is_symlink(path const& p); // bool is_symlink(path const& p, std::error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp @@ -16,15 +16,15 @@ // void last_write_time(const path& p, file_time_type new_type, // std::error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" #include #include Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp @@ -17,11 +17,11 @@ -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.proximate/proximate.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.proximate/proximate.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.proximate/proximate.pass.cpp @@ -14,7 +14,7 @@ // path proximate(const path& p, const path& base = current_path()) // path proximate(const path& p, const path& base, error_code& ec); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include @@ -22,9 +22,9 @@ #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" static int count_path_elems(const fs::path& p) { Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.read_symlink/read_symlink.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.read_symlink/read_symlink.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.read_symlink/read_symlink.pass.cpp @@ -13,11 +13,11 @@ // path read_symlink(const path& p); // path read_symlink(const path& p, error_code& ec); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.relative/relative.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.relative/relative.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.relative/relative.pass.cpp @@ -14,16 +14,16 @@ // path proximate(const path& p, const path& base = current_path()) // path proximate(const path& p, const path& base, error_code& ec); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" TEST_SUITE(filesystem_proximate_path_test_suite) Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove/remove.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove/remove.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove/remove.pass.cpp @@ -13,11 +13,11 @@ // bool remove(const path& p); // bool remove(const path& p, error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove_all/remove_all.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove_all/remove_all.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove_all/remove_all.pass.cpp @@ -13,11 +13,11 @@ // uintmax_t remove_all(const path& p); // uintmax_t remove_all(const path& p, error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.rename/rename.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.rename/rename.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.rename/rename.pass.cpp @@ -13,11 +13,11 @@ // void rename(const path& old_p, const path& new_p); // void rename(const path& old_p, const path& new_p, error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.resize_file/resize_file.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.resize_file/resize_file.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.resize_file/resize_file.pass.cpp @@ -13,11 +13,11 @@ // void resize_file(const path& p, uintmax_t new_size); // void resize_file(const path& p, uintmax_t new_size, error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.space/space.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.space/space.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.space/space.pass.cpp @@ -13,12 +13,12 @@ // space_info space(const path& p); // space_info space(const path& p, error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp @@ -13,11 +13,11 @@ // file_status status(const path& p); // file_status status(const path& p, error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status_known/status_known.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status_known/status_known.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status_known/status_known.pass.cpp @@ -12,13 +12,13 @@ // bool status_known(file_status s) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp @@ -13,11 +13,11 @@ // file_status symlink_status(const path& p); // file_status symlink_status(const path& p, error_code& ec) noexcept; -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.temp_dir_path/temp_directory_path.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.temp_dir_path/temp_directory_path.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.temp_dir_path/temp_directory_path.pass.cpp @@ -13,15 +13,15 @@ // path temp_directory_path(); // path temp_directory_path(error_code& ec); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "filesystem_test_helper.hpp" +#include "rapid-cxx-test.h" +#include "filesystem_test_helper.h" using namespace fs; Index: libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.weakly_canonical/weakly_canonical.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.weakly_canonical/weakly_canonical.pass.cpp +++ libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.weakly_canonical/weakly_canonical.pass.cpp @@ -13,7 +13,7 @@ // path weakly_canonical(const path& p); // path weakly_canonical(const path& p, error_code& ec); -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include #include #include @@ -21,8 +21,8 @@ #include "test_macros.h" #include "test_iterators.h" -#include "count_new.hpp" -#include "filesystem_test_helper.hpp" +#include "count_new.h" +#include "filesystem_test_helper.h" int main(int, char**) { Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/post.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/post.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/post.pass.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/pre.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/pre.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op++/pre.pass.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/test.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/test.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.op_astrk/test.pass.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/test.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/test.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.inserter/test.pass.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/post.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/post.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/post.pass.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/pre.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/pre.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op++/pre.pass.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/lv_value.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/lv_value.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op=/lv_value.pass.cpp @@ -16,7 +16,7 @@ #include #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/test.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/test.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.op_astrk/test.pass.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/test.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/test.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.inserter/test.pass.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/test.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/test.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.cons/test.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/post.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/post.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/post.pass.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/pre.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/pre.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op++/pre.pass.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/lv_value.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/lv_value.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op=/lv_value.pass.cpp @@ -17,7 +17,7 @@ #include #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/test.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/test.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/insert.iter.op_astrk/test.pass.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/test.pass.cpp =================================================================== --- libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/test.pass.cpp +++ libcxx/test/std/iterators/predef.iterators/insert.iterators/insert.iter.ops/inserter/test.pass.cpp @@ -15,7 +15,7 @@ #include #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/language.support/support.dynamic/destroying_delete_t_declaration.pass.cpp =================================================================== --- libcxx/test/std/language.support/support.dynamic/destroying_delete_t_declaration.pass.cpp +++ libcxx/test/std/language.support/support.dynamic/destroying_delete_t_declaration.pass.cpp @@ -24,7 +24,7 @@ #include #include "test_macros.h" -#include "test_convertible.hpp" +#include "test_convertible.h" #ifdef __cpp_impl_destroying_delete # ifndef __cpp_lib_destroying_delete Index: libcxx/test/std/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/dtor.pass.cpp =================================================================== --- libcxx/test/std/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/dtor.pass.cpp +++ libcxx/test/std/localization/locale.categories/category.ctype/facet.ctype.special/facet.ctype.char.dtor/dtor.pass.cpp @@ -15,7 +15,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" Index: libcxx/test/std/localization/locale.stdcvt/codecvt_utf16.pass.cpp =================================================================== --- libcxx/test/std/localization/locale.stdcvt/codecvt_utf16.pass.cpp +++ libcxx/test/std/localization/locale.stdcvt/codecvt_utf16.pass.cpp @@ -22,7 +22,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" Index: libcxx/test/std/localization/locale.stdcvt/codecvt_utf8.pass.cpp =================================================================== --- libcxx/test/std/localization/locale.stdcvt/codecvt_utf8.pass.cpp +++ libcxx/test/std/localization/locale.stdcvt/codecvt_utf8.pass.cpp @@ -22,7 +22,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" Index: libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp =================================================================== --- libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp +++ libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/ctor.pass.cpp @@ -19,7 +19,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" int main(int, char**) { Index: libcxx/test/std/localization/locales/locale/locale.cons/assign.pass.cpp =================================================================== --- libcxx/test/std/localization/locales/locale/locale.cons/assign.pass.cpp +++ libcxx/test/std/localization/locales/locale/locale.cons/assign.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" #include "platform_support.h" // locale name macros Index: libcxx/test/std/localization/locales/locale/locale.cons/char_pointer.pass.cpp =================================================================== --- libcxx/test/std/localization/locales/locale/locale.cons/char_pointer.pass.cpp +++ libcxx/test/std/localization/locales/locale/locale.cons/char_pointer.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "platform_support.h" // locale name macros #include "test_macros.h" Index: libcxx/test/std/localization/locales/locale/locale.cons/copy.pass.cpp =================================================================== --- libcxx/test/std/localization/locales/locale/locale.cons/copy.pass.cpp +++ libcxx/test/std/localization/locales/locale/locale.cons/copy.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" #include "platform_support.h" // locale name macros Index: libcxx/test/std/localization/locales/locale/locale.cons/default.pass.cpp =================================================================== --- libcxx/test/std/localization/locales/locale/locale.cons/default.pass.cpp +++ libcxx/test/std/localization/locales/locale/locale.cons/default.pass.cpp @@ -17,7 +17,7 @@ #include "test_macros.h" #include "platform_support.h" // locale name macros -#include "count_new.hpp" +#include "count_new.h" void check(const std::locale& loc) { Index: libcxx/test/std/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp =================================================================== --- libcxx/test/std/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp +++ libcxx/test/std/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" #include "platform_support.h" // locale name macros Index: libcxx/test/std/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp =================================================================== --- libcxx/test/std/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp +++ libcxx/test/std/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" #include "platform_support.h" // locale name macros Index: libcxx/test/std/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp =================================================================== --- libcxx/test/std/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp +++ libcxx/test/std/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" #include "platform_support.h" // locale name macros Index: libcxx/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp =================================================================== --- libcxx/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp +++ libcxx/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp @@ -21,7 +21,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" #include "platform_support.h" // locale name macros Index: libcxx/test/std/localization/locales/locale/locale.cons/string.pass.cpp =================================================================== --- libcxx/test/std/localization/locales/locale/locale.cons/string.pass.cpp +++ libcxx/test/std/localization/locales/locale/locale.cons/string.pass.cpp @@ -17,7 +17,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" #include "platform_support.h" // locale name macros Index: libcxx/test/std/localization/locales/locale/locale.members/combine.pass.cpp =================================================================== --- libcxx/test/std/localization/locales/locale/locale.members/combine.pass.cpp +++ libcxx/test/std/localization/locales/locale/locale.members/combine.pass.cpp @@ -14,7 +14,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" Index: libcxx/test/std/strings/basic.string.hash/enabled_hashes.pass.cpp =================================================================== --- libcxx/test/std/strings/basic.string.hash/enabled_hashes.pass.cpp +++ libcxx/test/std/strings/basic.string.hash/enabled_hashes.pass.cpp @@ -15,7 +15,7 @@ #include -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "test_macros.h" Index: libcxx/test/std/strings/basic.string/string.cons/implicit_deduction_guides.pass.cpp =================================================================== --- libcxx/test/std/strings/basic.string/string.cons/implicit_deduction_guides.pass.cpp +++ libcxx/test/std/strings/basic.string/string.cons/implicit_deduction_guides.pass.cpp @@ -21,7 +21,7 @@ #include "test_macros.h" #include "test_allocator.h" #include "test_iterators.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template > using BStr = std::basic_string, Alloc>; Index: libcxx/test/std/strings/string.view/string.view.hash/enabled_hashes.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.hash/enabled_hashes.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.hash/enabled_hashes.pass.cpp @@ -15,7 +15,7 @@ #include -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "test_macros.h" Index: libcxx/test/std/strings/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp @@ -17,7 +17,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp @@ -17,7 +17,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp @@ -17,7 +17,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp @@ -17,7 +17,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp @@ -17,7 +17,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp @@ -17,7 +17,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.cons/from_literal.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.cons/from_literal.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.cons/from_literal.pass.cpp @@ -18,7 +18,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template size_t StrLen ( const CharT *s ) { Index: libcxx/test/std/strings/string.view/string.view.cons/implicit_deduction_guides.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.cons/implicit_deduction_guides.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.cons/implicit_deduction_guides.pass.cpp @@ -18,7 +18,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" // Overloads // --------------- Index: libcxx/test/std/strings/string.view/string.view.find/find_char_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_char_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_char_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_first_not_of_char_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_first_not_of_char_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_first_not_of_char_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_first_of_char_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_first_of_char_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_first_of_char_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_first_of_pointer_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_first_of_pointer_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_first_of_pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_last_not_of_char_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_last_not_of_char_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_last_not_of_char_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_last_of_char_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_last_of_char_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_last_of_char_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_last_of_pointer_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_last_of_pointer_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_last_of_pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_pointer_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_pointer_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_pointer_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_pointer_size_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_pointer_size_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_pointer_size_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/find_string_view_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/find_string_view_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/find_string_view_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/rfind_char_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/rfind_char_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/rfind_char_size.pass.cpp @@ -13,7 +13,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/rfind_pointer_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/rfind_pointer_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/rfind_pointer_size.pass.cpp @@ -13,7 +13,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/rfind_pointer_size_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/rfind_pointer_size_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/rfind_pointer_size_size.pass.cpp @@ -13,7 +13,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.find/rfind_string_view_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.find/rfind_string_view_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.find/rfind_string_view_size.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" template void Index: libcxx/test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.ops/compare.pointer.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); } Index: libcxx/test/std/strings/string.view/string.view.ops/compare.pointer_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.ops/compare.pointer_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.ops/compare.pointer_size.pass.cpp @@ -15,7 +15,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); } Index: libcxx/test/std/strings/string.view/string.view.ops/compare.size_size_sv.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.ops/compare.size_size_sv.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.ops/compare.size_size_sv.pass.cpp @@ -15,7 +15,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); } Index: libcxx/test/std/strings/string.view/string.view.ops/compare.size_size_sv_pointer_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.ops/compare.size_size_sv_pointer_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.ops/compare.size_size_sv_pointer_size.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); } Index: libcxx/test/std/strings/string.view/string.view.ops/compare.size_size_sv_size_size.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.ops/compare.size_size_sv_size_size.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.ops/compare.size_size_sv_size_size.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); } Index: libcxx/test/std/strings/string.view/string.view.ops/compare.sv.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.ops/compare.sv.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.ops/compare.sv.pass.cpp @@ -14,7 +14,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); } Index: libcxx/test/std/strings/string.view/string.view.template/ends_with.char.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.template/ends_with.char.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.template/ends_with.char.pass.cpp @@ -15,7 +15,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" int main(int, char**) { Index: libcxx/test/std/strings/string.view/string.view.template/ends_with.ptr.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.template/ends_with.ptr.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.template/ends_with.ptr.pass.cpp @@ -15,7 +15,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" int main(int, char**) { Index: libcxx/test/std/strings/string.view/string.view.template/ends_with.string_view.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.template/ends_with.string_view.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.template/ends_with.string_view.pass.cpp @@ -15,7 +15,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" int main(int, char**) { Index: libcxx/test/std/strings/string.view/string.view.template/starts_with.char.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.template/starts_with.char.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.template/starts_with.char.pass.cpp @@ -15,7 +15,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" int main(int, char**) { Index: libcxx/test/std/strings/string.view/string.view.template/starts_with.ptr.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.template/starts_with.ptr.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.template/starts_with.ptr.pass.cpp @@ -15,7 +15,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" int main(int, char**) { Index: libcxx/test/std/strings/string.view/string.view.template/starts_with.string_view.pass.cpp =================================================================== --- libcxx/test/std/strings/string.view/string.view.template/starts_with.string_view.pass.cpp +++ libcxx/test/std/strings/string.view/string.view.template/starts_with.string_view.pass.cpp @@ -15,7 +15,7 @@ #include #include "test_macros.h" -#include "constexpr_char_traits.hpp" +#include "constexpr_char_traits.h" int main(int, char**) { Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_assign.pass.cpp =================================================================== --- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_assign.pass.cpp +++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_assign.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_ctor.pass.cpp =================================================================== --- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_ctor.pass.cpp +++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_ctor.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp =================================================================== --- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp +++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_defer_lock.pass.cpp =================================================================== --- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_defer_lock.pass.cpp +++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_defer_lock.pass.cpp @@ -18,7 +18,7 @@ #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp =================================================================== --- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp +++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_assign.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp =================================================================== --- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp +++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/move_ctor.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_adopt_lock.pass.cpp =================================================================== --- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_adopt_lock.pass.cpp +++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_adopt_lock.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_defer_lock.pass.cpp =================================================================== --- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_defer_lock.pass.cpp +++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/mutex_defer_lock.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "nasty_containers.hpp" +#include "nasty_containers.h" #include "test_macros.h" Index: libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.id/enabled_hashes.pass.cpp =================================================================== --- libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.id/enabled_hashes.pass.cpp +++ libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.id/enabled_hashes.pass.cpp @@ -16,7 +16,7 @@ #include -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "test_macros.h" Index: libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp =================================================================== --- libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp +++ libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair.pass.cpp @@ -22,8 +22,8 @@ #include #include #include -#include "uses_alloc_types.hpp" -#include "controlled_allocators.hpp" +#include "uses_alloc_types.h" +#include "controlled_allocators.h" #include "test_macros.h" Index: libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp =================================================================== --- libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp +++ libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_const_lvalue_pair.pass.cpp @@ -22,8 +22,8 @@ #include #include #include -#include "uses_alloc_types.hpp" -#include "controlled_allocators.hpp" +#include "uses_alloc_types.h" +#include "controlled_allocators.h" #include "test_macros.h" Index: libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp =================================================================== --- libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp +++ libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_piecewise.pass.cpp @@ -23,8 +23,8 @@ #include #include #include -#include "uses_alloc_types.hpp" -#include "controlled_allocators.hpp" +#include "uses_alloc_types.h" +#include "controlled_allocators.h" #include "test_macros.h" Index: libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp =================================================================== --- libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp +++ libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_rvalue.pass.cpp @@ -22,8 +22,8 @@ #include #include #include -#include "uses_alloc_types.hpp" -#include "controlled_allocators.hpp" +#include "uses_alloc_types.h" +#include "controlled_allocators.h" #include "test_macros.h" Index: libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp =================================================================== --- libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp +++ libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_pair_values.pass.cpp @@ -22,8 +22,8 @@ #include #include #include -#include "uses_alloc_types.hpp" -#include "controlled_allocators.hpp" +#include "uses_alloc_types.h" +#include "controlled_allocators.h" #include "test_macros.h" Index: libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp =================================================================== --- libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp +++ libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp @@ -22,8 +22,8 @@ #include #include #include -#include "uses_alloc_types.hpp" -#include "controlled_allocators.hpp" +#include "uses_alloc_types.h" +#include "controlled_allocators.h" #include "test_macros.h" Index: libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp =================================================================== --- libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp +++ libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp @@ -20,7 +20,7 @@ #include #include "any_helpers.h" -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" using std::any; Index: libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp =================================================================== --- libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp +++ libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp @@ -21,7 +21,7 @@ #include #include "any_helpers.h" -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" using std::any; Index: libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp =================================================================== --- libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp +++ libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp @@ -18,7 +18,7 @@ #include #include "any_helpers.h" -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" using std::any; Index: libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp =================================================================== --- libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp +++ libcxx/test/std/utilities/any/any.class/any.cons/default.pass.cpp @@ -18,7 +18,7 @@ #include "test_macros.h" #include "any_helpers.h" -#include "count_new.hpp" +#include "count_new.h" int main(int, char**) { Index: libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp =================================================================== --- libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp +++ libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp @@ -27,9 +27,9 @@ #include #include "any_helpers.h" -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" -#include "test_convertible.hpp" +#include "test_convertible.h" using std::any; using std::any_cast; Index: libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp =================================================================== --- libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp +++ libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp @@ -20,7 +20,7 @@ #include #include "any_helpers.h" -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" using std::any; Index: libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp =================================================================== --- libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp +++ libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp @@ -25,7 +25,7 @@ #include #include "any_helpers.h" -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" using std::any; Index: libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp =================================================================== --- libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp +++ libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp @@ -20,7 +20,7 @@ #include #include "any_helpers.h" -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" using std::any; Index: libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp =================================================================== --- libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp +++ libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp @@ -26,7 +26,7 @@ #include #include "any_helpers.h" -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" using std::any; Index: libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp =================================================================== --- libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp +++ libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp @@ -20,7 +20,7 @@ #include #include "any_helpers.h" -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" using std::any; Index: libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp =================================================================== --- libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp +++ libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.alg/swap.pass.cpp @@ -19,7 +19,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" class A { Index: libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp =================================================================== --- libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp +++ libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" class A { Index: libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp =================================================================== --- libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp +++ libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/F_assign.pass.cpp @@ -19,7 +19,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" class A { Index: libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp =================================================================== --- libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp +++ libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp @@ -19,7 +19,7 @@ #include "test_macros.h" #include "min_allocator.h" #include "test_allocator.h" -#include "count_new.hpp" +#include "count_new.h" #include "../function_types.h" Index: libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp =================================================================== --- libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp +++ libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp @@ -20,7 +20,7 @@ #include "test_macros.h" #include "min_allocator.h" #include "test_allocator.h" -#include "count_new.hpp" +#include "count_new.h" #include "../function_types.h" class DummyClass {}; Index: libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp =================================================================== --- libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp +++ libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.pass.cpp @@ -23,7 +23,7 @@ #include "test_macros.h" #include "min_allocator.h" -#include "count_new.hpp" +#include "count_new.h" class A { Index: libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp =================================================================== --- libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp +++ libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" class A { int data_[10]; Index: libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp =================================================================== --- libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp +++ libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_move.pass.cpp @@ -19,7 +19,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" class A { Index: libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp =================================================================== --- libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp +++ libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/nullptr_t_assign.pass.cpp @@ -15,7 +15,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" Index: libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp =================================================================== --- libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp +++ libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp @@ -15,7 +15,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" Index: libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp =================================================================== --- libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp +++ libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp @@ -15,7 +15,7 @@ #include #include -#include "counting_predicates.hpp" +#include "counting_predicates.h" #include "test_macros.h" Index: libcxx/test/std/utilities/function.objects/unord.hash/enabled_hashes.pass.cpp =================================================================== --- libcxx/test/std/utilities/function.objects/unord.hash/enabled_hashes.pass.cpp +++ libcxx/test/std/utilities/function.objects/unord.hash/enabled_hashes.pass.cpp @@ -15,7 +15,7 @@ #include -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "test_macros.h" Index: libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp =================================================================== --- libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp +++ libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.pass.cpp @@ -16,7 +16,7 @@ #include // for std::max_align_t #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" #ifdef TEST_HAS_NO_ALIGNED_ALLOCATION Index: libcxx/test/std/utilities/memory/default.allocator/allocator.members/construct.pass.cpp =================================================================== --- libcxx/test/std/utilities/memory/default.allocator/allocator.members/construct.pass.cpp +++ libcxx/test/std/utilities/memory/default.allocator/allocator.members/construct.pass.cpp @@ -15,7 +15,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" int A_constructed = 0; Index: libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp =================================================================== --- libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp +++ libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/enabled_hash.pass.cpp @@ -15,7 +15,7 @@ #include -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "test_macros.h" Index: libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp =================================================================== --- libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp +++ libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_shared_ptr.pass.cpp @@ -20,7 +20,7 @@ #include #if TEST_STD_VER >= 11 -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "test_macros.h" Index: libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp =================================================================== --- libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp +++ libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.hash/hash_unique_ptr.pass.cpp @@ -22,7 +22,7 @@ #include "test_macros.h" #if TEST_STD_VER >= 11 -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "deleter_types.h" #include "min_allocator.h" Index: libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp =================================================================== --- libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp +++ libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.enab/enable_shared_from_this.pass.cpp @@ -25,7 +25,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" struct T : public std::enable_shared_from_this Index: libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp =================================================================== --- libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp +++ libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp @@ -19,7 +19,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" struct B { Index: libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp =================================================================== --- libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp +++ libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp @@ -21,7 +21,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" #include "deleter_types.h" Index: libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp =================================================================== --- libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp +++ libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" #include "deleter_types.h" Index: libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp =================================================================== --- libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp +++ libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "count_new.hpp" +#include "count_new.h" #include "test_macros.h" Index: libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp =================================================================== --- libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp +++ libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp @@ -18,7 +18,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" struct B { Index: libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp =================================================================== --- libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp +++ libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "count_new.hpp" +#include "count_new.h" #if TEST_STD_VER >= 11 #define DELETE_FUNCTION = delete Index: libcxx/test/std/utilities/optional/optional.hash/enabled_hash.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.hash/enabled_hash.pass.cpp +++ libcxx/test/std/utilities/optional/optional.hash/enabled_hash.pass.cpp @@ -15,7 +15,7 @@ #include -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "test_macros.h" Index: libcxx/test/std/utilities/optional/optional.hash/hash.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.hash/hash.pass.cpp +++ libcxx/test/std/utilities/optional/optional.hash/hash.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "test_macros.h" Index: libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp @@ -17,7 +17,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; Index: libcxx/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.assign/const_optional_U.pass.cpp @@ -18,7 +18,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; Index: libcxx/test/std/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; Index: libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace.pass.cpp @@ -17,7 +17,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; Index: libcxx/test/std/utilities/optional/optional.object/optional.object.assign/move.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.assign/move.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.assign/move.pass.cpp @@ -19,7 +19,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; Index: libcxx/test/std/utilities/optional/optional.object/optional.object.assign/nullopt_t.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.assign/nullopt_t.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.assign/nullopt_t.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; using std::nullopt_t; Index: libcxx/test/std/utilities/optional/optional.object/optional.object.assign/optional_U.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.assign/optional_U.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.assign/optional_U.pass.cpp @@ -19,7 +19,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; Index: libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp @@ -20,8 +20,8 @@ #include #include "test_macros.h" -#include "archetypes.hpp" -#include "test_convertible.hpp" +#include "archetypes.h" +#include "test_convertible.h" using std::optional; Index: libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp @@ -19,7 +19,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; Index: libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; Index: libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/default.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/default.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/default.pass.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; Index: libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/empty_in_place_t_does_not_clobber.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/empty_in_place_t_does_not_clobber.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/empty_in_place_t_does_not_clobber.pass.cpp @@ -20,7 +20,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; Index: libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp @@ -19,7 +19,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; Index: libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/nullopt_t.pass.cpp @@ -15,7 +15,7 @@ #include #include -#include "archetypes.hpp" +#include "archetypes.h" #include "test_macros.h" Index: libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp @@ -19,7 +19,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; Index: libcxx/test/std/utilities/optional/optional.object/optional.object.swap/swap.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/optional.object.swap/swap.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/optional.object.swap/swap.pass.cpp @@ -18,7 +18,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; Index: libcxx/test/std/utilities/optional/optional.object/special_members.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/special_members.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/special_members.pass.cpp @@ -16,7 +16,7 @@ #include #include -#include "archetypes.hpp" +#include "archetypes.h" #include "test_macros.h" Index: libcxx/test/std/utilities/optional/optional.object/triviality.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.object/triviality.pass.cpp +++ libcxx/test/std/utilities/optional/optional.object/triviality.pass.cpp @@ -22,7 +22,7 @@ #include #include -#include "archetypes.hpp" +#include "archetypes.h" #include "test_macros.h" Index: libcxx/test/std/utilities/optional/optional.specalg/swap.pass.cpp =================================================================== --- libcxx/test/std/utilities/optional/optional.specalg/swap.pass.cpp +++ libcxx/test/std/utilities/optional/optional.specalg/swap.pass.cpp @@ -17,7 +17,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" using std::optional; Index: libcxx/test/std/utilities/template.bitset/bitset.hash/enabled_hash.pass.cpp =================================================================== --- libcxx/test/std/utilities/template.bitset/bitset.hash/enabled_hash.pass.cpp +++ libcxx/test/std/utilities/template.bitset/bitset.hash/enabled_hash.pass.cpp @@ -15,7 +15,7 @@ #include -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "test_macros.h" Index: libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp =================================================================== --- libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp +++ libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.pass.cpp @@ -20,7 +20,7 @@ #include #include "test_macros.h" -#include "test_convertible.hpp" +#include "test_convertible.h" #include "MoveOnly.h" #if TEST_STD_VER > 11 Index: libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/deduct.pass.cpp =================================================================== --- libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/deduct.pass.cpp +++ libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/deduct.pass.cpp @@ -25,7 +25,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" // Overloads Index: libcxx/test/std/utilities/type.index/type.index.hash/enabled_hash.pass.cpp =================================================================== --- libcxx/test/std/utilities/type.index/type.index.hash/enabled_hash.pass.cpp +++ libcxx/test/std/utilities/type.index/type.index.hash/enabled_hash.pass.cpp @@ -15,7 +15,7 @@ #include -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "test_macros.h" Index: libcxx/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp =================================================================== --- libcxx/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp +++ libcxx/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp @@ -19,7 +19,7 @@ #include "test_macros.h" #if TEST_STD_VER >= 11 -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #endif int main(int, char**) Index: libcxx/test/std/utilities/utility/pairs/pairs.pair/U_V.pass.cpp =================================================================== --- libcxx/test/std/utilities/utility/pairs/pairs.pair/U_V.pass.cpp +++ libcxx/test/std/utilities/utility/pairs/pairs.pair/U_V.pass.cpp @@ -19,8 +19,8 @@ #include #include -#include "archetypes.hpp" -#include "test_convertible.hpp" +#include "archetypes.h" +#include "test_convertible.h" #include "test_macros.h" using namespace ImplicitTypes; // Get implicitly archetypes Index: libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp =================================================================== --- libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp +++ libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_const_pair_U_V.pass.cpp @@ -17,7 +17,7 @@ #include "test_macros.h" #if TEST_STD_VER >= 11 -#include "archetypes.hpp" +#include "archetypes.h" #endif int main(int, char**) Index: libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp =================================================================== --- libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp +++ libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_rv_pair_U_V.pass.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "test_macros.h" Index: libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp =================================================================== --- libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp +++ libcxx/test/std/utilities/utility/pairs/pairs.pair/const_first_const_second.pass.cpp @@ -17,8 +17,8 @@ #include #include -#include "archetypes.hpp" -#include "test_convertible.hpp" +#include "archetypes.h" +#include "test_convertible.h" #include "test_macros.h" using namespace ImplicitTypes; // Get implicitly archetypes Index: libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp =================================================================== --- libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp +++ libcxx/test/std/utilities/utility/pairs/pairs.pair/const_pair_U_V.pass.cpp @@ -17,8 +17,8 @@ #include #include -#include "archetypes.hpp" -#include "test_convertible.hpp" +#include "archetypes.h" +#include "test_convertible.h" #include "test_macros.h" using namespace ImplicitTypes; // Get implicitly archetypes Index: libcxx/test/std/utilities/utility/pairs/pairs.pair/default.pass.cpp =================================================================== --- libcxx/test/std/utilities/utility/pairs/pairs.pair/default.pass.cpp +++ libcxx/test/std/utilities/utility/pairs/pairs.pair/default.pass.cpp @@ -26,7 +26,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" int main(int, char**) { Index: libcxx/test/std/utilities/utility/pairs/pairs.pair/implicit_deduction_guides.pass.cpp =================================================================== --- libcxx/test/std/utilities/utility/pairs/pairs.pair/implicit_deduction_guides.pass.cpp +++ libcxx/test/std/utilities/utility/pairs/pairs.pair/implicit_deduction_guides.pass.cpp @@ -26,7 +26,7 @@ #include #include "test_macros.h" -#include "archetypes.hpp" +#include "archetypes.h" // Overloads Index: libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp =================================================================== --- libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp +++ libcxx/test/std/utilities/utility/pairs/pairs.pair/rv_pair_U_V.pass.cpp @@ -18,8 +18,8 @@ #include #include -#include "archetypes.hpp" -#include "test_convertible.hpp" +#include "archetypes.h" +#include "test_convertible.h" #include "test_macros.h" using namespace ImplicitTypes; // Get implicitly archetypes Index: libcxx/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp =================================================================== --- libcxx/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp +++ libcxx/test/std/utilities/utility/pairs/pairs.pair/special_member_generation_test.pass.cpp @@ -24,7 +24,7 @@ #include #include -#include "archetypes.hpp" +#include "archetypes.h" #include "test_macros.h" using namespace ImplicitTypes; // Get implicitly archetypes Index: libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp +++ libcxx/test/std/utilities/variant/variant.hash/enabled_hash.pass.cpp @@ -15,7 +15,7 @@ #include -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "test_macros.h" Index: libcxx/test/std/utilities/variant/variant.hash/hash.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.hash/hash.pass.cpp +++ libcxx/test/std/utilities/variant/variant.hash/hash.pass.cpp @@ -19,8 +19,8 @@ #include #include "test_macros.h" -#include "variant_test_helpers.hpp" -#include "poisoned_hash_helper.hpp" +#include "variant_test_helpers.h" +#include "poisoned_hash_helper.h" #ifndef TEST_HAS_NO_EXCEPTIONS namespace std { Index: libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.pass.cpp +++ libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.pass.cpp @@ -26,7 +26,7 @@ #include #include "test_macros.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" template void test() { static_assert( Index: libcxx/test/std/utilities/variant/variant.get/get_if_index.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.get/get_if_index.pass.cpp +++ libcxx/test/std/utilities/variant/variant.get/get_if_index.pass.cpp @@ -19,7 +19,7 @@ // get_if(const variant* v) noexcept; #include "test_macros.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" #include #include #include Index: libcxx/test/std/utilities/variant/variant.get/get_if_type.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.get/get_if_type.pass.cpp +++ libcxx/test/std/utilities/variant/variant.get/get_if_type.pass.cpp @@ -18,7 +18,7 @@ // noexcept; #include "test_macros.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" #include #include Index: libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp +++ libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp @@ -28,7 +28,7 @@ #include "test_macros.h" #include "test_workarounds.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" #include #include #include Index: libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp +++ libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp @@ -22,7 +22,7 @@ #include "test_macros.h" #include "test_workarounds.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" #include #include #include Index: libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp @@ -25,7 +25,7 @@ #include #include "test_macros.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" namespace MetaHelpers { Index: libcxx/test/std/utilities/variant/variant.variant/variant.assign/conv.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.assign/conv.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.assign/conv.pass.cpp @@ -20,7 +20,7 @@ #include #include -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" int main(int, char**) { Index: libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp @@ -29,7 +29,7 @@ #include #include "test_macros.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" struct NoCopy { NoCopy(const NoCopy &) = delete; Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp @@ -23,7 +23,7 @@ #include #include "test_macros.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" struct Dummy { Dummy() = default; Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/conv.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/conv.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/conv.pass.cpp @@ -19,7 +19,7 @@ #include #include -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" int main(int, char**) { Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp @@ -22,7 +22,7 @@ #include #include "test_macros.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" struct NonDefaultConstructible { constexpr NonDefaultConstructible(int) {} Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp @@ -23,7 +23,7 @@ #include #include -#include "test_convertible.hpp" +#include "test_convertible.h" #include "test_macros.h" void test_ctor_sfinae() { Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp @@ -23,7 +23,7 @@ #include #include -#include "test_convertible.hpp" +#include "test_convertible.h" #include "test_macros.h" struct InitList { Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp @@ -22,7 +22,7 @@ #include #include -#include "test_convertible.hpp" +#include "test_convertible.h" #include "test_macros.h" void test_ctor_sfinae() { Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp @@ -23,7 +23,7 @@ #include #include -#include "test_convertible.hpp" +#include "test_convertible.h" #include "test_macros.h" struct InitList { Index: libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp @@ -23,10 +23,10 @@ #include #include -#include "archetypes.hpp" -#include "test_convertible.hpp" +#include "archetypes.h" +#include "test_convertible.h" #include "test_macros.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" template constexpr auto test_emplace_exists_imp(int) -> decltype( Index: libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp @@ -23,8 +23,8 @@ #include #include -#include "archetypes.hpp" -#include "test_convertible.hpp" +#include "archetypes.h" +#include "test_convertible.h" #include "test_macros.h" struct InitList { Index: libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp @@ -22,10 +22,10 @@ #include #include -#include "archetypes.hpp" -#include "test_convertible.hpp" +#include "archetypes.h" +#include "test_convertible.h" #include "test_macros.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" template constexpr auto test_emplace_exists_imp(int) -> decltype( Index: libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp @@ -23,8 +23,8 @@ #include #include -#include "archetypes.hpp" -#include "test_convertible.hpp" +#include "archetypes.h" +#include "test_convertible.h" #include "test_macros.h" struct InitList { Index: libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.status/index.pass.cpp @@ -20,9 +20,9 @@ #include #include -#include "archetypes.hpp" +#include "archetypes.h" #include "test_macros.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" int main(int, char**) { Index: libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.status/valueless_by_exception.pass.cpp @@ -20,9 +20,9 @@ #include #include -#include "archetypes.hpp" +#include "archetypes.h" #include "test_macros.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" int main(int, char**) { Index: libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp @@ -22,9 +22,9 @@ #include #include -#include "test_convertible.hpp" +#include "test_convertible.h" #include "test_macros.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" struct NotSwappable {}; void swap(NotSwappable &, NotSwappable &) = delete; Index: libcxx/test/std/utilities/variant/variant.variant/variant_array.fail.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant_array.fail.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant_array.fail.cpp @@ -20,8 +20,8 @@ #include #include "test_macros.h" -#include "variant_test_helpers.hpp" -#include "test_convertible.hpp" +#include "variant_test_helpers.h" +#include "test_convertible.h" int main(int, char**) { Index: libcxx/test/std/utilities/variant/variant.variant/variant_empty.fail.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant_empty.fail.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant_empty.fail.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" int main(int, char**) { Index: libcxx/test/std/utilities/variant/variant.variant/variant_reference.fail.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant_reference.fail.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant_reference.fail.cpp @@ -16,7 +16,7 @@ #include #include "test_macros.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" int main(int, char**) { Index: libcxx/test/std/utilities/variant/variant.variant/variant_void.fail.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.variant/variant_void.fail.cpp +++ libcxx/test/std/utilities/variant/variant.variant/variant_void.fail.cpp @@ -20,8 +20,8 @@ #include #include "test_macros.h" -#include "variant_test_helpers.hpp" -#include "test_convertible.hpp" +#include "variant_test_helpers.h" +#include "test_convertible.h" int main(int, char**) { Index: libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp =================================================================== --- libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp +++ libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp @@ -24,7 +24,7 @@ #include "test_macros.h" #include "type_id.h" -#include "variant_test_helpers.hpp" +#include "variant_test_helpers.h" enum CallType : unsigned { CT_None, Index: libcxx/test/support/archetypes.h =================================================================== --- libcxx/test/support/archetypes.h +++ libcxx/test/support/archetypes.h @@ -1,5 +1,5 @@ -#ifndef TEST_SUPPORT_ARCHETYPES_HPP -#define TEST_SUPPORT_ARCHETYPES_HPP +#ifndef TEST_SUPPORT_ARCHETYPES_H +#define TEST_SUPPORT_ARCHETYPES_H #include #include @@ -390,4 +390,4 @@ #endif // TEST_STD_VER >= 11 -#endif // TEST_SUPPORT_ARCHETYPES_HPP +#endif // TEST_SUPPORT_ARCHETYPES_H Index: libcxx/test/support/controlled_allocators.h =================================================================== --- libcxx/test/support/controlled_allocators.h +++ libcxx/test/support/controlled_allocators.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_CONTROLLED_ALLOCATORS_HPP -#define SUPPORT_CONTROLLED_ALLOCATORS_HPP +#ifndef SUPPORT_CONTROLLED_ALLOCATORS_H +#define SUPPORT_CONTROLLED_ALLOCATORS_H #include #include @@ -498,4 +498,4 @@ } -#endif /* SUPPORT_CONTROLLED_ALLOCATORS_HPP */ +#endif /* SUPPORT_CONTROLLED_ALLOCATORS_H */ Index: libcxx/test/support/count_new.h =================================================================== --- libcxx/test/support/count_new.h +++ libcxx/test/support/count_new.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef COUNT_NEW_HPP -#define COUNT_NEW_HPP +#ifndef COUNT_NEW_H +#define COUNT_NEW_H # include # include @@ -482,4 +482,4 @@ RequireAllocationGuard& operator=(RequireAllocationGuard const&); }; -#endif /* COUNT_NEW_HPP */ +#endif /* COUNT_NEW_H */ Index: libcxx/test/support/filesystem_include.h =================================================================== --- libcxx/test/support/filesystem_include.h +++ libcxx/test/support/filesystem_include.h @@ -1,5 +1,5 @@ -#ifndef TEST_SUPPORT_FILESYSTEM_INCLUDE_HPP -#define TEST_SUPPORT_FILESYSTEM_INCLUDE_HPP +#ifndef TEST_SUPPORT_FILESYSTEM_INCLUDE_H +#define TEST_SUPPORT_FILESYSTEM_INCLUDE_H #include #include "test_macros.h" Index: libcxx/test/support/filesystem_test_helper.h =================================================================== --- libcxx/test/support/filesystem_test_helper.h +++ libcxx/test/support/filesystem_test_helper.h @@ -1,7 +1,7 @@ -#ifndef FILESYSTEM_TEST_HELPER_HPP -#define FILESYSTEM_TEST_HELPER_HPP +#ifndef FILESYSTEM_TEST_HELPER_H +#define FILESYSTEM_TEST_HELPER_H -#include "filesystem_include.hpp" +#include "filesystem_include.h" #include // for ftruncate @@ -15,8 +15,8 @@ #include #include "test_macros.h" -#include "rapid-cxx-test.hpp" -#include "format_string.hpp" +#include "rapid-cxx-test.h" +#include "format_string.h" // static test helpers Index: libcxx/test/support/format_string.h =================================================================== --- libcxx/test/support/format_string.h +++ libcxx/test/support/format_string.h @@ -1,5 +1,5 @@ -#ifndef TEST_SUPPORT_FORMAT_STRING_HPP -#define TEST_SUPPORT_FORMAT_STRING_HPP +#ifndef TEST_SUPPORT_FORMAT_STRING_H +#define TEST_SUPPORT_FORMAT_STRING_H #include #include Index: libcxx/test/support/msvc_stdlib_force_include.h =================================================================== --- libcxx/test/support/msvc_stdlib_force_include.h +++ libcxx/test/support/msvc_stdlib_force_include.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_MSVC_STDLIB_FORCE_INCLUDE_HPP -#define SUPPORT_MSVC_STDLIB_FORCE_INCLUDE_HPP +#ifndef SUPPORT_MSVC_STDLIB_FORCE_INCLUDE_H +#define SUPPORT_MSVC_STDLIB_FORCE_INCLUDE_H // This header is force-included when running the libc++ tests against the // MSVC standard library. @@ -89,4 +89,4 @@ #define _LIBCPP_AVAILABILITY_THROW_BAD_ANY_CAST -#endif // SUPPORT_MSVC_STDLIB_FORCE_INCLUDE_HPP +#endif // SUPPORT_MSVC_STDLIB_FORCE_INCLUDE_H Index: libcxx/test/support/nasty_macros.h =================================================================== --- libcxx/test/support/nasty_macros.h +++ libcxx/test/support/nasty_macros.h @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_NASTY_MACROS_HPP -#define SUPPORT_NASTY_MACROS_HPP +#ifndef SUPPORT_NASTY_MACROS_H +#define SUPPORT_NASTY_MACROS_H #define NASTY_MACRO This should not be expanded!!! #define _A NASTY_MACRO @@ -65,4 +65,4 @@ #define __acquire NASTY_MACRO #define __release NASTY_MACRO -#endif // SUPPORT_NASTY_MACROS_HPP +#endif // SUPPORT_NASTY_MACROS_H Index: libcxx/test/support/poisoned_hash_helper.h =================================================================== --- libcxx/test/support/poisoned_hash_helper.h +++ libcxx/test/support/poisoned_hash_helper.h @@ -6,8 +6,8 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_POISONED_HASH_HELPER_HPP -#define SUPPORT_POISONED_HASH_HELPER_HPP +#ifndef SUPPORT_POISONED_HASH_HELPER_H +#define SUPPORT_POISONED_HASH_HELPER_H #include #include @@ -239,4 +239,4 @@ Types::template applyTrait(); } -#endif // SUPPORT_POISONED_HASH_HELPER_HPP +#endif // SUPPORT_POISONED_HASH_HELPER_H Index: libcxx/test/support/rapid-cxx-test.h =================================================================== --- libcxx/test/support/rapid-cxx-test.h +++ libcxx/test/support/rapid-cxx-test.h @@ -1,5 +1,5 @@ -#ifndef RAPID_CXX_TEST_HPP -#define RAPID_CXX_TEST_HPP +#ifndef RAPID_CXX_TEST_H +#define RAPID_CXX_TEST_H # include # include @@ -863,4 +863,4 @@ # pragma GCC diagnostic pop # endif -#endif /* RAPID_CXX_TEST_HPP */ +#endif /* RAPID_CXX_TEST_H */ Index: libcxx/test/support/test.support/test_convertible_header.pass.cpp =================================================================== --- libcxx/test/support/test.support/test_convertible_header.pass.cpp +++ libcxx/test/support/test.support/test_convertible_header.pass.cpp @@ -8,9 +8,9 @@ // UNSUPPORTED: c++98, c++03 -// "support/test_convertible.hpp" +// "support/test_convertible.h" -#include "test_convertible.hpp" +#include "test_convertible.h" #include "test_macros.h" Index: libcxx/test/support/test.support/test_poisoned_hash_helper.pass.cpp =================================================================== --- libcxx/test/support/test.support/test_poisoned_hash_helper.pass.cpp +++ libcxx/test/support/test.support/test_poisoned_hash_helper.pass.cpp @@ -8,12 +8,12 @@ // UNSUPPORTED: c++98, c++03 -// Test that the header `poisoned_hash_helper.hpp` doesn't include any +// Test that the header `poisoned_hash_helper.h` doesn't include any // headers that provide hash specializations. This is required so that the // 'test_library_hash_specializations_available()' function returns false // by default, unless a STL header providing hash has already been included. -#include "poisoned_hash_helper.hpp" +#include "poisoned_hash_helper.h" #include "test_macros.h" Index: libcxx/test/support/test_convertible.h =================================================================== --- libcxx/test/support/test_convertible.h +++ libcxx/test/support/test_convertible.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_TEST_CONVERTIBLE_HPP -#define SUPPORT_TEST_CONVERTIBLE_HPP +#ifndef SUPPORT_TEST_CONVERTIBLE_H +#define SUPPORT_TEST_CONVERTIBLE_H // "test_convertible()" is a metafunction used to check if 'Tp' // is implicitly convertible from 'Args...' for any number of arguments, @@ -19,7 +19,7 @@ #include "test_macros.h" #if TEST_STD_VER < 11 -#error test_convertible.hpp requires C++11 or newer +#error test_convertible.h requires C++11 or newer #endif namespace detail { @@ -38,4 +38,4 @@ constexpr bool test_convertible() { return detail::test_convertible_imp(0); } -#endif // SUPPORT_TEST_CONVERTIBLE_HPP +#endif // SUPPORT_TEST_CONVERTIBLE_H Index: libcxx/test/support/test_memory_resource.h =================================================================== --- libcxx/test/support/test_memory_resource.h +++ libcxx/test/support/test_memory_resource.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_TEST_MEMORY_RESOURCE_HPP -#define SUPPORT_TEST_MEMORY_RESOURCE_HPP +#ifndef SUPPORT_TEST_MEMORY_RESOURCE_H +#define SUPPORT_TEST_MEMORY_RESOURCE_H #include #include @@ -19,8 +19,8 @@ #include #include #include "test_macros.h" -#include "controlled_allocators.hpp" -#include "uses_alloc_types.hpp" +#include "controlled_allocators.h" +#include "uses_alloc_types.h" // FIXME: This is a hack to allow uses_allocator_types.hpp to work with // erased_type. However we can't define that behavior directly in the header @@ -167,4 +167,4 @@ using TestResource2 = TestResourceImp, 2>; -#endif /* SUPPORT_TEST_MEMORY_RESOURCE_HPP */ +#endif /* SUPPORT_TEST_MEMORY_RESOURCE_H */ Index: libcxx/test/support/user_defined_integral.h =================================================================== --- libcxx/test/support/user_defined_integral.h +++ libcxx/test/support/user_defined_integral.h @@ -5,8 +5,8 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_USER_DEFINED_INTEGRAL_HPP -#define SUPPORT_USER_DEFINED_INTEGRAL_HPP +#ifndef SUPPORT_USER_DEFINED_INTEGRAL_H +#define SUPPORT_USER_DEFINED_INTEGRAL_H template struct UserDefinedIntegral @@ -48,4 +48,4 @@ template void operator>=(UserDefinedIntegral, UserDefinedIntegral); -#endif // SUPPORT_USER_DEFINED_INTEGRAL_HPP +#endif // SUPPORT_USER_DEFINED_INTEGRAL_H Index: libcxx/test/support/uses_alloc_types.h =================================================================== --- libcxx/test/support/uses_alloc_types.h +++ libcxx/test/support/uses_alloc_types.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef USES_ALLOC_TYPES_HPP -#define USES_ALLOC_TYPES_HPP +#ifndef USES_ALLOC_TYPES_H +#define USES_ALLOC_TYPES_H # include # include @@ -142,7 +142,7 @@ // polymorphic allocators. However we don't want to include // in this header. Therefore in order // to inject this behavior later we use a trait. -// See test_memory_resource.hpp for more info. +// See test_memory_resource.h for more info. template struct TransformErasedTypeAlloc { using type = Alloc; @@ -387,4 +387,4 @@ {} }; -#endif /* USES_ALLOC_TYPES_HPP */ +#endif /* USES_ALLOC_TYPES_H */ Index: libcxx/test/support/variant_test_helpers.h =================================================================== --- libcxx/test/support/variant_test_helpers.h +++ libcxx/test/support/variant_test_helpers.h @@ -6,8 +6,8 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// -#ifndef SUPPORT_VARIANT_TEST_HELPERS_HPP -#define SUPPORT_VARIANT_TEST_HELPERS_HPP +#ifndef SUPPORT_VARIANT_TEST_HELPERS_H +#define SUPPORT_VARIANT_TEST_HELPERS_H #include #include @@ -86,4 +86,4 @@ #endif // TEST_HAS_NO_EXCEPTIONS -#endif // SUPPORT_VARIANT_TEST_HELPERS_HPP +#endif // SUPPORT_VARIANT_TEST_HELPERS_H Index: libcxx/utils/libcxx/test/config.py =================================================================== --- libcxx/utils/libcxx/test/config.py +++ libcxx/utils/libcxx/test/config.py @@ -600,11 +600,11 @@ if self.cxx_stdlib_under_test != 'libstdc++' and \ not self.is_windows: self.cxx.compile_flags += [ - '-include', os.path.join(support_path, 'nasty_macros.hpp')] + '-include', os.path.join(support_path, 'nasty_macros.h')] if self.cxx_stdlib_under_test == 'msvc': self.cxx.compile_flags += [ '-include', os.path.join(support_path, - 'msvc_stdlib_force_include.hpp')] + 'msvc_stdlib_force_include.h')] pass if self.is_windows and self.debug_build and \ self.cxx_stdlib_under_test != 'msvc':