diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt --- a/libcxx/include/CMakeLists.txt +++ b/libcxx/include/CMakeLists.txt @@ -229,7 +229,6 @@ __atomic/is_always_lock_free.h __atomic/kill_dependency.h __atomic/memory_order.h - __availability __bit/bit_cast.h __bit/bit_ceil.h __bit/bit_floor.h @@ -315,12 +314,13 @@ __concepts/swappable.h __concepts/totally_ordered.h __condition_variable/condition_variable.h - __config + __config_dir/availability.h + __config_dir/config.h + __config_dir/debug.h __coroutine/coroutine_handle.h __coroutine/coroutine_traits.h __coroutine/noop_coroutine_handle.h __coroutine/trivial_awaitables.h - __debug __debug_utils/randomize_range.h __exception/exception.h __exception/exception_ptr.h diff --git a/libcxx/include/__algorithm/adjacent_find.h b/libcxx/include/__algorithm/adjacent_find.h --- a/libcxx/include/__algorithm/adjacent_find.h +++ b/libcxx/include/__algorithm/adjacent_find.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/move.h> diff --git a/libcxx/include/__algorithm/all_of.h b/libcxx/include/__algorithm/all_of.h --- a/libcxx/include/__algorithm/all_of.h +++ b/libcxx/include/__algorithm/all_of.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ALGORITHM_ALL_OF_H #define _LIBCPP___ALGORITHM_ALL_OF_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/any_of.h b/libcxx/include/__algorithm/any_of.h --- a/libcxx/include/__algorithm/any_of.h +++ b/libcxx/include/__algorithm/any_of.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ALGORITHM_ANY_OF_H #define _LIBCPP___ALGORITHM_ANY_OF_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/binary_search.h b/libcxx/include/__algorithm/binary_search.h --- a/libcxx/include/__algorithm/binary_search.h +++ b/libcxx/include/__algorithm/binary_search.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> #include <__algorithm/lower_bound.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/clamp.h b/libcxx/include/__algorithm/clamp.h --- a/libcxx/include/__algorithm/clamp.h +++ b/libcxx/include/__algorithm/clamp.h @@ -11,7 +11,7 @@ #include <__algorithm/comp.h> #include <__assert> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/comp.h b/libcxx/include/__algorithm/comp.h --- a/libcxx/include/__algorithm/comp.h +++ b/libcxx/include/__algorithm/comp.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_COMP_H #define _LIBCPP___ALGORITHM_COMP_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/predicate_traits.h> diff --git a/libcxx/include/__algorithm/comp_ref_type.h b/libcxx/include/__algorithm/comp_ref_type.h --- a/libcxx/include/__algorithm/comp_ref_type.h +++ b/libcxx/include/__algorithm/comp_ref_type.h @@ -9,8 +9,8 @@ #ifndef _LIBCPP___ALGORITHM_COMP_REF_TYPE_H #define _LIBCPP___ALGORITHM_COMP_REF_TYPE_H -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__utility/declval.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/copy.h b/libcxx/include/__algorithm/copy.h --- a/libcxx/include/__algorithm/copy.h +++ b/libcxx/include/__algorithm/copy.h @@ -13,7 +13,7 @@ #include <__algorithm/for_each_segment.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/min.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/segmented_iterator.h> #include <__type_traits/common_type.h> #include <__utility/move.h> diff --git a/libcxx/include/__algorithm/copy_backward.h b/libcxx/include/__algorithm/copy_backward.h --- a/libcxx/include/__algorithm/copy_backward.h +++ b/libcxx/include/__algorithm/copy_backward.h @@ -12,7 +12,7 @@ #include <__algorithm/copy_move_common.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/min.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/segmented_iterator.h> #include <__type_traits/common_type.h> #include <__type_traits/is_copy_constructible.h> diff --git a/libcxx/include/__algorithm/copy_if.h b/libcxx/include/__algorithm/copy_if.h --- a/libcxx/include/__algorithm/copy_if.h +++ b/libcxx/include/__algorithm/copy_if.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_COPY_IF_H #define _LIBCPP___ALGORITHM_COPY_IF_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/copy_move_common.h b/libcxx/include/__algorithm/copy_move_common.h --- a/libcxx/include/__algorithm/copy_move_common.h +++ b/libcxx/include/__algorithm/copy_move_common.h @@ -12,7 +12,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/unwrap_iter.h> #include <__algorithm/unwrap_range.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__memory/pointer_traits.h> #include <__type_traits/enable_if.h> diff --git a/libcxx/include/__algorithm/copy_n.h b/libcxx/include/__algorithm/copy_n.h --- a/libcxx/include/__algorithm/copy_n.h +++ b/libcxx/include/__algorithm/copy_n.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_COPY_N_H #include <__algorithm/copy.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/enable_if.h> #include <__utility/convert_to_integral.h> diff --git a/libcxx/include/__algorithm/count.h b/libcxx/include/__algorithm/count.h --- a/libcxx/include/__algorithm/count.h +++ b/libcxx/include/__algorithm/count.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ALGORITHM_COUNT_H #define _LIBCPP___ALGORITHM_COUNT_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/count_if.h b/libcxx/include/__algorithm/count_if.h --- a/libcxx/include/__algorithm/count_if.h +++ b/libcxx/include/__algorithm/count_if.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ALGORITHM_COUNT_IF_H #define _LIBCPP___ALGORITHM_COUNT_IF_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/equal.h b/libcxx/include/__algorithm/equal.h --- a/libcxx/include/__algorithm/equal.h +++ b/libcxx/include/__algorithm/equal.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/unwrap_iter.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/distance.h> diff --git a/libcxx/include/__algorithm/equal_range.h b/libcxx/include/__algorithm/equal_range.h --- a/libcxx/include/__algorithm/equal_range.h +++ b/libcxx/include/__algorithm/equal_range.h @@ -15,7 +15,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/lower_bound.h> #include <__algorithm/upper_bound.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/advance.h> diff --git a/libcxx/include/__algorithm/fill.h b/libcxx/include/__algorithm/fill.h --- a/libcxx/include/__algorithm/fill.h +++ b/libcxx/include/__algorithm/fill.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_FILL_H #include <__algorithm/fill_n.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/fill_n.h b/libcxx/include/__algorithm/fill_n.h --- a/libcxx/include/__algorithm/fill_n.h +++ b/libcxx/include/__algorithm/fill_n.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_FILL_N_H #define _LIBCPP___ALGORITHM_FILL_N_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/convert_to_integral.h> diff --git a/libcxx/include/__algorithm/find.h b/libcxx/include/__algorithm/find.h --- a/libcxx/include/__algorithm/find.h +++ b/libcxx/include/__algorithm/find.h @@ -11,7 +11,7 @@ #define _LIBCPP___ALGORITHM_FIND_H #include <__algorithm/unwrap_iter.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__string/constexpr_c_functions.h> diff --git a/libcxx/include/__algorithm/find_end.h b/libcxx/include/__algorithm/find_end.h --- a/libcxx/include/__algorithm/find_end.h +++ b/libcxx/include/__algorithm/find_end.h @@ -13,7 +13,7 @@ #include <__algorithm/comp.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/search.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/advance.h> diff --git a/libcxx/include/__algorithm/find_first_of.h b/libcxx/include/__algorithm/find_first_of.h --- a/libcxx/include/__algorithm/find_first_of.h +++ b/libcxx/include/__algorithm/find_first_of.h @@ -11,7 +11,7 @@ #define _LIBCPP___ALGORITHM_FIND_FIRST_OF_H #include <__algorithm/comp.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/find_if.h b/libcxx/include/__algorithm/find_if.h --- a/libcxx/include/__algorithm/find_if.h +++ b/libcxx/include/__algorithm/find_if.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ALGORITHM_FIND_IF_H #define _LIBCPP___ALGORITHM_FIND_IF_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/find_if_not.h b/libcxx/include/__algorithm/find_if_not.h --- a/libcxx/include/__algorithm/find_if_not.h +++ b/libcxx/include/__algorithm/find_if_not.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ALGORITHM_FIND_IF_NOT_H #define _LIBCPP___ALGORITHM_FIND_IF_NOT_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/for_each.h b/libcxx/include/__algorithm/for_each.h --- a/libcxx/include/__algorithm/for_each.h +++ b/libcxx/include/__algorithm/for_each.h @@ -11,7 +11,7 @@ #define _LIBCPP___ALGORITHM_FOR_EACH_H #include <__algorithm/for_each_segment.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/segmented_iterator.h> #include <__type_traits/enable_if.h> #include <__utility/move.h> diff --git a/libcxx/include/__algorithm/for_each_n.h b/libcxx/include/__algorithm/for_each_n.h --- a/libcxx/include/__algorithm/for_each_n.h +++ b/libcxx/include/__algorithm/for_each_n.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ALGORITHM_FOR_EACH_N_H #define _LIBCPP___ALGORITHM_FOR_EACH_N_H -#include <__config> +#include <__config_dir/config.h> #include <__utility/convert_to_integral.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/for_each_segment.h b/libcxx/include/__algorithm/for_each_segment.h --- a/libcxx/include/__algorithm/for_each_segment.h +++ b/libcxx/include/__algorithm/for_each_segment.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_FOR_EACH_SEGMENT_H #define _LIBCPP___ALGORITHM_FOR_EACH_SEGMENT_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/segmented_iterator.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/generate.h b/libcxx/include/__algorithm/generate.h --- a/libcxx/include/__algorithm/generate.h +++ b/libcxx/include/__algorithm/generate.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_GENERATE_H #define _LIBCPP___ALGORITHM_GENERATE_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/generate_n.h b/libcxx/include/__algorithm/generate_n.h --- a/libcxx/include/__algorithm/generate_n.h +++ b/libcxx/include/__algorithm/generate_n.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_GENERATE_N_H #define _LIBCPP___ALGORITHM_GENERATE_N_H -#include <__config> +#include <__config_dir/config.h> #include <__utility/convert_to_integral.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/half_positive.h b/libcxx/include/__algorithm/half_positive.h --- a/libcxx/include/__algorithm/half_positive.h +++ b/libcxx/include/__algorithm/half_positive.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_HALF_POSITIVE_H #define _LIBCPP___ALGORITHM_HALF_POSITIVE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/enable_if.h> #include <__type_traits/is_integral.h> #include <__type_traits/make_unsigned.h> diff --git a/libcxx/include/__algorithm/in_found_result.h b/libcxx/include/__algorithm/in_found_result.h --- a/libcxx/include/__algorithm/in_found_result.h +++ b/libcxx/include/__algorithm/in_found_result.h @@ -11,7 +11,7 @@ #define _LIBCPP___ALGORITHM_IN_FOUND_RESULT_H #include <__concepts/convertible_to.h> -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/in_fun_result.h b/libcxx/include/__algorithm/in_fun_result.h --- a/libcxx/include/__algorithm/in_fun_result.h +++ b/libcxx/include/__algorithm/in_fun_result.h @@ -11,7 +11,7 @@ #define _LIBCPP___ALGORITHM_IN_FUN_RESULT_H #include <__concepts/convertible_to.h> -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/in_in_out_result.h b/libcxx/include/__algorithm/in_in_out_result.h --- a/libcxx/include/__algorithm/in_in_out_result.h +++ b/libcxx/include/__algorithm/in_in_out_result.h @@ -11,7 +11,7 @@ #define _LIBCPP___ALGORITHM_IN_IN_OUT_RESULT_H #include <__concepts/convertible_to.h> -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/in_in_result.h b/libcxx/include/__algorithm/in_in_result.h --- a/libcxx/include/__algorithm/in_in_result.h +++ b/libcxx/include/__algorithm/in_in_result.h @@ -11,7 +11,7 @@ #define _LIBCPP___ALGORITHM_IN_IN_RESULT_H #include <__concepts/convertible_to.h> -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/in_out_out_result.h b/libcxx/include/__algorithm/in_out_out_result.h --- a/libcxx/include/__algorithm/in_out_out_result.h +++ b/libcxx/include/__algorithm/in_out_out_result.h @@ -11,7 +11,7 @@ #define _LIBCPP___ALGORITHM_IN_OUT_OUT_RESULT_H #include <__concepts/convertible_to.h> -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/in_out_result.h b/libcxx/include/__algorithm/in_out_result.h --- a/libcxx/include/__algorithm/in_out_result.h +++ b/libcxx/include/__algorithm/in_out_result.h @@ -11,7 +11,7 @@ #define _LIBCPP___ALGORITHM_IN_OUT_RESULT_H #include <__concepts/convertible_to.h> -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/includes.h b/libcxx/include/__algorithm/includes.h --- a/libcxx/include/__algorithm/includes.h +++ b/libcxx/include/__algorithm/includes.h @@ -11,7 +11,7 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__algorithm/inplace_merge.h b/libcxx/include/__algorithm/inplace_merge.h --- a/libcxx/include/__algorithm/inplace_merge.h +++ b/libcxx/include/__algorithm/inplace_merge.h @@ -17,7 +17,7 @@ #include <__algorithm/move.h> #include <__algorithm/rotate.h> #include <__algorithm/upper_bound.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__iterator/advance.h> #include <__iterator/distance.h> diff --git a/libcxx/include/__algorithm/is_heap.h b/libcxx/include/__algorithm/is_heap.h --- a/libcxx/include/__algorithm/is_heap.h +++ b/libcxx/include/__algorithm/is_heap.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> #include <__algorithm/is_heap_until.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/is_heap_until.h b/libcxx/include/__algorithm/is_heap_until.h --- a/libcxx/include/__algorithm/is_heap_until.h +++ b/libcxx/include/__algorithm/is_heap_until.h @@ -11,7 +11,7 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/is_partitioned.h b/libcxx/include/__algorithm/is_partitioned.h --- a/libcxx/include/__algorithm/is_partitioned.h +++ b/libcxx/include/__algorithm/is_partitioned.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_IS_PARTITIONED_H #define _LIBCPP___ALGORITHM_IS_PARTITIONED_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/is_permutation.h b/libcxx/include/__algorithm/is_permutation.h --- a/libcxx/include/__algorithm/is_permutation.h +++ b/libcxx/include/__algorithm/is_permutation.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/is_sorted.h b/libcxx/include/__algorithm/is_sorted.h --- a/libcxx/include/__algorithm/is_sorted.h +++ b/libcxx/include/__algorithm/is_sorted.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> #include <__algorithm/is_sorted_until.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/is_sorted_until.h b/libcxx/include/__algorithm/is_sorted_until.h --- a/libcxx/include/__algorithm/is_sorted_until.h +++ b/libcxx/include/__algorithm/is_sorted_until.h @@ -11,7 +11,7 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/iter_swap.h b/libcxx/include/__algorithm/iter_swap.h --- a/libcxx/include/__algorithm/iter_swap.h +++ b/libcxx/include/__algorithm/iter_swap.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_ITER_SWAP_H #define _LIBCPP___ALGORITHM_ITER_SWAP_H -#include <__config> +#include <__config_dir/config.h> #include <__utility/declval.h> #include <__utility/swap.h> diff --git a/libcxx/include/__algorithm/iterator_operations.h b/libcxx/include/__algorithm/iterator_operations.h --- a/libcxx/include/__algorithm/iterator_operations.h +++ b/libcxx/include/__algorithm/iterator_operations.h @@ -11,7 +11,7 @@ #include <__algorithm/iter_swap.h> #include <__algorithm/ranges_iterator_concept.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/advance.h> #include <__iterator/distance.h> #include <__iterator/incrementable_traits.h> diff --git a/libcxx/include/__algorithm/lexicographical_compare.h b/libcxx/include/__algorithm/lexicographical_compare.h --- a/libcxx/include/__algorithm/lexicographical_compare.h +++ b/libcxx/include/__algorithm/lexicographical_compare.h @@ -11,7 +11,7 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/lexicographical_compare_three_way.h b/libcxx/include/__algorithm/lexicographical_compare_three_way.h --- a/libcxx/include/__algorithm/lexicographical_compare_three_way.h +++ b/libcxx/include/__algorithm/lexicographical_compare_three_way.h @@ -14,7 +14,7 @@ #include <__compare/compare_three_way.h> #include <__compare/ordering.h> #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/common_type.h> #include <__type_traits/is_copy_constructible.h> diff --git a/libcxx/include/__algorithm/lower_bound.h b/libcxx/include/__algorithm/lower_bound.h --- a/libcxx/include/__algorithm/lower_bound.h +++ b/libcxx/include/__algorithm/lower_bound.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/half_positive.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/advance.h> diff --git a/libcxx/include/__algorithm/make_heap.h b/libcxx/include/__algorithm/make_heap.h --- a/libcxx/include/__algorithm/make_heap.h +++ b/libcxx/include/__algorithm/make_heap.h @@ -13,7 +13,7 @@ #include <__algorithm/comp_ref_type.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/sift_down.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/move.h> diff --git a/libcxx/include/__algorithm/make_projected.h b/libcxx/include/__algorithm/make_projected.h --- a/libcxx/include/__algorithm/make_projected.h +++ b/libcxx/include/__algorithm/make_projected.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_MAKE_PROJECTED_H #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__type_traits/decay.h> diff --git a/libcxx/include/__algorithm/max.h b/libcxx/include/__algorithm/max.h --- a/libcxx/include/__algorithm/max.h +++ b/libcxx/include/__algorithm/max.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> #include <__algorithm/max_element.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/max_element.h b/libcxx/include/__algorithm/max_element.h --- a/libcxx/include/__algorithm/max_element.h +++ b/libcxx/include/__algorithm/max_element.h @@ -11,7 +11,7 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/merge.h b/libcxx/include/__algorithm/merge.h --- a/libcxx/include/__algorithm/merge.h +++ b/libcxx/include/__algorithm/merge.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> #include <__algorithm/copy.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/min.h b/libcxx/include/__algorithm/min.h --- a/libcxx/include/__algorithm/min.h +++ b/libcxx/include/__algorithm/min.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> #include <__algorithm/min_element.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/min_element.h b/libcxx/include/__algorithm/min_element.h --- a/libcxx/include/__algorithm/min_element.h +++ b/libcxx/include/__algorithm/min_element.h @@ -11,7 +11,7 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__algorithm/min_max_result.h b/libcxx/include/__algorithm/min_max_result.h --- a/libcxx/include/__algorithm/min_max_result.h +++ b/libcxx/include/__algorithm/min_max_result.h @@ -11,7 +11,7 @@ #define _LIBCPP___ALGORITHM_MIN_MAX_RESULT_H #include <__concepts/convertible_to.h> -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/minmax.h b/libcxx/include/__algorithm/minmax.h --- a/libcxx/include/__algorithm/minmax.h +++ b/libcxx/include/__algorithm/minmax.h @@ -11,7 +11,7 @@ #include <__algorithm/comp.h> #include <__algorithm/minmax_element.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__type_traits/is_callable.h> #include <__utility/pair.h> diff --git a/libcxx/include/__algorithm/minmax_element.h b/libcxx/include/__algorithm/minmax_element.h --- a/libcxx/include/__algorithm/minmax_element.h +++ b/libcxx/include/__algorithm/minmax_element.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_MINMAX_ELEMENT_H #include <__algorithm/comp.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__algorithm/mismatch.h b/libcxx/include/__algorithm/mismatch.h --- a/libcxx/include/__algorithm/mismatch.h +++ b/libcxx/include/__algorithm/mismatch.h @@ -11,7 +11,7 @@ #define _LIBCPP___ALGORITHM_MISMATCH_H #include <__algorithm/comp.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/pair.h> diff --git a/libcxx/include/__algorithm/move.h b/libcxx/include/__algorithm/move.h --- a/libcxx/include/__algorithm/move.h +++ b/libcxx/include/__algorithm/move.h @@ -13,7 +13,7 @@ #include <__algorithm/for_each_segment.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/min.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/segmented_iterator.h> #include <__type_traits/common_type.h> #include <__type_traits/is_copy_constructible.h> diff --git a/libcxx/include/__algorithm/move_backward.h b/libcxx/include/__algorithm/move_backward.h --- a/libcxx/include/__algorithm/move_backward.h +++ b/libcxx/include/__algorithm/move_backward.h @@ -12,7 +12,7 @@ #include <__algorithm/copy_move_common.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/min.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/segmented_iterator.h> #include <__type_traits/common_type.h> #include <__type_traits/is_copy_constructible.h> diff --git a/libcxx/include/__algorithm/next_permutation.h b/libcxx/include/__algorithm/next_permutation.h --- a/libcxx/include/__algorithm/next_permutation.h +++ b/libcxx/include/__algorithm/next_permutation.h @@ -13,7 +13,7 @@ #include <__algorithm/comp_ref_type.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/reverse.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/move.h> #include <__utility/pair.h> diff --git a/libcxx/include/__algorithm/none_of.h b/libcxx/include/__algorithm/none_of.h --- a/libcxx/include/__algorithm/none_of.h +++ b/libcxx/include/__algorithm/none_of.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ALGORITHM_NONE_OF_H #define _LIBCPP___ALGORITHM_NONE_OF_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/nth_element.h b/libcxx/include/__algorithm/nth_element.h --- a/libcxx/include/__algorithm/nth_element.h +++ b/libcxx/include/__algorithm/nth_element.h @@ -13,8 +13,8 @@ #include <__algorithm/comp_ref_type.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/sort.h> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__debug_utils/randomize_range.h> #include <__iterator/iterator_traits.h> #include <__utility/move.h> diff --git a/libcxx/include/__algorithm/partial_sort.h b/libcxx/include/__algorithm/partial_sort.h --- a/libcxx/include/__algorithm/partial_sort.h +++ b/libcxx/include/__algorithm/partial_sort.h @@ -15,8 +15,8 @@ #include <__algorithm/make_heap.h> #include <__algorithm/sift_down.h> #include <__algorithm/sort_heap.h> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__debug_utils/randomize_range.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_copy_assignable.h> diff --git a/libcxx/include/__algorithm/partial_sort_copy.h b/libcxx/include/__algorithm/partial_sort_copy.h --- a/libcxx/include/__algorithm/partial_sort_copy.h +++ b/libcxx/include/__algorithm/partial_sort_copy.h @@ -16,7 +16,7 @@ #include <__algorithm/make_projected.h> #include <__algorithm/sift_down.h> #include <__algorithm/sort_heap.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__algorithm/partition.h b/libcxx/include/__algorithm/partition.h --- a/libcxx/include/__algorithm/partition.h +++ b/libcxx/include/__algorithm/partition.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_PARTITION_H #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/move.h> #include <__utility/pair.h> diff --git a/libcxx/include/__algorithm/partition_copy.h b/libcxx/include/__algorithm/partition_copy.h --- a/libcxx/include/__algorithm/partition_copy.h +++ b/libcxx/include/__algorithm/partition_copy.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_PARTITION_COPY_H #define _LIBCPP___ALGORITHM_PARTITION_COPY_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/pair.h> diff --git a/libcxx/include/__algorithm/partition_point.h b/libcxx/include/__algorithm/partition_point.h --- a/libcxx/include/__algorithm/partition_point.h +++ b/libcxx/include/__algorithm/partition_point.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_PARTITION_POINT_H #include <__algorithm/half_positive.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/advance.h> #include <__iterator/distance.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__algorithm/pop_heap.h b/libcxx/include/__algorithm/pop_heap.h --- a/libcxx/include/__algorithm/pop_heap.h +++ b/libcxx/include/__algorithm/pop_heap.h @@ -15,7 +15,7 @@ #include <__algorithm/push_heap.h> #include <__algorithm/sift_down.h> #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_copy_assignable.h> #include <__type_traits/is_copy_constructible.h> diff --git a/libcxx/include/__algorithm/prev_permutation.h b/libcxx/include/__algorithm/prev_permutation.h --- a/libcxx/include/__algorithm/prev_permutation.h +++ b/libcxx/include/__algorithm/prev_permutation.h @@ -13,7 +13,7 @@ #include <__algorithm/comp_ref_type.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/reverse.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/move.h> #include <__utility/pair.h> diff --git a/libcxx/include/__algorithm/pstl_any_all_none_of.h b/libcxx/include/__algorithm/pstl_any_all_none_of.h --- a/libcxx/include/__algorithm/pstl_any_all_none_of.h +++ b/libcxx/include/__algorithm/pstl_any_all_none_of.h @@ -11,7 +11,7 @@ #include <__algorithm/pstl_find.h> #include <__algorithm/pstl_frontend_dispatch.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/enable_if.h> #include <__type_traits/is_execution_policy.h> diff --git a/libcxx/include/__algorithm/pstl_backend.h b/libcxx/include/__algorithm/pstl_backend.h --- a/libcxx/include/__algorithm/pstl_backend.h +++ b/libcxx/include/__algorithm/pstl_backend.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_PSTL_BACKEND_H #include <__algorithm/pstl_backends/cpu_backend.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/pstl_backends/cpu_backend.h b/libcxx/include/__algorithm/pstl_backends/cpu_backend.h --- a/libcxx/include/__algorithm/pstl_backends/cpu_backend.h +++ b/libcxx/include/__algorithm/pstl_backends/cpu_backend.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_PSTL_BACKENDS_CPU_BACKEND_H #define _LIBCPP___ALGORITHM_PSTL_BACKENDS_CPU_BACKEND_H -#include <__config> +#include <__config_dir/config.h> /* diff --git a/libcxx/include/__algorithm/pstl_backends/cpu_backends/any_of.h b/libcxx/include/__algorithm/pstl_backends/cpu_backends/any_of.h --- a/libcxx/include/__algorithm/pstl_backends/cpu_backends/any_of.h +++ b/libcxx/include/__algorithm/pstl_backends/cpu_backends/any_of.h @@ -14,7 +14,7 @@ #include <__algorithm/pstl_backends/cpu_backends/backend.h> #include <__atomic/atomic.h> #include <__atomic/memory_order.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/operations.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_execution_policy.h> diff --git a/libcxx/include/__algorithm/pstl_backends/cpu_backends/backend.h b/libcxx/include/__algorithm/pstl_backends/cpu_backends/backend.h --- a/libcxx/include/__algorithm/pstl_backends/cpu_backends/backend.h +++ b/libcxx/include/__algorithm/pstl_backends/cpu_backends/backend.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_PSTL_BACKENDS_CPU_BACKEND_BACKEND_H #define _LIBCPP___ALGORITHM_PSTL_BACKENDS_CPU_BACKEND_BACKEND_H -#include <__config> +#include <__config_dir/config.h> #include #if defined(_LIBCPP_PSTL_CPU_BACKEND_SERIAL) diff --git a/libcxx/include/__algorithm/pstl_backends/cpu_backends/fill.h b/libcxx/include/__algorithm/pstl_backends/cpu_backends/fill.h --- a/libcxx/include/__algorithm/pstl_backends/cpu_backends/fill.h +++ b/libcxx/include/__algorithm/pstl_backends/cpu_backends/fill.h @@ -11,7 +11,7 @@ #include <__algorithm/fill.h> #include <__algorithm/pstl_backends/cpu_backends/backend.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_execution_policy.h> #include <__utility/terminate_on_exception.h> diff --git a/libcxx/include/__algorithm/pstl_backends/cpu_backends/find_if.h b/libcxx/include/__algorithm/pstl_backends/cpu_backends/find_if.h --- a/libcxx/include/__algorithm/pstl_backends/cpu_backends/find_if.h +++ b/libcxx/include/__algorithm/pstl_backends/cpu_backends/find_if.h @@ -12,7 +12,7 @@ #include <__algorithm/find_if.h> #include <__algorithm/pstl_backends/cpu_backends/backend.h> #include <__atomic/atomic.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/operations.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_execution_policy.h> diff --git a/libcxx/include/__algorithm/pstl_backends/cpu_backends/for_each.h b/libcxx/include/__algorithm/pstl_backends/cpu_backends/for_each.h --- a/libcxx/include/__algorithm/pstl_backends/cpu_backends/for_each.h +++ b/libcxx/include/__algorithm/pstl_backends/cpu_backends/for_each.h @@ -11,7 +11,7 @@ #include <__algorithm/for_each.h> #include <__algorithm/pstl_backends/cpu_backends/backend.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_execution_policy.h> #include <__utility/terminate_on_exception.h> diff --git a/libcxx/include/__algorithm/pstl_backends/cpu_backends/merge.h b/libcxx/include/__algorithm/pstl_backends/cpu_backends/merge.h --- a/libcxx/include/__algorithm/pstl_backends/cpu_backends/merge.h +++ b/libcxx/include/__algorithm/pstl_backends/cpu_backends/merge.h @@ -11,7 +11,7 @@ #include <__algorithm/merge.h> #include <__algorithm/pstl_backends/cpu_backends/backend.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_execution_policy.h> #include <__utility/move.h> diff --git a/libcxx/include/__algorithm/pstl_backends/cpu_backends/serial.h b/libcxx/include/__algorithm/pstl_backends/cpu_backends/serial.h --- a/libcxx/include/__algorithm/pstl_backends/cpu_backends/serial.h +++ b/libcxx/include/__algorithm/pstl_backends/cpu_backends/serial.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ALGORITHM_PSTL_BACKENDS_CPU_BACKENDS_SERIAL_H #define _LIBCPP___ALGORITHM_PSTL_BACKENDS_CPU_BACKENDS_SERIAL_H -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/pstl_backends/cpu_backends/thread.h b/libcxx/include/__algorithm/pstl_backends/cpu_backends/thread.h --- a/libcxx/include/__algorithm/pstl_backends/cpu_backends/thread.h +++ b/libcxx/include/__algorithm/pstl_backends/cpu_backends/thread.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_PSTL_BACKENDS_CPU_BACKENDS_THREAD_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/pstl_backends/cpu_backends/transform.h b/libcxx/include/__algorithm/pstl_backends/cpu_backends/transform.h --- a/libcxx/include/__algorithm/pstl_backends/cpu_backends/transform.h +++ b/libcxx/include/__algorithm/pstl_backends/cpu_backends/transform.h @@ -11,7 +11,7 @@ #include <__algorithm/pstl_backends/cpu_backends/backend.h> #include <__algorithm/transform.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/enable_if.h> #include <__type_traits/is_execution_policy.h> diff --git a/libcxx/include/__algorithm/pstl_backends/cpu_backends/transform_reduce.h b/libcxx/include/__algorithm/pstl_backends/cpu_backends/transform_reduce.h --- a/libcxx/include/__algorithm/pstl_backends/cpu_backends/transform_reduce.h +++ b/libcxx/include/__algorithm/pstl_backends/cpu_backends/transform_reduce.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_PSTL_BACKENDS_CPU_BACKENDS_TRANSFORM_REDUCE_H #include <__algorithm/pstl_backends/cpu_backends/backend.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__numeric/transform_reduce.h> #include <__type_traits/is_arithmetic.h> diff --git a/libcxx/include/__algorithm/pstl_copy.h b/libcxx/include/__algorithm/pstl_copy.h --- a/libcxx/include/__algorithm/pstl_copy.h +++ b/libcxx/include/__algorithm/pstl_copy.h @@ -11,7 +11,7 @@ #include <__algorithm/copy_n.h> #include <__algorithm/pstl_transform.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_constant_evaluated.h> diff --git a/libcxx/include/__algorithm/pstl_fill.h b/libcxx/include/__algorithm/pstl_fill.h --- a/libcxx/include/__algorithm/pstl_fill.h +++ b/libcxx/include/__algorithm/pstl_fill.h @@ -12,7 +12,7 @@ #include <__algorithm/fill_n.h> #include <__algorithm/pstl_for_each.h> #include <__algorithm/pstl_frontend_dispatch.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_execution_policy.h> #include <__type_traits/remove_cvref.h> diff --git a/libcxx/include/__algorithm/pstl_find.h b/libcxx/include/__algorithm/pstl_find.h --- a/libcxx/include/__algorithm/pstl_find.h +++ b/libcxx/include/__algorithm/pstl_find.h @@ -13,7 +13,7 @@ #include <__algorithm/find.h> #include <__algorithm/pstl_backend.h> #include <__algorithm/pstl_frontend_dispatch.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_execution_policy.h> #include <__type_traits/remove_cvref.h> diff --git a/libcxx/include/__algorithm/pstl_for_each.h b/libcxx/include/__algorithm/pstl_for_each.h --- a/libcxx/include/__algorithm/pstl_for_each.h +++ b/libcxx/include/__algorithm/pstl_for_each.h @@ -13,7 +13,7 @@ #include <__algorithm/for_each_n.h> #include <__algorithm/pstl_backend.h> #include <__algorithm/pstl_frontend_dispatch.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_execution_policy.h> #include <__type_traits/remove_cvref.h> diff --git a/libcxx/include/__algorithm/pstl_frontend_dispatch.h b/libcxx/include/__algorithm/pstl_frontend_dispatch.h --- a/libcxx/include/__algorithm/pstl_frontend_dispatch.h +++ b/libcxx/include/__algorithm/pstl_frontend_dispatch.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_PSTL_FRONTEND_DISPATCH #define _LIBCPP___ALGORITHM_PSTL_FRONTEND_DISPATCH -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_callable.h> #include <__utility/forward.h> diff --git a/libcxx/include/__algorithm/pstl_merge.h b/libcxx/include/__algorithm/pstl_merge.h --- a/libcxx/include/__algorithm/pstl_merge.h +++ b/libcxx/include/__algorithm/pstl_merge.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_PSTL_MERGE_H #include <__algorithm/pstl_backend.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/operations.h> #include <__type_traits/is_execution_policy.h> #include <__type_traits/remove_cvref.h> diff --git a/libcxx/include/__algorithm/pstl_transform.h b/libcxx/include/__algorithm/pstl_transform.h --- a/libcxx/include/__algorithm/pstl_transform.h +++ b/libcxx/include/__algorithm/pstl_transform.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_PSTL_TRANSFORM_H #include <__algorithm/pstl_backend.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_execution_policy.h> #include <__utility/terminate_on_exception.h> diff --git a/libcxx/include/__algorithm/push_heap.h b/libcxx/include/__algorithm/push_heap.h --- a/libcxx/include/__algorithm/push_heap.h +++ b/libcxx/include/__algorithm/push_heap.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_copy_assignable.h> #include <__type_traits/is_copy_constructible.h> diff --git a/libcxx/include/__algorithm/ranges_adjacent_find.h b/libcxx/include/__algorithm/ranges_adjacent_find.h --- a/libcxx/include/__algorithm/ranges_adjacent_find.h +++ b/libcxx/include/__algorithm/ranges_adjacent_find.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_ADJACENT_FIND_H #define _LIBCPP___ALGORITHM_RANGES_ADJACENT_FIND_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_all_of.h b/libcxx/include/__algorithm/ranges_all_of.h --- a/libcxx/include/__algorithm/ranges_all_of.h +++ b/libcxx/include/__algorithm/ranges_all_of.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_ALL_OF_H #define _LIBCPP___ALGORITHM_RANGES_ALL_OF_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_any_of.h b/libcxx/include/__algorithm/ranges_any_of.h --- a/libcxx/include/__algorithm/ranges_any_of.h +++ b/libcxx/include/__algorithm/ranges_any_of.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_ANY_OF_H #define _LIBCPP___ALGORITHM_RANGES_ANY_OF_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_binary_search.h b/libcxx/include/__algorithm/ranges_binary_search.h --- a/libcxx/include/__algorithm/ranges_binary_search.h +++ b/libcxx/include/__algorithm/ranges_binary_search.h @@ -11,7 +11,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/lower_bound.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_clamp.h b/libcxx/include/__algorithm/ranges_clamp.h --- a/libcxx/include/__algorithm/ranges_clamp.h +++ b/libcxx/include/__algorithm/ranges_clamp.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_RANGES_CLAMP_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_copy.h b/libcxx/include/__algorithm/ranges_copy.h --- a/libcxx/include/__algorithm/ranges_copy.h +++ b/libcxx/include/__algorithm/ranges_copy.h @@ -12,7 +12,7 @@ #include <__algorithm/copy.h> #include <__algorithm/in_out_result.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__iterator/concepts.h> #include <__ranges/access.h> diff --git a/libcxx/include/__algorithm/ranges_copy_backward.h b/libcxx/include/__algorithm/ranges_copy_backward.h --- a/libcxx/include/__algorithm/ranges_copy_backward.h +++ b/libcxx/include/__algorithm/ranges_copy_backward.h @@ -12,7 +12,7 @@ #include <__algorithm/copy_backward.h> #include <__algorithm/in_out_result.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__ranges/access.h> #include <__ranges/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_copy_if.h b/libcxx/include/__algorithm/ranges_copy_if.h --- a/libcxx/include/__algorithm/ranges_copy_if.h +++ b/libcxx/include/__algorithm/ranges_copy_if.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_RANGES_COPY_IF_H #include <__algorithm/in_out_result.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_copy_n.h b/libcxx/include/__algorithm/ranges_copy_n.h --- a/libcxx/include/__algorithm/ranges_copy_n.h +++ b/libcxx/include/__algorithm/ranges_copy_n.h @@ -13,7 +13,7 @@ #include <__algorithm/in_out_result.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/ranges_copy.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> diff --git a/libcxx/include/__algorithm/ranges_count.h b/libcxx/include/__algorithm/ranges_count.h --- a/libcxx/include/__algorithm/ranges_count.h +++ b/libcxx/include/__algorithm/ranges_count.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_RANGES_COUNT_H #include <__algorithm/ranges_count_if.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_count_if.h b/libcxx/include/__algorithm/ranges_count_if.h --- a/libcxx/include/__algorithm/ranges_count_if.h +++ b/libcxx/include/__algorithm/ranges_count_if.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_COUNT_IF_H #define _LIBCPP___ALGORITHM_RANGES_COUNT_IF_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_equal.h b/libcxx/include/__algorithm/ranges_equal.h --- a/libcxx/include/__algorithm/ranges_equal.h +++ b/libcxx/include/__algorithm/ranges_equal.h @@ -11,7 +11,7 @@ #include <__algorithm/equal.h> #include <__algorithm/unwrap_range.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_equal_range.h b/libcxx/include/__algorithm/ranges_equal_range.h --- a/libcxx/include/__algorithm/ranges_equal_range.h +++ b/libcxx/include/__algorithm/ranges_equal_range.h @@ -11,7 +11,7 @@ #include <__algorithm/equal_range.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_fill.h b/libcxx/include/__algorithm/ranges_fill.h --- a/libcxx/include/__algorithm/ranges_fill.h +++ b/libcxx/include/__algorithm/ranges_fill.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_RANGES_FILL_H #include <__algorithm/ranges_fill_n.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__ranges/access.h> #include <__ranges/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_fill_n.h b/libcxx/include/__algorithm/ranges_fill_n.h --- a/libcxx/include/__algorithm/ranges_fill_n.h +++ b/libcxx/include/__algorithm/ranges_fill_n.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_FILL_N_H #define _LIBCPP___ALGORITHM_RANGES_FILL_N_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> diff --git a/libcxx/include/__algorithm/ranges_find.h b/libcxx/include/__algorithm/ranges_find.h --- a/libcxx/include/__algorithm/ranges_find.h +++ b/libcxx/include/__algorithm/ranges_find.h @@ -12,7 +12,7 @@ #include <__algorithm/find.h> #include <__algorithm/ranges_find_if.h> #include <__algorithm/unwrap_range.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_find_end.h b/libcxx/include/__algorithm/ranges_find_end.h --- a/libcxx/include/__algorithm/ranges_find_end.h +++ b/libcxx/include/__algorithm/ranges_find_end.h @@ -12,7 +12,7 @@ #include <__algorithm/find_end.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/ranges_iterator_concept.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_find_first_of.h b/libcxx/include/__algorithm/ranges_find_first_of.h --- a/libcxx/include/__algorithm/ranges_find_first_of.h +++ b/libcxx/include/__algorithm/ranges_find_first_of.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_FIND_FIRST_OF_H #define _LIBCPP___ALGORITHM_RANGES_FIND_FIRST_OF_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_find_if.h b/libcxx/include/__algorithm/ranges_find_if.h --- a/libcxx/include/__algorithm/ranges_find_if.h +++ b/libcxx/include/__algorithm/ranges_find_if.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_FIND_IF_H #define _LIBCPP___ALGORITHM_RANGES_FIND_IF_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_find_if_not.h b/libcxx/include/__algorithm/ranges_find_if_not.h --- a/libcxx/include/__algorithm/ranges_find_if_not.h +++ b/libcxx/include/__algorithm/ranges_find_if_not.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_RANGES_FIND_IF_NOT_H #include <__algorithm/ranges_find_if.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_for_each.h b/libcxx/include/__algorithm/ranges_for_each.h --- a/libcxx/include/__algorithm/ranges_for_each.h +++ b/libcxx/include/__algorithm/ranges_for_each.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_RANGES_FOR_EACH_H #include <__algorithm/in_fun_result.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_for_each_n.h b/libcxx/include/__algorithm/ranges_for_each_n.h --- a/libcxx/include/__algorithm/ranges_for_each_n.h +++ b/libcxx/include/__algorithm/ranges_for_each_n.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_RANGES_FOR_EACH_N_H #include <__algorithm/in_fun_result.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_generate.h b/libcxx/include/__algorithm/ranges_generate.h --- a/libcxx/include/__algorithm/ranges_generate.h +++ b/libcxx/include/__algorithm/ranges_generate.h @@ -11,7 +11,7 @@ #include <__concepts/constructible.h> #include <__concepts/invocable.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__algorithm/ranges_generate_n.h b/libcxx/include/__algorithm/ranges_generate_n.h --- a/libcxx/include/__algorithm/ranges_generate_n.h +++ b/libcxx/include/__algorithm/ranges_generate_n.h @@ -11,7 +11,7 @@ #include <__concepts/constructible.h> #include <__concepts/invocable.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_includes.h b/libcxx/include/__algorithm/ranges_includes.h --- a/libcxx/include/__algorithm/ranges_includes.h +++ b/libcxx/include/__algorithm/ranges_includes.h @@ -11,7 +11,7 @@ #include <__algorithm/includes.h> #include <__algorithm/make_projected.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_inplace_merge.h b/libcxx/include/__algorithm/ranges_inplace_merge.h --- a/libcxx/include/__algorithm/ranges_inplace_merge.h +++ b/libcxx/include/__algorithm/ranges_inplace_merge.h @@ -12,7 +12,7 @@ #include <__algorithm/inplace_merge.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/make_projected.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_is_heap.h b/libcxx/include/__algorithm/ranges_is_heap.h --- a/libcxx/include/__algorithm/ranges_is_heap.h +++ b/libcxx/include/__algorithm/ranges_is_heap.h @@ -11,7 +11,7 @@ #include <__algorithm/is_heap_until.h> #include <__algorithm/make_projected.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_is_heap_until.h b/libcxx/include/__algorithm/ranges_is_heap_until.h --- a/libcxx/include/__algorithm/ranges_is_heap_until.h +++ b/libcxx/include/__algorithm/ranges_is_heap_until.h @@ -11,7 +11,7 @@ #include <__algorithm/is_heap_until.h> #include <__algorithm/make_projected.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_is_partitioned.h b/libcxx/include/__algorithm/ranges_is_partitioned.h --- a/libcxx/include/__algorithm/ranges_is_partitioned.h +++ b/libcxx/include/__algorithm/ranges_is_partitioned.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_IS_PARTITIONED_H #define _LIBCPP___ALGORITHM_RANGES_IS_PARTITIONED_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_is_permutation.h b/libcxx/include/__algorithm/ranges_is_permutation.h --- a/libcxx/include/__algorithm/ranges_is_permutation.h +++ b/libcxx/include/__algorithm/ranges_is_permutation.h @@ -11,7 +11,7 @@ #include <__algorithm/is_permutation.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_is_sorted.h b/libcxx/include/__algorithm/ranges_is_sorted.h --- a/libcxx/include/__algorithm/ranges_is_sorted.h +++ b/libcxx/include/__algorithm/ranges_is_sorted.h @@ -10,7 +10,7 @@ #define _LIBCPP__ALGORITHM_RANGES_IS_SORTED_H #include <__algorithm/ranges_is_sorted_until.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_is_sorted_until.h b/libcxx/include/__algorithm/ranges_is_sorted_until.h --- a/libcxx/include/__algorithm/ranges_is_sorted_until.h +++ b/libcxx/include/__algorithm/ranges_is_sorted_until.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP__ALGORITHM_RANGES_IS_SORTED_UNTIL_H #define _LIBCPP__ALGORITHM_RANGES_IS_SORTED_UNTIL_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_iterator_concept.h b/libcxx/include/__algorithm/ranges_iterator_concept.h --- a/libcxx/include/__algorithm/ranges_iterator_concept.h +++ b/libcxx/include/__algorithm/ranges_iterator_concept.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_ITERATOR_CONCEPT_H #define _LIBCPP___ALGORITHM_RANGES_ITERATOR_CONCEPT_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/iterator_traits.h> #include <__type_traits/remove_cvref.h> diff --git a/libcxx/include/__algorithm/ranges_lexicographical_compare.h b/libcxx/include/__algorithm/ranges_lexicographical_compare.h --- a/libcxx/include/__algorithm/ranges_lexicographical_compare.h +++ b/libcxx/include/__algorithm/ranges_lexicographical_compare.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_LEXICOGRAPHICAL_COMPARE_H #define _LIBCPP___ALGORITHM_RANGES_LEXICOGRAPHICAL_COMPARE_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_lower_bound.h b/libcxx/include/__algorithm/ranges_lower_bound.h --- a/libcxx/include/__algorithm/ranges_lower_bound.h +++ b/libcxx/include/__algorithm/ranges_lower_bound.h @@ -11,7 +11,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/lower_bound.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_make_heap.h b/libcxx/include/__algorithm/ranges_make_heap.h --- a/libcxx/include/__algorithm/ranges_make_heap.h +++ b/libcxx/include/__algorithm/ranges_make_heap.h @@ -13,7 +13,7 @@ #include <__algorithm/make_heap.h> #include <__algorithm/make_projected.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_max.h b/libcxx/include/__algorithm/ranges_max.h --- a/libcxx/include/__algorithm/ranges_max.h +++ b/libcxx/include/__algorithm/ranges_max.h @@ -12,7 +12,7 @@ #include <__algorithm/ranges_min_element.h> #include <__assert> #include <__concepts/copyable.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_max_element.h b/libcxx/include/__algorithm/ranges_max_element.h --- a/libcxx/include/__algorithm/ranges_max_element.h +++ b/libcxx/include/__algorithm/ranges_max_element.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_RANGES_MAX_ELEMENT_H #include <__algorithm/ranges_min_element.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_merge.h b/libcxx/include/__algorithm/ranges_merge.h --- a/libcxx/include/__algorithm/ranges_merge.h +++ b/libcxx/include/__algorithm/ranges_merge.h @@ -11,7 +11,7 @@ #include <__algorithm/in_in_out_result.h> #include <__algorithm/ranges_copy.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_min.h b/libcxx/include/__algorithm/ranges_min.h --- a/libcxx/include/__algorithm/ranges_min.h +++ b/libcxx/include/__algorithm/ranges_min.h @@ -12,7 +12,7 @@ #include <__algorithm/ranges_min_element.h> #include <__assert> #include <__concepts/copyable.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_min_element.h b/libcxx/include/__algorithm/ranges_min_element.h --- a/libcxx/include/__algorithm/ranges_min_element.h +++ b/libcxx/include/__algorithm/ranges_min_element.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_MIN_ELEMENT_H #define _LIBCPP___ALGORITHM_RANGES_MIN_ELEMENT_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_minmax.h b/libcxx/include/__algorithm/ranges_minmax.h --- a/libcxx/include/__algorithm/ranges_minmax.h +++ b/libcxx/include/__algorithm/ranges_minmax.h @@ -14,7 +14,7 @@ #include <__assert> #include <__concepts/copyable.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_minmax_element.h b/libcxx/include/__algorithm/ranges_minmax_element.h --- a/libcxx/include/__algorithm/ranges_minmax_element.h +++ b/libcxx/include/__algorithm/ranges_minmax_element.h @@ -11,7 +11,7 @@ #include <__algorithm/min_max_result.h> #include <__algorithm/minmax_element.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_mismatch.h b/libcxx/include/__algorithm/ranges_mismatch.h --- a/libcxx/include/__algorithm/ranges_mismatch.h +++ b/libcxx/include/__algorithm/ranges_mismatch.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_RANGES_MISMATCH_H #include <__algorithm/in_in_result.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_move.h b/libcxx/include/__algorithm/ranges_move.h --- a/libcxx/include/__algorithm/ranges_move.h +++ b/libcxx/include/__algorithm/ranges_move.h @@ -12,7 +12,7 @@ #include <__algorithm/in_out_result.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/move.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__ranges/access.h> #include <__ranges/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_move_backward.h b/libcxx/include/__algorithm/ranges_move_backward.h --- a/libcxx/include/__algorithm/ranges_move_backward.h +++ b/libcxx/include/__algorithm/ranges_move_backward.h @@ -12,7 +12,7 @@ #include <__algorithm/in_out_result.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/move_backward.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/iter_move.h> #include <__iterator/next.h> diff --git a/libcxx/include/__algorithm/ranges_next_permutation.h b/libcxx/include/__algorithm/ranges_next_permutation.h --- a/libcxx/include/__algorithm/ranges_next_permutation.h +++ b/libcxx/include/__algorithm/ranges_next_permutation.h @@ -13,7 +13,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/make_projected.h> #include <__algorithm/next_permutation.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_none_of.h b/libcxx/include/__algorithm/ranges_none_of.h --- a/libcxx/include/__algorithm/ranges_none_of.h +++ b/libcxx/include/__algorithm/ranges_none_of.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_NONE_OF_H #define _LIBCPP___ALGORITHM_RANGES_NONE_OF_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_nth_element.h b/libcxx/include/__algorithm/ranges_nth_element.h --- a/libcxx/include/__algorithm/ranges_nth_element.h +++ b/libcxx/include/__algorithm/ranges_nth_element.h @@ -12,7 +12,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/make_projected.h> #include <__algorithm/nth_element.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_partial_sort.h b/libcxx/include/__algorithm/ranges_partial_sort.h --- a/libcxx/include/__algorithm/ranges_partial_sort.h +++ b/libcxx/include/__algorithm/ranges_partial_sort.h @@ -13,7 +13,7 @@ #include <__algorithm/make_projected.h> #include <__algorithm/partial_sort.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_partial_sort_copy.h b/libcxx/include/__algorithm/ranges_partial_sort_copy.h --- a/libcxx/include/__algorithm/ranges_partial_sort_copy.h +++ b/libcxx/include/__algorithm/ranges_partial_sort_copy.h @@ -13,7 +13,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/make_projected.h> #include <__algorithm/partial_sort_copy.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_partition.h b/libcxx/include/__algorithm/ranges_partition.h --- a/libcxx/include/__algorithm/ranges_partition.h +++ b/libcxx/include/__algorithm/ranges_partition.h @@ -13,7 +13,7 @@ #include <__algorithm/make_projected.h> #include <__algorithm/partition.h> #include <__algorithm/ranges_iterator_concept.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_partition_copy.h b/libcxx/include/__algorithm/ranges_partition_copy.h --- a/libcxx/include/__algorithm/ranges_partition_copy.h +++ b/libcxx/include/__algorithm/ranges_partition_copy.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_RANGES_PARTITION_COPY_H #include <__algorithm/in_out_out_result.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_partition_point.h b/libcxx/include/__algorithm/ranges_partition_point.h --- a/libcxx/include/__algorithm/ranges_partition_point.h +++ b/libcxx/include/__algorithm/ranges_partition_point.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_RANGES_PARTITION_POINT_H #include <__algorithm/half_positive.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_pop_heap.h b/libcxx/include/__algorithm/ranges_pop_heap.h --- a/libcxx/include/__algorithm/ranges_pop_heap.h +++ b/libcxx/include/__algorithm/ranges_pop_heap.h @@ -13,7 +13,7 @@ #include <__algorithm/make_projected.h> #include <__algorithm/pop_heap.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_prev_permutation.h b/libcxx/include/__algorithm/ranges_prev_permutation.h --- a/libcxx/include/__algorithm/ranges_prev_permutation.h +++ b/libcxx/include/__algorithm/ranges_prev_permutation.h @@ -13,7 +13,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/make_projected.h> #include <__algorithm/prev_permutation.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_push_heap.h b/libcxx/include/__algorithm/ranges_push_heap.h --- a/libcxx/include/__algorithm/ranges_push_heap.h +++ b/libcxx/include/__algorithm/ranges_push_heap.h @@ -13,7 +13,7 @@ #include <__algorithm/make_projected.h> #include <__algorithm/push_heap.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_remove.h b/libcxx/include/__algorithm/ranges_remove.h --- a/libcxx/include/__algorithm/ranges_remove.h +++ b/libcxx/include/__algorithm/ranges_remove.h @@ -8,7 +8,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_REMOVE_H #define _LIBCPP___ALGORITHM_RANGES_REMOVE_H -#include <__config> +#include <__config_dir/config.h> #include <__algorithm/ranges_remove_if.h> #include <__functional/identity.h> diff --git a/libcxx/include/__algorithm/ranges_remove_copy.h b/libcxx/include/__algorithm/ranges_remove_copy.h --- a/libcxx/include/__algorithm/ranges_remove_copy.h +++ b/libcxx/include/__algorithm/ranges_remove_copy.h @@ -11,7 +11,7 @@ #include <__algorithm/in_out_result.h> #include <__algorithm/ranges_remove_copy_if.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_remove_copy_if.h b/libcxx/include/__algorithm/ranges_remove_copy_if.h --- a/libcxx/include/__algorithm/ranges_remove_copy_if.h +++ b/libcxx/include/__algorithm/ranges_remove_copy_if.h @@ -12,7 +12,7 @@ #include <__algorithm/in_out_result.h> #include <__algorithm/make_projected.h> #include <__algorithm/remove_copy_if.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_remove_if.h b/libcxx/include/__algorithm/ranges_remove_if.h --- a/libcxx/include/__algorithm/ranges_remove_if.h +++ b/libcxx/include/__algorithm/ranges_remove_if.h @@ -8,7 +8,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_REMOVE_IF_H #define _LIBCPP___ALGORITHM_RANGES_REMOVE_IF_H -#include <__config> +#include <__config_dir/config.h> #include <__algorithm/ranges_find_if.h> #include <__functional/identity.h> diff --git a/libcxx/include/__algorithm/ranges_replace.h b/libcxx/include/__algorithm/ranges_replace.h --- a/libcxx/include/__algorithm/ranges_replace.h +++ b/libcxx/include/__algorithm/ranges_replace.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_RANGES_REPLACE_H #include <__algorithm/ranges_replace_if.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_replace_copy.h b/libcxx/include/__algorithm/ranges_replace_copy.h --- a/libcxx/include/__algorithm/ranges_replace_copy.h +++ b/libcxx/include/__algorithm/ranges_replace_copy.h @@ -11,7 +11,7 @@ #include <__algorithm/in_out_result.h> #include <__algorithm/ranges_replace_copy_if.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_replace_copy_if.h b/libcxx/include/__algorithm/ranges_replace_copy_if.h --- a/libcxx/include/__algorithm/ranges_replace_copy_if.h +++ b/libcxx/include/__algorithm/ranges_replace_copy_if.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_RANGES_REPLACE_COPY_IF_H #include <__algorithm/in_out_result.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_replace_if.h b/libcxx/include/__algorithm/ranges_replace_if.h --- a/libcxx/include/__algorithm/ranges_replace_if.h +++ b/libcxx/include/__algorithm/ranges_replace_if.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_REPLACE_IF_H #define _LIBCPP___ALGORITHM_RANGES_REPLACE_IF_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_reverse.h b/libcxx/include/__algorithm/ranges_reverse.h --- a/libcxx/include/__algorithm/ranges_reverse.h +++ b/libcxx/include/__algorithm/ranges_reverse.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_REVERSE_H #define _LIBCPP___ALGORITHM_RANGES_REVERSE_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/iter_swap.h> #include <__iterator/next.h> diff --git a/libcxx/include/__algorithm/ranges_reverse_copy.h b/libcxx/include/__algorithm/ranges_reverse_copy.h --- a/libcxx/include/__algorithm/ranges_reverse_copy.h +++ b/libcxx/include/__algorithm/ranges_reverse_copy.h @@ -11,7 +11,7 @@ #include <__algorithm/in_out_result.h> #include <__algorithm/ranges_copy.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/next.h> #include <__iterator/reverse_iterator.h> diff --git a/libcxx/include/__algorithm/ranges_rotate.h b/libcxx/include/__algorithm/ranges_rotate.h --- a/libcxx/include/__algorithm/ranges_rotate.h +++ b/libcxx/include/__algorithm/ranges_rotate.h @@ -12,7 +12,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/ranges_iterator_concept.h> #include <__algorithm/rotate.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/iterator_traits.h> #include <__iterator/permutable.h> diff --git a/libcxx/include/__algorithm/ranges_rotate_copy.h b/libcxx/include/__algorithm/ranges_rotate_copy.h --- a/libcxx/include/__algorithm/ranges_rotate_copy.h +++ b/libcxx/include/__algorithm/ranges_rotate_copy.h @@ -11,7 +11,7 @@ #include <__algorithm/in_out_result.h> #include <__algorithm/ranges_copy.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/reverse_iterator.h> #include <__ranges/access.h> diff --git a/libcxx/include/__algorithm/ranges_sample.h b/libcxx/include/__algorithm/ranges_sample.h --- a/libcxx/include/__algorithm/ranges_sample.h +++ b/libcxx/include/__algorithm/ranges_sample.h @@ -12,7 +12,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/sample.h> #include <__algorithm/uniform_random_bit_generator_adaptor.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__algorithm/ranges_search.h b/libcxx/include/__algorithm/ranges_search.h --- a/libcxx/include/__algorithm/ranges_search.h +++ b/libcxx/include/__algorithm/ranges_search.h @@ -11,7 +11,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/search.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/advance.h> diff --git a/libcxx/include/__algorithm/ranges_search_n.h b/libcxx/include/__algorithm/ranges_search_n.h --- a/libcxx/include/__algorithm/ranges_search_n.h +++ b/libcxx/include/__algorithm/ranges_search_n.h @@ -11,7 +11,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/search_n.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/advance.h> diff --git a/libcxx/include/__algorithm/ranges_set_difference.h b/libcxx/include/__algorithm/ranges_set_difference.h --- a/libcxx/include/__algorithm/ranges_set_difference.h +++ b/libcxx/include/__algorithm/ranges_set_difference.h @@ -13,7 +13,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/make_projected.h> #include <__algorithm/set_difference.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_set_intersection.h b/libcxx/include/__algorithm/ranges_set_intersection.h --- a/libcxx/include/__algorithm/ranges_set_intersection.h +++ b/libcxx/include/__algorithm/ranges_set_intersection.h @@ -13,7 +13,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/make_projected.h> #include <__algorithm/set_intersection.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_set_symmetric_difference.h b/libcxx/include/__algorithm/ranges_set_symmetric_difference.h --- a/libcxx/include/__algorithm/ranges_set_symmetric_difference.h +++ b/libcxx/include/__algorithm/ranges_set_symmetric_difference.h @@ -13,7 +13,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/make_projected.h> #include <__algorithm/set_symmetric_difference.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_set_union.h b/libcxx/include/__algorithm/ranges_set_union.h --- a/libcxx/include/__algorithm/ranges_set_union.h +++ b/libcxx/include/__algorithm/ranges_set_union.h @@ -13,7 +13,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/make_projected.h> #include <__algorithm/set_union.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_shuffle.h b/libcxx/include/__algorithm/ranges_shuffle.h --- a/libcxx/include/__algorithm/ranges_shuffle.h +++ b/libcxx/include/__algorithm/ranges_shuffle.h @@ -12,7 +12,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/shuffle.h> #include <__algorithm/uniform_random_bit_generator_adaptor.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_sort.h b/libcxx/include/__algorithm/ranges_sort.h --- a/libcxx/include/__algorithm/ranges_sort.h +++ b/libcxx/include/__algorithm/ranges_sort.h @@ -12,7 +12,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/make_projected.h> #include <__algorithm/sort.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_sort_heap.h b/libcxx/include/__algorithm/ranges_sort_heap.h --- a/libcxx/include/__algorithm/ranges_sort_heap.h +++ b/libcxx/include/__algorithm/ranges_sort_heap.h @@ -13,7 +13,7 @@ #include <__algorithm/make_projected.h> #include <__algorithm/sort_heap.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_stable_partition.h b/libcxx/include/__algorithm/ranges_stable_partition.h --- a/libcxx/include/__algorithm/ranges_stable_partition.h +++ b/libcxx/include/__algorithm/ranges_stable_partition.h @@ -13,7 +13,7 @@ #include <__algorithm/make_projected.h> #include <__algorithm/ranges_iterator_concept.h> #include <__algorithm/stable_partition.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_stable_sort.h b/libcxx/include/__algorithm/ranges_stable_sort.h --- a/libcxx/include/__algorithm/ranges_stable_sort.h +++ b/libcxx/include/__algorithm/ranges_stable_sort.h @@ -12,7 +12,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/make_projected.h> #include <__algorithm/stable_sort.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_starts_with.h b/libcxx/include/__algorithm/ranges_starts_with.h --- a/libcxx/include/__algorithm/ranges_starts_with.h +++ b/libcxx/include/__algorithm/ranges_starts_with.h @@ -11,7 +11,7 @@ #include <__algorithm/in_in_result.h> #include <__algorithm/ranges_mismatch.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_swap_ranges.h b/libcxx/include/__algorithm/ranges_swap_ranges.h --- a/libcxx/include/__algorithm/ranges_swap_ranges.h +++ b/libcxx/include/__algorithm/ranges_swap_ranges.h @@ -12,7 +12,7 @@ #include <__algorithm/in_in_result.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/swap_ranges.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/iter_swap.h> #include <__ranges/access.h> diff --git a/libcxx/include/__algorithm/ranges_transform.h b/libcxx/include/__algorithm/ranges_transform.h --- a/libcxx/include/__algorithm/ranges_transform.h +++ b/libcxx/include/__algorithm/ranges_transform.h @@ -12,7 +12,7 @@ #include <__algorithm/in_in_out_result.h> #include <__algorithm/in_out_result.h> #include <__concepts/constructible.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__algorithm/ranges_unique.h b/libcxx/include/__algorithm/ranges_unique.h --- a/libcxx/include/__algorithm/ranges_unique.h +++ b/libcxx/include/__algorithm/ranges_unique.h @@ -12,7 +12,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/make_projected.h> #include <__algorithm/unique.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_unique_copy.h b/libcxx/include/__algorithm/ranges_unique_copy.h --- a/libcxx/include/__algorithm/ranges_unique_copy.h +++ b/libcxx/include/__algorithm/ranges_unique_copy.h @@ -14,7 +14,7 @@ #include <__algorithm/make_projected.h> #include <__algorithm/unique_copy.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/ranges_upper_bound.h b/libcxx/include/__algorithm/ranges_upper_bound.h --- a/libcxx/include/__algorithm/ranges_upper_bound.h +++ b/libcxx/include/__algorithm/ranges_upper_bound.h @@ -11,7 +11,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/lower_bound.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/remove.h b/libcxx/include/__algorithm/remove.h --- a/libcxx/include/__algorithm/remove.h +++ b/libcxx/include/__algorithm/remove.h @@ -11,7 +11,7 @@ #include <__algorithm/find.h> #include <__algorithm/find_if.h> -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/remove_copy.h b/libcxx/include/__algorithm/remove_copy.h --- a/libcxx/include/__algorithm/remove_copy.h +++ b/libcxx/include/__algorithm/remove_copy.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_REMOVE_COPY_H #define _LIBCPP___ALGORITHM_REMOVE_COPY_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/remove_copy_if.h b/libcxx/include/__algorithm/remove_copy_if.h --- a/libcxx/include/__algorithm/remove_copy_if.h +++ b/libcxx/include/__algorithm/remove_copy_if.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_REMOVE_COPY_IF_H #define _LIBCPP___ALGORITHM_REMOVE_COPY_IF_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/remove_if.h b/libcxx/include/__algorithm/remove_if.h --- a/libcxx/include/__algorithm/remove_if.h +++ b/libcxx/include/__algorithm/remove_if.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_REMOVE_IF_H #include <__algorithm/find_if.h> -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/replace.h b/libcxx/include/__algorithm/replace.h --- a/libcxx/include/__algorithm/replace.h +++ b/libcxx/include/__algorithm/replace.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_REPLACE_H #define _LIBCPP___ALGORITHM_REPLACE_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/replace_copy.h b/libcxx/include/__algorithm/replace_copy.h --- a/libcxx/include/__algorithm/replace_copy.h +++ b/libcxx/include/__algorithm/replace_copy.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_REPLACE_COPY_H #define _LIBCPP___ALGORITHM_REPLACE_COPY_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/replace_copy_if.h b/libcxx/include/__algorithm/replace_copy_if.h --- a/libcxx/include/__algorithm/replace_copy_if.h +++ b/libcxx/include/__algorithm/replace_copy_if.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_REPLACE_COPY_IF_H #define _LIBCPP___ALGORITHM_REPLACE_COPY_IF_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/replace_if.h b/libcxx/include/__algorithm/replace_if.h --- a/libcxx/include/__algorithm/replace_if.h +++ b/libcxx/include/__algorithm/replace_if.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_REPLACE_IF_H #define _LIBCPP___ALGORITHM_REPLACE_IF_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/reverse.h b/libcxx/include/__algorithm/reverse.h --- a/libcxx/include/__algorithm/reverse.h +++ b/libcxx/include/__algorithm/reverse.h @@ -11,7 +11,7 @@ #include <__algorithm/iter_swap.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/move.h> diff --git a/libcxx/include/__algorithm/reverse_copy.h b/libcxx/include/__algorithm/reverse_copy.h --- a/libcxx/include/__algorithm/reverse_copy.h +++ b/libcxx/include/__algorithm/reverse_copy.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_REVERSE_COPY_H #define _LIBCPP___ALGORITHM_REVERSE_COPY_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/rotate.h b/libcxx/include/__algorithm/rotate.h --- a/libcxx/include/__algorithm/rotate.h +++ b/libcxx/include/__algorithm/rotate.h @@ -13,7 +13,7 @@ #include <__algorithm/move.h> #include <__algorithm/move_backward.h> #include <__algorithm/swap_ranges.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_trivially_move_assignable.h> #include <__utility/move.h> diff --git a/libcxx/include/__algorithm/rotate_copy.h b/libcxx/include/__algorithm/rotate_copy.h --- a/libcxx/include/__algorithm/rotate_copy.h +++ b/libcxx/include/__algorithm/rotate_copy.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_ROTATE_COPY_H #include <__algorithm/copy.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/sample.h b/libcxx/include/__algorithm/sample.h --- a/libcxx/include/__algorithm/sample.h +++ b/libcxx/include/__algorithm/sample.h @@ -12,7 +12,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/min.h> #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/distance.h> #include <__iterator/iterator_traits.h> #include <__random/uniform_int_distribution.h> diff --git a/libcxx/include/__algorithm/search.h b/libcxx/include/__algorithm/search.h --- a/libcxx/include/__algorithm/search.h +++ b/libcxx/include/__algorithm/search.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/advance.h> diff --git a/libcxx/include/__algorithm/search_n.h b/libcxx/include/__algorithm/search_n.h --- a/libcxx/include/__algorithm/search_n.h +++ b/libcxx/include/__algorithm/search_n.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/advance.h> diff --git a/libcxx/include/__algorithm/set_difference.h b/libcxx/include/__algorithm/set_difference.h --- a/libcxx/include/__algorithm/set_difference.h +++ b/libcxx/include/__algorithm/set_difference.h @@ -13,7 +13,7 @@ #include <__algorithm/comp_ref_type.h> #include <__algorithm/copy.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__algorithm/set_intersection.h b/libcxx/include/__algorithm/set_intersection.h --- a/libcxx/include/__algorithm/set_intersection.h +++ b/libcxx/include/__algorithm/set_intersection.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/comp_ref_type.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__iterator/next.h> #include <__utility/move.h> diff --git a/libcxx/include/__algorithm/set_symmetric_difference.h b/libcxx/include/__algorithm/set_symmetric_difference.h --- a/libcxx/include/__algorithm/set_symmetric_difference.h +++ b/libcxx/include/__algorithm/set_symmetric_difference.h @@ -13,7 +13,7 @@ #include <__algorithm/comp_ref_type.h> #include <__algorithm/copy.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/move.h> #include <__utility/pair.h> diff --git a/libcxx/include/__algorithm/set_union.h b/libcxx/include/__algorithm/set_union.h --- a/libcxx/include/__algorithm/set_union.h +++ b/libcxx/include/__algorithm/set_union.h @@ -13,7 +13,7 @@ #include <__algorithm/comp_ref_type.h> #include <__algorithm/copy.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/move.h> #include <__utility/pair.h> diff --git a/libcxx/include/__algorithm/shift_left.h b/libcxx/include/__algorithm/shift_left.h --- a/libcxx/include/__algorithm/shift_left.h +++ b/libcxx/include/__algorithm/shift_left.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_SHIFT_LEFT_H #include <__algorithm/move.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/shift_right.h b/libcxx/include/__algorithm/shift_right.h --- a/libcxx/include/__algorithm/shift_right.h +++ b/libcxx/include/__algorithm/shift_right.h @@ -12,7 +12,7 @@ #include <__algorithm/move.h> #include <__algorithm/move_backward.h> #include <__algorithm/swap_ranges.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/swap.h> diff --git a/libcxx/include/__algorithm/shuffle.h b/libcxx/include/__algorithm/shuffle.h --- a/libcxx/include/__algorithm/shuffle.h +++ b/libcxx/include/__algorithm/shuffle.h @@ -10,8 +10,8 @@ #define _LIBCPP___ALGORITHM_SHUFFLE_H #include <__algorithm/iterator_operations.h> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__iterator/iterator_traits.h> #include <__random/uniform_int_distribution.h> #include <__utility/forward.h> diff --git a/libcxx/include/__algorithm/sift_down.h b/libcxx/include/__algorithm/sift_down.h --- a/libcxx/include/__algorithm/sift_down.h +++ b/libcxx/include/__algorithm/sift_down.h @@ -11,7 +11,7 @@ #include <__algorithm/iterator_operations.h> #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/move.h> diff --git a/libcxx/include/__algorithm/sort.h b/libcxx/include/__algorithm/sort.h --- a/libcxx/include/__algorithm/sort.h +++ b/libcxx/include/__algorithm/sort.h @@ -20,8 +20,8 @@ #include <__bit/blsr.h> #include <__bit/countl.h> #include <__bit/countr.h> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__debug_utils/randomize_range.h> #include <__functional/operations.h> #include <__functional/ranges_operations.h> diff --git a/libcxx/include/__algorithm/sort_heap.h b/libcxx/include/__algorithm/sort_heap.h --- a/libcxx/include/__algorithm/sort_heap.h +++ b/libcxx/include/__algorithm/sort_heap.h @@ -13,7 +13,7 @@ #include <__algorithm/comp_ref_type.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/pop_heap.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_copy_assignable.h> #include <__type_traits/is_copy_constructible.h> diff --git a/libcxx/include/__algorithm/stable_partition.h b/libcxx/include/__algorithm/stable_partition.h --- a/libcxx/include/__algorithm/stable_partition.h +++ b/libcxx/include/__algorithm/stable_partition.h @@ -11,7 +11,7 @@ #include <__algorithm/iterator_operations.h> #include <__algorithm/rotate.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/advance.h> #include <__iterator/distance.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__algorithm/stable_sort.h b/libcxx/include/__algorithm/stable_sort.h --- a/libcxx/include/__algorithm/stable_sort.h +++ b/libcxx/include/__algorithm/stable_sort.h @@ -14,7 +14,7 @@ #include <__algorithm/inplace_merge.h> #include <__algorithm/iterator_operations.h> #include <__algorithm/sort.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__memory/destruct_n.h> #include <__memory/temporary_buffer.h> diff --git a/libcxx/include/__algorithm/swap_ranges.h b/libcxx/include/__algorithm/swap_ranges.h --- a/libcxx/include/__algorithm/swap_ranges.h +++ b/libcxx/include/__algorithm/swap_ranges.h @@ -10,7 +10,7 @@ #define _LIBCPP___ALGORITHM_SWAP_RANGES_H #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #include <__utility/pair.h> diff --git a/libcxx/include/__algorithm/three_way_comp_ref_type.h b/libcxx/include/__algorithm/three_way_comp_ref_type.h --- a/libcxx/include/__algorithm/three_way_comp_ref_type.h +++ b/libcxx/include/__algorithm/three_way_comp_ref_type.h @@ -10,8 +10,8 @@ #define _LIBCPP___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H #include <__compare/ordering.h> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__utility/declval.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__algorithm/transform.h b/libcxx/include/__algorithm/transform.h --- a/libcxx/include/__algorithm/transform.h +++ b/libcxx/include/__algorithm/transform.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_TRANSFORM_H #define _LIBCPP___ALGORITHM_TRANSFORM_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__algorithm/uniform_random_bit_generator_adaptor.h b/libcxx/include/__algorithm/uniform_random_bit_generator_adaptor.h --- a/libcxx/include/__algorithm/uniform_random_bit_generator_adaptor.h +++ b/libcxx/include/__algorithm/uniform_random_bit_generator_adaptor.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H #define _LIBCPP___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #include <__type_traits/remove_cvref.h> diff --git a/libcxx/include/__algorithm/unique.h b/libcxx/include/__algorithm/unique.h --- a/libcxx/include/__algorithm/unique.h +++ b/libcxx/include/__algorithm/unique.h @@ -12,7 +12,7 @@ #include <__algorithm/adjacent_find.h> #include <__algorithm/comp.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/move.h> #include <__utility/pair.h> diff --git a/libcxx/include/__algorithm/unique_copy.h b/libcxx/include/__algorithm/unique_copy.h --- a/libcxx/include/__algorithm/unique_copy.h +++ b/libcxx/include/__algorithm/unique_copy.h @@ -11,7 +11,7 @@ #include <__algorithm/comp.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/conditional.h> #include <__type_traits/is_base_of.h> diff --git a/libcxx/include/__algorithm/unwrap_iter.h b/libcxx/include/__algorithm/unwrap_iter.h --- a/libcxx/include/__algorithm/unwrap_iter.h +++ b/libcxx/include/__algorithm/unwrap_iter.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ALGORITHM_UNWRAP_ITER_H #define _LIBCPP___ALGORITHM_UNWRAP_ITER_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__memory/pointer_traits.h> #include <__type_traits/enable_if.h> diff --git a/libcxx/include/__algorithm/unwrap_range.h b/libcxx/include/__algorithm/unwrap_range.h --- a/libcxx/include/__algorithm/unwrap_range.h +++ b/libcxx/include/__algorithm/unwrap_range.h @@ -11,7 +11,7 @@ #include <__algorithm/unwrap_iter.h> #include <__concepts/constructible.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/next.h> #include <__utility/declval.h> diff --git a/libcxx/include/__algorithm/upper_bound.h b/libcxx/include/__algorithm/upper_bound.h --- a/libcxx/include/__algorithm/upper_bound.h +++ b/libcxx/include/__algorithm/upper_bound.h @@ -12,7 +12,7 @@ #include <__algorithm/comp.h> #include <__algorithm/half_positive.h> #include <__algorithm/iterator_operations.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/invoke.h> #include <__iterator/advance.h> diff --git a/libcxx/include/__assert b/libcxx/include/__assert --- a/libcxx/include/__assert +++ b/libcxx/include/__assert @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ASSERT #define _LIBCPP___ASSERT -#include <__config> +#include <__config_dir/config.h> #include <__verbose_abort> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__atomic/aliases.h b/libcxx/include/__atomic/aliases.h --- a/libcxx/include/__atomic/aliases.h +++ b/libcxx/include/__atomic/aliases.h @@ -13,7 +13,7 @@ #include <__atomic/atomic_lock_free.h> #include <__atomic/contention_t.h> #include <__atomic/is_always_lock_free.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conditional.h> #include #include diff --git a/libcxx/include/__atomic/atomic.h b/libcxx/include/__atomic/atomic.h --- a/libcxx/include/__atomic/atomic.h +++ b/libcxx/include/__atomic/atomic.h @@ -13,7 +13,7 @@ #include <__atomic/check_memory_order.h> #include <__atomic/cxx_atomic_impl.h> #include <__atomic/memory_order.h> -#include <__config> +#include <__config_dir/config.h> #include <__memory/addressof.h> #include <__type_traits/is_function.h> #include <__type_traits/is_same.h> diff --git a/libcxx/include/__atomic/atomic_base.h b/libcxx/include/__atomic/atomic_base.h --- a/libcxx/include/__atomic/atomic_base.h +++ b/libcxx/include/__atomic/atomic_base.h @@ -14,8 +14,8 @@ #include <__atomic/cxx_atomic_impl.h> #include <__atomic/is_always_lock_free.h> #include <__atomic/memory_order.h> -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__memory/addressof.h> #include <__type_traits/is_integral.h> #include <__type_traits/is_nothrow_default_constructible.h> diff --git a/libcxx/include/__atomic/atomic_flag.h b/libcxx/include/__atomic/atomic_flag.h --- a/libcxx/include/__atomic/atomic_flag.h +++ b/libcxx/include/__atomic/atomic_flag.h @@ -14,7 +14,7 @@ #include <__atomic/cxx_atomic_impl.h> #include <__atomic/memory_order.h> #include <__chrono/duration.h> -#include <__config> +#include <__config_dir/config.h> #include <__threading_support> #include diff --git a/libcxx/include/__atomic/atomic_init.h b/libcxx/include/__atomic/atomic_init.h --- a/libcxx/include/__atomic/atomic_init.h +++ b/libcxx/include/__atomic/atomic_init.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ATOMIC_ATOMIC_INIT_H #define _LIBCPP___ATOMIC_ATOMIC_INIT_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__atomic/atomic_lock_free.h b/libcxx/include/__atomic/atomic_lock_free.h --- a/libcxx/include/__atomic/atomic_lock_free.h +++ b/libcxx/include/__atomic/atomic_lock_free.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ATOMIC_ATOMIC_LOCK_FREE_H #define _LIBCPP___ATOMIC_ATOMIC_LOCK_FREE_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__atomic/atomic_sync.h b/libcxx/include/__atomic/atomic_sync.h --- a/libcxx/include/__atomic/atomic_sync.h +++ b/libcxx/include/__atomic/atomic_sync.h @@ -12,9 +12,9 @@ #include <__atomic/contention_t.h> #include <__atomic/cxx_atomic_impl.h> #include <__atomic/memory_order.h> -#include <__availability> #include <__chrono/duration.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__memory/addressof.h> #include <__thread/poll_with_backoff.h> #include <__threading_support> diff --git a/libcxx/include/__atomic/check_memory_order.h b/libcxx/include/__atomic/check_memory_order.h --- a/libcxx/include/__atomic/check_memory_order.h +++ b/libcxx/include/__atomic/check_memory_order.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ATOMIC_CHECK_MEMORY_ORDER_H #define _LIBCPP___ATOMIC_CHECK_MEMORY_ORDER_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__atomic/contention_t.h b/libcxx/include/__atomic/contention_t.h --- a/libcxx/include/__atomic/contention_t.h +++ b/libcxx/include/__atomic/contention_t.h @@ -10,7 +10,7 @@ #define _LIBCPP___ATOMIC_CONTENTION_T_H #include <__atomic/cxx_atomic_impl.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__atomic/cxx_atomic_impl.h b/libcxx/include/__atomic/cxx_atomic_impl.h --- a/libcxx/include/__atomic/cxx_atomic_impl.h +++ b/libcxx/include/__atomic/cxx_atomic_impl.h @@ -11,7 +11,7 @@ #include <__atomic/is_always_lock_free.h> #include <__atomic/memory_order.h> -#include <__config> +#include <__config_dir/config.h> #include <__memory/addressof.h> #include <__type_traits/conditional.h> #include <__type_traits/is_assignable.h> diff --git a/libcxx/include/__atomic/fence.h b/libcxx/include/__atomic/fence.h --- a/libcxx/include/__atomic/fence.h +++ b/libcxx/include/__atomic/fence.h @@ -11,7 +11,7 @@ #include <__atomic/cxx_atomic_impl.h> #include <__atomic/memory_order.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__atomic/is_always_lock_free.h b/libcxx/include/__atomic/is_always_lock_free.h --- a/libcxx/include/__atomic/is_always_lock_free.h +++ b/libcxx/include/__atomic/is_always_lock_free.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ATOMIC_IS_ALWAYS_LOCK_FREE_H #define _LIBCPP___ATOMIC_IS_ALWAYS_LOCK_FREE_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__atomic/kill_dependency.h b/libcxx/include/__atomic/kill_dependency.h --- a/libcxx/include/__atomic/kill_dependency.h +++ b/libcxx/include/__atomic/kill_dependency.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ATOMIC_KILL_DEPENDENCY_H #define _LIBCPP___ATOMIC_KILL_DEPENDENCY_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__atomic/memory_order.h b/libcxx/include/__atomic/memory_order.h --- a/libcxx/include/__atomic/memory_order.h +++ b/libcxx/include/__atomic/memory_order.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___ATOMIC_MEMORY_ORDER_H #define _LIBCPP___ATOMIC_MEMORY_ORDER_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_same.h> #include <__type_traits/underlying_type.h> diff --git a/libcxx/include/__bit/bit_cast.h b/libcxx/include/__bit/bit_cast.h --- a/libcxx/include/__bit/bit_cast.h +++ b/libcxx/include/__bit/bit_cast.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___BIT_BIT_CAST_H #define _LIBCPP___BIT_BIT_CAST_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_trivially_copyable.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__bit/bit_ceil.h b/libcxx/include/__bit/bit_ceil.h --- a/libcxx/include/__bit/bit_ceil.h +++ b/libcxx/include/__bit/bit_ceil.h @@ -12,7 +12,7 @@ #include <__assert> #include <__bit/countl.h> #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__bit/bit_floor.h b/libcxx/include/__bit/bit_floor.h --- a/libcxx/include/__bit/bit_floor.h +++ b/libcxx/include/__bit/bit_floor.h @@ -11,7 +11,7 @@ #include <__bit/bit_log2.h> #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__bit/bit_log2.h b/libcxx/include/__bit/bit_log2.h --- a/libcxx/include/__bit/bit_log2.h +++ b/libcxx/include/__bit/bit_log2.h @@ -11,7 +11,7 @@ #include <__bit/countl.h> #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__bit/bit_width.h b/libcxx/include/__bit/bit_width.h --- a/libcxx/include/__bit/bit_width.h +++ b/libcxx/include/__bit/bit_width.h @@ -11,7 +11,7 @@ #include <__bit/bit_log2.h> #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__bit/blsr.h b/libcxx/include/__bit/blsr.h --- a/libcxx/include/__bit/blsr.h +++ b/libcxx/include/__bit/blsr.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___BIT_BLSR_H #define _LIBCPP___BIT_BLSR_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__bit/byteswap.h b/libcxx/include/__bit/byteswap.h --- a/libcxx/include/__bit/byteswap.h +++ b/libcxx/include/__bit/byteswap.h @@ -11,7 +11,7 @@ #define _LIBCPP___BIT_BYTESWAP_H #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__bit/countl.h b/libcxx/include/__bit/countl.h --- a/libcxx/include/__bit/countl.h +++ b/libcxx/include/__bit/countl.h @@ -11,7 +11,7 @@ #include <__bit/rotate.h> #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_unsigned_integer.h> #include diff --git a/libcxx/include/__bit/countr.h b/libcxx/include/__bit/countr.h --- a/libcxx/include/__bit/countr.h +++ b/libcxx/include/__bit/countr.h @@ -11,7 +11,7 @@ #include <__bit/rotate.h> #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__bit/endian.h b/libcxx/include/__bit/endian.h --- a/libcxx/include/__bit/endian.h +++ b/libcxx/include/__bit/endian.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___BIT_ENDIAN_H #define _LIBCPP___BIT_ENDIAN_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__bit/has_single_bit.h b/libcxx/include/__bit/has_single_bit.h --- a/libcxx/include/__bit/has_single_bit.h +++ b/libcxx/include/__bit/has_single_bit.h @@ -10,7 +10,7 @@ #define _LIBCPP___BIT_HAS_SINGLE_BIT_H #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__bit/popcount.h b/libcxx/include/__bit/popcount.h --- a/libcxx/include/__bit/popcount.h +++ b/libcxx/include/__bit/popcount.h @@ -11,7 +11,7 @@ #include <__bit/rotate.h> #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__bit/rotate.h b/libcxx/include/__bit/rotate.h --- a/libcxx/include/__bit/rotate.h +++ b/libcxx/include/__bit/rotate.h @@ -10,7 +10,7 @@ #define _LIBCPP___BIT_ROTATE_H #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_unsigned_integer.h> #include diff --git a/libcxx/include/__bit_reference b/libcxx/include/__bit_reference --- a/libcxx/include/__bit_reference +++ b/libcxx/include/__bit_reference @@ -15,7 +15,7 @@ #include <__algorithm/min.h> #include <__bit/countr.h> #include <__bit/popcount.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__memory/construct_at.h> #include <__memory/pointer_traits.h> diff --git a/libcxx/include/__charconv/chars_format.h b/libcxx/include/__charconv/chars_format.h --- a/libcxx/include/__charconv/chars_format.h +++ b/libcxx/include/__charconv/chars_format.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___CHARCONV_CHARS_FORMAT_H #define _LIBCPP___CHARCONV_CHARS_FORMAT_H -#include <__config> +#include <__config_dir/config.h> #include <__utility/to_underlying.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__charconv/from_chars_integral.h b/libcxx/include/__charconv/from_chars_integral.h --- a/libcxx/include/__charconv/from_chars_integral.h +++ b/libcxx/include/__charconv/from_chars_integral.h @@ -13,7 +13,7 @@ #include <__algorithm/copy_n.h> #include <__charconv/from_chars_result.h> #include <__charconv/traits.h> -#include <__config> +#include <__config_dir/config.h> #include <__memory/addressof.h> #include <__system_error/errc.h> #include <__type_traits/enable_if.h> diff --git a/libcxx/include/__charconv/from_chars_result.h b/libcxx/include/__charconv/from_chars_result.h --- a/libcxx/include/__charconv/from_chars_result.h +++ b/libcxx/include/__charconv/from_chars_result.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___CHARCONV_FROM_CHARS_RESULT_H #define _LIBCPP___CHARCONV_FROM_CHARS_RESULT_H -#include <__config> +#include <__config_dir/config.h> #include <__system_error/errc.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__charconv/tables.h b/libcxx/include/__charconv/tables.h --- a/libcxx/include/__charconv/tables.h +++ b/libcxx/include/__charconv/tables.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___CHARCONV_TABLES #define _LIBCPP___CHARCONV_TABLES -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__charconv/to_chars.h b/libcxx/include/__charconv/to_chars.h --- a/libcxx/include/__charconv/to_chars.h +++ b/libcxx/include/__charconv/to_chars.h @@ -12,7 +12,7 @@ #include <__charconv/to_chars_floating_point.h> #include <__charconv/to_chars_integral.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__charconv/to_chars_base_10.h b/libcxx/include/__charconv/to_chars_base_10.h --- a/libcxx/include/__charconv/to_chars_base_10.h +++ b/libcxx/include/__charconv/to_chars_base_10.h @@ -12,7 +12,7 @@ #include <__algorithm/copy_n.h> #include <__charconv/tables.h> -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__charconv/to_chars_floating_point.h b/libcxx/include/__charconv/to_chars_floating_point.h --- a/libcxx/include/__charconv/to_chars_floating_point.h +++ b/libcxx/include/__charconv/to_chars_floating_point.h @@ -10,10 +10,10 @@ #ifndef _LIBCPP___CHARCONV_TO_CHARS_FLOATING_POINT_H #define _LIBCPP___CHARCONV_TO_CHARS_FLOATING_POINT_H -#include <__availability> #include <__charconv/chars_format.h> #include <__charconv/to_chars_result.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__charconv/to_chars_integral.h b/libcxx/include/__charconv/to_chars_integral.h --- a/libcxx/include/__charconv/to_chars_integral.h +++ b/libcxx/include/__charconv/to_chars_integral.h @@ -16,7 +16,7 @@ #include <__charconv/to_chars_base_10.h> #include <__charconv/to_chars_result.h> #include <__charconv/traits.h> -#include <__config> +#include <__config_dir/config.h> #include <__system_error/errc.h> #include <__type_traits/enable_if.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__charconv/to_chars_result.h b/libcxx/include/__charconv/to_chars_result.h --- a/libcxx/include/__charconv/to_chars_result.h +++ b/libcxx/include/__charconv/to_chars_result.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___CHARCONV_TO_CHARS_RESULT_H #define _LIBCPP___CHARCONV_TO_CHARS_RESULT_H -#include <__config> +#include <__config_dir/config.h> #include <__system_error/errc.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__charconv/traits.h b/libcxx/include/__charconv/traits.h --- a/libcxx/include/__charconv/traits.h +++ b/libcxx/include/__charconv/traits.h @@ -13,7 +13,7 @@ #include <__bit/countl.h> #include <__charconv/tables.h> #include <__charconv/to_chars_base_10.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/enable_if.h> #include <__type_traits/is_unsigned.h> #include diff --git a/libcxx/include/__chrono/calendar.h b/libcxx/include/__chrono/calendar.h --- a/libcxx/include/__chrono/calendar.h +++ b/libcxx/include/__chrono/calendar.h @@ -12,7 +12,7 @@ #include <__chrono/duration.h> #include <__chrono/time_point.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__chrono/concepts.h b/libcxx/include/__chrono/concepts.h --- a/libcxx/include/__chrono/concepts.h +++ b/libcxx/include/__chrono/concepts.h @@ -12,7 +12,7 @@ #include <__chrono/hh_mm_ss.h> #include <__chrono/time_point.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_specialization.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__chrono/convert_to_timespec.h b/libcxx/include/__chrono/convert_to_timespec.h --- a/libcxx/include/__chrono/convert_to_timespec.h +++ b/libcxx/include/__chrono/convert_to_timespec.h @@ -11,7 +11,7 @@ #define _LIBCPP___CHRONO_CONVERT_TO_TIMESPEC_H #include <__chrono/duration.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__chrono/convert_to_tm.h b/libcxx/include/__chrono/convert_to_tm.h --- a/libcxx/include/__chrono/convert_to_tm.h +++ b/libcxx/include/__chrono/convert_to_tm.h @@ -28,7 +28,7 @@ #include <__chrono/year_month_day.h> #include <__chrono/year_month_weekday.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__format/format_error.h> #include <__memory/addressof.h> #include diff --git a/libcxx/include/__chrono/day.h b/libcxx/include/__chrono/day.h --- a/libcxx/include/__chrono/day.h +++ b/libcxx/include/__chrono/day.h @@ -11,7 +11,7 @@ #define _LIBCPP___CHRONO_DAY_H #include <__chrono/duration.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__chrono/duration.h b/libcxx/include/__chrono/duration.h --- a/libcxx/include/__chrono/duration.h +++ b/libcxx/include/__chrono/duration.h @@ -12,7 +12,7 @@ #include <__compare/ordering.h> #include <__compare/three_way_comparable.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/common_type.h> #include <__type_traits/enable_if.h> #include <__type_traits/is_convertible.h> diff --git a/libcxx/include/__chrono/file_clock.h b/libcxx/include/__chrono/file_clock.h --- a/libcxx/include/__chrono/file_clock.h +++ b/libcxx/include/__chrono/file_clock.h @@ -10,11 +10,11 @@ #ifndef _LIBCPP___CHRONO_FILE_CLOCK_H #define _LIBCPP___CHRONO_FILE_CLOCK_H -#include <__availability> #include <__chrono/duration.h> #include <__chrono/system_clock.h> #include <__chrono/time_point.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__chrono/formatter.h b/libcxx/include/__chrono/formatter.h --- a/libcxx/include/__chrono/formatter.h +++ b/libcxx/include/__chrono/formatter.h @@ -32,7 +32,7 @@ #include <__chrono/year_month_weekday.h> #include <__concepts/arithmetic.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__format/concepts.h> #include <__format/format_error.h> #include <__format/format_functions.h> diff --git a/libcxx/include/__chrono/hh_mm_ss.h b/libcxx/include/__chrono/hh_mm_ss.h --- a/libcxx/include/__chrono/hh_mm_ss.h +++ b/libcxx/include/__chrono/hh_mm_ss.h @@ -12,7 +12,7 @@ #include <__chrono/duration.h> #include <__chrono/time_point.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/common_type.h> #include diff --git a/libcxx/include/__chrono/high_resolution_clock.h b/libcxx/include/__chrono/high_resolution_clock.h --- a/libcxx/include/__chrono/high_resolution_clock.h +++ b/libcxx/include/__chrono/high_resolution_clock.h @@ -12,7 +12,7 @@ #include <__chrono/steady_clock.h> #include <__chrono/system_clock.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__chrono/literals.h b/libcxx/include/__chrono/literals.h --- a/libcxx/include/__chrono/literals.h +++ b/libcxx/include/__chrono/literals.h @@ -12,7 +12,7 @@ #include <__chrono/day.h> #include <__chrono/year.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__chrono/month.h b/libcxx/include/__chrono/month.h --- a/libcxx/include/__chrono/month.h +++ b/libcxx/include/__chrono/month.h @@ -11,7 +11,7 @@ #define _LIBCPP___CHRONO_MONTH_H #include <__chrono/duration.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__chrono/month_weekday.h b/libcxx/include/__chrono/month_weekday.h --- a/libcxx/include/__chrono/month_weekday.h +++ b/libcxx/include/__chrono/month_weekday.h @@ -12,7 +12,7 @@ #include <__chrono/month.h> #include <__chrono/weekday.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__chrono/monthday.h b/libcxx/include/__chrono/monthday.h --- a/libcxx/include/__chrono/monthday.h +++ b/libcxx/include/__chrono/monthday.h @@ -13,7 +13,7 @@ #include <__chrono/calendar.h> #include <__chrono/day.h> #include <__chrono/month.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__chrono/ostream.h b/libcxx/include/__chrono/ostream.h --- a/libcxx/include/__chrono/ostream.h +++ b/libcxx/include/__chrono/ostream.h @@ -26,7 +26,7 @@ #include <__chrono/year_month_day.h> #include <__chrono/year_month_weekday.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__format/format_functions.h> #include #include diff --git a/libcxx/include/__chrono/parser_std_format_spec.h b/libcxx/include/__chrono/parser_std_format_spec.h --- a/libcxx/include/__chrono/parser_std_format_spec.h +++ b/libcxx/include/__chrono/parser_std_format_spec.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___CHRONO_PARSER_STD_FORMAT_SPEC_H #define _LIBCPP___CHRONO_PARSER_STD_FORMAT_SPEC_H -#include <__config> +#include <__config_dir/config.h> #include <__format/concepts.h> #include <__format/format_error.h> #include <__format/format_parse_context.h> diff --git a/libcxx/include/__chrono/statically_widen.h b/libcxx/include/__chrono/statically_widen.h --- a/libcxx/include/__chrono/statically_widen.h +++ b/libcxx/include/__chrono/statically_widen.h @@ -13,7 +13,7 @@ // Implements the STATICALLY-WIDEN exposition-only function. ([time.general]/2) #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__format/concepts.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__chrono/steady_clock.h b/libcxx/include/__chrono/steady_clock.h --- a/libcxx/include/__chrono/steady_clock.h +++ b/libcxx/include/__chrono/steady_clock.h @@ -12,7 +12,7 @@ #include <__chrono/duration.h> #include <__chrono/time_point.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__chrono/system_clock.h b/libcxx/include/__chrono/system_clock.h --- a/libcxx/include/__chrono/system_clock.h +++ b/libcxx/include/__chrono/system_clock.h @@ -12,7 +12,7 @@ #include <__chrono/duration.h> #include <__chrono/time_point.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__chrono/time_point.h b/libcxx/include/__chrono/time_point.h --- a/libcxx/include/__chrono/time_point.h +++ b/libcxx/include/__chrono/time_point.h @@ -13,7 +13,7 @@ #include <__chrono/duration.h> #include <__compare/ordering.h> #include <__compare/three_way_comparable.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/common_type.h> #include <__type_traits/enable_if.h> #include <__type_traits/is_convertible.h> diff --git a/libcxx/include/__chrono/weekday.h b/libcxx/include/__chrono/weekday.h --- a/libcxx/include/__chrono/weekday.h +++ b/libcxx/include/__chrono/weekday.h @@ -14,7 +14,7 @@ #include <__chrono/duration.h> #include <__chrono/system_clock.h> #include <__chrono/time_point.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__chrono/year.h b/libcxx/include/__chrono/year.h --- a/libcxx/include/__chrono/year.h +++ b/libcxx/include/__chrono/year.h @@ -11,7 +11,7 @@ #define _LIBCPP___CHRONO_YEAR_H #include <__chrono/duration.h> -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__chrono/year_month.h b/libcxx/include/__chrono/year_month.h --- a/libcxx/include/__chrono/year_month.h +++ b/libcxx/include/__chrono/year_month.h @@ -13,7 +13,7 @@ #include <__chrono/duration.h> #include <__chrono/month.h> #include <__chrono/year.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__chrono/year_month_day.h b/libcxx/include/__chrono/year_month_day.h --- a/libcxx/include/__chrono/year_month_day.h +++ b/libcxx/include/__chrono/year_month_day.h @@ -19,7 +19,7 @@ #include <__chrono/time_point.h> #include <__chrono/year.h> #include <__chrono/year_month.h> -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__chrono/year_month_weekday.h b/libcxx/include/__chrono/year_month_weekday.h --- a/libcxx/include/__chrono/year_month_weekday.h +++ b/libcxx/include/__chrono/year_month_weekday.h @@ -21,7 +21,7 @@ #include <__chrono/year.h> #include <__chrono/year_month.h> #include <__chrono/year_month_day.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__compare/common_comparison_category.h b/libcxx/include/__compare/common_comparison_category.h --- a/libcxx/include/__compare/common_comparison_category.h +++ b/libcxx/include/__compare/common_comparison_category.h @@ -10,7 +10,7 @@ #define _LIBCPP___COMPARE_COMMON_COMPARISON_CATEGORY_H #include <__compare/ordering.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_same.h> #include diff --git a/libcxx/include/__compare/compare_partial_order_fallback.h b/libcxx/include/__compare/compare_partial_order_fallback.h --- a/libcxx/include/__compare/compare_partial_order_fallback.h +++ b/libcxx/include/__compare/compare_partial_order_fallback.h @@ -11,7 +11,7 @@ #include <__compare/ordering.h> #include <__compare/partial_order.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/decay.h> #include <__type_traits/is_same.h> #include <__utility/forward.h> diff --git a/libcxx/include/__compare/compare_strong_order_fallback.h b/libcxx/include/__compare/compare_strong_order_fallback.h --- a/libcxx/include/__compare/compare_strong_order_fallback.h +++ b/libcxx/include/__compare/compare_strong_order_fallback.h @@ -11,7 +11,7 @@ #include <__compare/ordering.h> #include <__compare/strong_order.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/decay.h> #include <__type_traits/is_same.h> #include <__utility/forward.h> diff --git a/libcxx/include/__compare/compare_three_way.h b/libcxx/include/__compare/compare_three_way.h --- a/libcxx/include/__compare/compare_three_way.h +++ b/libcxx/include/__compare/compare_three_way.h @@ -11,7 +11,7 @@ #define _LIBCPP___COMPARE_COMPARE_THREE_WAY_H #include <__compare/three_way_comparable.h> -#include <__config> +#include <__config_dir/config.h> #include <__utility/forward.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__compare/compare_three_way_result.h b/libcxx/include/__compare/compare_three_way_result.h --- a/libcxx/include/__compare/compare_three_way_result.h +++ b/libcxx/include/__compare/compare_three_way_result.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___COMPARE_COMPARE_THREE_WAY_RESULT_H #define _LIBCPP___COMPARE_COMPARE_THREE_WAY_RESULT_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/make_const_lvalue_ref.h> #include <__utility/declval.h> diff --git a/libcxx/include/__compare/compare_weak_order_fallback.h b/libcxx/include/__compare/compare_weak_order_fallback.h --- a/libcxx/include/__compare/compare_weak_order_fallback.h +++ b/libcxx/include/__compare/compare_weak_order_fallback.h @@ -11,7 +11,7 @@ #include <__compare/ordering.h> #include <__compare/weak_order.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/decay.h> #include <__type_traits/is_same.h> #include <__utility/forward.h> diff --git a/libcxx/include/__compare/is_eq.h b/libcxx/include/__compare/is_eq.h --- a/libcxx/include/__compare/is_eq.h +++ b/libcxx/include/__compare/is_eq.h @@ -10,7 +10,7 @@ #define _LIBCPP___COMPARE_IS_EQ_H #include <__compare/ordering.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__compare/ordering.h b/libcxx/include/__compare/ordering.h --- a/libcxx/include/__compare/ordering.h +++ b/libcxx/include/__compare/ordering.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___COMPARE_ORDERING_H #define _LIBCPP___COMPARE_ORDERING_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/enable_if.h> #include <__type_traits/is_same.h> diff --git a/libcxx/include/__compare/partial_order.h b/libcxx/include/__compare/partial_order.h --- a/libcxx/include/__compare/partial_order.h +++ b/libcxx/include/__compare/partial_order.h @@ -12,7 +12,7 @@ #include <__compare/compare_three_way.h> #include <__compare/ordering.h> #include <__compare/weak_order.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/decay.h> #include <__type_traits/is_same.h> #include <__utility/forward.h> diff --git a/libcxx/include/__compare/strong_order.h b/libcxx/include/__compare/strong_order.h --- a/libcxx/include/__compare/strong_order.h +++ b/libcxx/include/__compare/strong_order.h @@ -12,7 +12,7 @@ #include <__bit/bit_cast.h> #include <__compare/compare_three_way.h> #include <__compare/ordering.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conditional.h> #include <__type_traits/decay.h> #include <__utility/forward.h> diff --git a/libcxx/include/__compare/synth_three_way.h b/libcxx/include/__compare/synth_three_way.h --- a/libcxx/include/__compare/synth_three_way.h +++ b/libcxx/include/__compare/synth_three_way.h @@ -12,7 +12,7 @@ #include <__compare/ordering.h> #include <__compare/three_way_comparable.h> #include <__concepts/boolean_testable.h> -#include <__config> +#include <__config_dir/config.h> #include <__utility/declval.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__compare/three_way_comparable.h b/libcxx/include/__compare/three_way_comparable.h --- a/libcxx/include/__compare/three_way_comparable.h +++ b/libcxx/include/__compare/three_way_comparable.h @@ -15,7 +15,7 @@ #include <__concepts/equality_comparable.h> #include <__concepts/same_as.h> #include <__concepts/totally_ordered.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/common_reference.h> #include <__type_traits/make_const_lvalue_ref.h> diff --git a/libcxx/include/__compare/weak_order.h b/libcxx/include/__compare/weak_order.h --- a/libcxx/include/__compare/weak_order.h +++ b/libcxx/include/__compare/weak_order.h @@ -12,7 +12,7 @@ #include <__compare/compare_three_way.h> #include <__compare/ordering.h> #include <__compare/strong_order.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/decay.h> #include <__utility/forward.h> #include <__utility/priority_tag.h> diff --git a/libcxx/include/__concepts/arithmetic.h b/libcxx/include/__concepts/arithmetic.h --- a/libcxx/include/__concepts/arithmetic.h +++ b/libcxx/include/__concepts/arithmetic.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___CONCEPTS_ARITHMETIC_H #define _LIBCPP___CONCEPTS_ARITHMETIC_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_floating_point.h> #include <__type_traits/is_integral.h> #include <__type_traits/is_signed.h> diff --git a/libcxx/include/__concepts/assignable.h b/libcxx/include/__concepts/assignable.h --- a/libcxx/include/__concepts/assignable.h +++ b/libcxx/include/__concepts/assignable.h @@ -11,7 +11,7 @@ #include <__concepts/common_reference_with.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_reference.h> #include <__type_traits/make_const_lvalue_ref.h> #include <__utility/forward.h> diff --git a/libcxx/include/__concepts/boolean_testable.h b/libcxx/include/__concepts/boolean_testable.h --- a/libcxx/include/__concepts/boolean_testable.h +++ b/libcxx/include/__concepts/boolean_testable.h @@ -10,7 +10,7 @@ #define _LIBCPP___CONCEPTS_BOOLEAN_TESTABLE_H #include <__concepts/convertible_to.h> -#include <__config> +#include <__config_dir/config.h> #include <__utility/forward.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__concepts/class_or_enum.h b/libcxx/include/__concepts/class_or_enum.h --- a/libcxx/include/__concepts/class_or_enum.h +++ b/libcxx/include/__concepts/class_or_enum.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___CONCEPTS_CLASS_OR_ENUM_H #define _LIBCPP___CONCEPTS_CLASS_OR_ENUM_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_class.h> #include <__type_traits/is_enum.h> #include <__type_traits/is_union.h> diff --git a/libcxx/include/__concepts/common_reference_with.h b/libcxx/include/__concepts/common_reference_with.h --- a/libcxx/include/__concepts/common_reference_with.h +++ b/libcxx/include/__concepts/common_reference_with.h @@ -11,7 +11,7 @@ #include <__concepts/convertible_to.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/common_reference.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__concepts/common_with.h b/libcxx/include/__concepts/common_with.h --- a/libcxx/include/__concepts/common_with.h +++ b/libcxx/include/__concepts/common_with.h @@ -11,7 +11,7 @@ #include <__concepts/common_reference_with.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_lvalue_reference.h> #include <__type_traits/common_reference.h> #include <__type_traits/common_type.h> diff --git a/libcxx/include/__concepts/constructible.h b/libcxx/include/__concepts/constructible.h --- a/libcxx/include/__concepts/constructible.h +++ b/libcxx/include/__concepts/constructible.h @@ -11,7 +11,7 @@ #include <__concepts/convertible_to.h> #include <__concepts/destructible.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_constructible.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__concepts/convertible_to.h b/libcxx/include/__concepts/convertible_to.h --- a/libcxx/include/__concepts/convertible_to.h +++ b/libcxx/include/__concepts/convertible_to.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___CONCEPTS_CONVERTIBLE_TO_H #define _LIBCPP___CONCEPTS_CONVERTIBLE_TO_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_convertible.h> #include <__utility/declval.h> diff --git a/libcxx/include/__concepts/copyable.h b/libcxx/include/__concepts/copyable.h --- a/libcxx/include/__concepts/copyable.h +++ b/libcxx/include/__concepts/copyable.h @@ -12,7 +12,7 @@ #include <__concepts/assignable.h> #include <__concepts/constructible.h> #include <__concepts/movable.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__concepts/derived_from.h b/libcxx/include/__concepts/derived_from.h --- a/libcxx/include/__concepts/derived_from.h +++ b/libcxx/include/__concepts/derived_from.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___CONCEPTS_DERIVED_FROM_H #define _LIBCPP___CONCEPTS_DERIVED_FROM_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_base_of.h> #include <__type_traits/is_convertible.h> diff --git a/libcxx/include/__concepts/destructible.h b/libcxx/include/__concepts/destructible.h --- a/libcxx/include/__concepts/destructible.h +++ b/libcxx/include/__concepts/destructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___CONCEPTS_DESTRUCTIBLE_H #define _LIBCPP___CONCEPTS_DESTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_nothrow_destructible.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__concepts/different_from.h b/libcxx/include/__concepts/different_from.h --- a/libcxx/include/__concepts/different_from.h +++ b/libcxx/include/__concepts/different_from.h @@ -10,7 +10,7 @@ #define _LIBCPP___CONCEPTS_DIFFERENT_FROM_H #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/remove_cvref.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__concepts/equality_comparable.h b/libcxx/include/__concepts/equality_comparable.h --- a/libcxx/include/__concepts/equality_comparable.h +++ b/libcxx/include/__concepts/equality_comparable.h @@ -11,7 +11,7 @@ #include <__concepts/boolean_testable.h> #include <__concepts/common_reference_with.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/common_reference.h> #include <__type_traits/make_const_lvalue_ref.h> diff --git a/libcxx/include/__concepts/invocable.h b/libcxx/include/__concepts/invocable.h --- a/libcxx/include/__concepts/invocable.h +++ b/libcxx/include/__concepts/invocable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___CONCEPTS_INVOCABLE_H #define _LIBCPP___CONCEPTS_INVOCABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #include <__utility/forward.h> diff --git a/libcxx/include/__concepts/movable.h b/libcxx/include/__concepts/movable.h --- a/libcxx/include/__concepts/movable.h +++ b/libcxx/include/__concepts/movable.h @@ -12,7 +12,7 @@ #include <__concepts/assignable.h> #include <__concepts/constructible.h> #include <__concepts/swappable.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_object.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__concepts/predicate.h b/libcxx/include/__concepts/predicate.h --- a/libcxx/include/__concepts/predicate.h +++ b/libcxx/include/__concepts/predicate.h @@ -11,7 +11,7 @@ #include <__concepts/boolean_testable.h> #include <__concepts/invocable.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__concepts/regular.h b/libcxx/include/__concepts/regular.h --- a/libcxx/include/__concepts/regular.h +++ b/libcxx/include/__concepts/regular.h @@ -11,7 +11,7 @@ #include <__concepts/equality_comparable.h> #include <__concepts/semiregular.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__concepts/relation.h b/libcxx/include/__concepts/relation.h --- a/libcxx/include/__concepts/relation.h +++ b/libcxx/include/__concepts/relation.h @@ -10,7 +10,7 @@ #define _LIBCPP___CONCEPTS_RELATION_H #include <__concepts/predicate.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__concepts/same_as.h b/libcxx/include/__concepts/same_as.h --- a/libcxx/include/__concepts/same_as.h +++ b/libcxx/include/__concepts/same_as.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___CONCEPTS_SAME_AS_H #define _LIBCPP___CONCEPTS_SAME_AS_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_same.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__concepts/semiregular.h b/libcxx/include/__concepts/semiregular.h --- a/libcxx/include/__concepts/semiregular.h +++ b/libcxx/include/__concepts/semiregular.h @@ -11,7 +11,7 @@ #include <__concepts/constructible.h> #include <__concepts/copyable.h> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__concepts/swappable.h b/libcxx/include/__concepts/swappable.h --- a/libcxx/include/__concepts/swappable.h +++ b/libcxx/include/__concepts/swappable.h @@ -13,7 +13,7 @@ #include <__concepts/class_or_enum.h> #include <__concepts/common_reference_with.h> #include <__concepts/constructible.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/extent.h> #include <__type_traits/is_nothrow_move_assignable.h> #include <__type_traits/is_nothrow_move_constructible.h> diff --git a/libcxx/include/__concepts/totally_ordered.h b/libcxx/include/__concepts/totally_ordered.h --- a/libcxx/include/__concepts/totally_ordered.h +++ b/libcxx/include/__concepts/totally_ordered.h @@ -11,7 +11,7 @@ #include <__concepts/boolean_testable.h> #include <__concepts/equality_comparable.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/common_reference.h> #include <__type_traits/make_const_lvalue_ref.h> diff --git a/libcxx/include/__condition_variable/condition_variable.h b/libcxx/include/__condition_variable/condition_variable.h --- a/libcxx/include/__condition_variable/condition_variable.h +++ b/libcxx/include/__condition_variable/condition_variable.h @@ -12,7 +12,7 @@ #include <__chrono/steady_clock.h> #include <__chrono/system_clock.h> #include <__chrono/time_point.h> -#include <__config> +#include <__config_dir/config.h> #include <__mutex/mutex.h> #include <__mutex/unique_lock.h> #include <__system_error/system_error.h> diff --git a/libcxx/include/__availability b/libcxx/include/__config_dir/availability.h rename from libcxx/include/__availability rename to libcxx/include/__config_dir/availability.h --- a/libcxx/include/__availability +++ b/libcxx/include/__config_dir/availability.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___AVAILABILITY #define _LIBCPP___AVAILABILITY -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__config b/libcxx/include/__config_dir/config.h rename from libcxx/include/__config rename to libcxx/include/__config_dir/config.h diff --git a/libcxx/include/__debug b/libcxx/include/__config_dir/debug.h rename from libcxx/include/__debug rename to libcxx/include/__config_dir/debug.h --- a/libcxx/include/__debug +++ b/libcxx/include/__config_dir/debug.h @@ -11,7 +11,7 @@ #define _LIBCPP___DEBUG #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_constant_evaluated.h> #include diff --git a/libcxx/include/__coroutine/coroutine_handle.h b/libcxx/include/__coroutine/coroutine_handle.h --- a/libcxx/include/__coroutine/coroutine_handle.h +++ b/libcxx/include/__coroutine/coroutine_handle.h @@ -10,7 +10,7 @@ #define _LIBCPP___COROUTINE_COROUTINE_HANDLE_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__functional/hash.h> #include <__memory/addressof.h> #include <__type_traits/remove_cv.h> diff --git a/libcxx/include/__coroutine/coroutine_traits.h b/libcxx/include/__coroutine/coroutine_traits.h --- a/libcxx/include/__coroutine/coroutine_traits.h +++ b/libcxx/include/__coroutine/coroutine_traits.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___COROUTINE_COROUTINE_TRAITS_H #define _LIBCPP___COROUTINE_COROUTINE_TRAITS_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/void_t.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__coroutine/noop_coroutine_handle.h b/libcxx/include/__coroutine/noop_coroutine_handle.h --- a/libcxx/include/__coroutine/noop_coroutine_handle.h +++ b/libcxx/include/__coroutine/noop_coroutine_handle.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___COROUTINE_NOOP_COROUTINE_HANDLE_H #define _LIBCPP___COROUTINE_NOOP_COROUTINE_HANDLE_H -#include <__config> +#include <__config_dir/config.h> #include <__coroutine/coroutine_handle.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__coroutine/trivial_awaitables.h b/libcxx/include/__coroutine/trivial_awaitables.h --- a/libcxx/include/__coroutine/trivial_awaitables.h +++ b/libcxx/include/__coroutine/trivial_awaitables.h @@ -9,7 +9,7 @@ #ifndef __LIBCPP___COROUTINE_TRIVIAL_AWAITABLES_H #define __LIBCPP___COROUTINE_TRIVIAL_AWAITABLES_H -#include <__config> +#include <__config_dir/config.h> #include <__coroutine/coroutine_handle.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__debug_utils/randomize_range.h b/libcxx/include/__debug_utils/randomize_range.h --- a/libcxx/include/__debug_utils/randomize_range.h +++ b/libcxx/include/__debug_utils/randomize_range.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___LIBCXX_DEBUG_RANDOMIZE_RANGE_H #define _LIBCPP___LIBCXX_DEBUG_RANDOMIZE_RANGE_H -#include <__config> +#include <__config_dir/config.h> #ifdef _LIBCPP_DEBUG_RANDOMIZE_UNSPECIFIED_STABILITY # include <__algorithm/shuffle.h> diff --git a/libcxx/include/__exception/exception.h b/libcxx/include/__exception/exception.h --- a/libcxx/include/__exception/exception.h +++ b/libcxx/include/__exception/exception.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___EXCEPTION_EXCEPTION_H #define _LIBCPP___EXCEPTION_EXCEPTION_H -#include <__config> +#include <__config_dir/config.h> // defines its own std::exception and std::bad_exception types, // which we use in order to be ABI-compatible with other STLs on Windows. diff --git a/libcxx/include/__exception/exception_ptr.h b/libcxx/include/__exception/exception_ptr.h --- a/libcxx/include/__exception/exception_ptr.h +++ b/libcxx/include/__exception/exception_ptr.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___EXCEPTION_EXCEPTION_PTR_H #define _LIBCPP___EXCEPTION_EXCEPTION_PTR_H -#include <__config> +#include <__config_dir/config.h> #include <__exception/operations.h> #include <__memory/addressof.h> #include diff --git a/libcxx/include/__exception/nested_exception.h b/libcxx/include/__exception/nested_exception.h --- a/libcxx/include/__exception/nested_exception.h +++ b/libcxx/include/__exception/nested_exception.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___EXCEPTION_NESTED_EXCEPTION_H #define _LIBCPP___EXCEPTION_NESTED_EXCEPTION_H -#include <__config> +#include <__config_dir/config.h> #include <__exception/exception_ptr.h> #include <__memory/addressof.h> #include <__type_traits/decay.h> diff --git a/libcxx/include/__exception/operations.h b/libcxx/include/__exception/operations.h --- a/libcxx/include/__exception/operations.h +++ b/libcxx/include/__exception/operations.h @@ -9,8 +9,8 @@ #ifndef _LIBCPP___EXCEPTION_OPERATIONS_H #define _LIBCPP___EXCEPTION_OPERATIONS_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__exception/terminate.h b/libcxx/include/__exception/terminate.h --- a/libcxx/include/__exception/terminate.h +++ b/libcxx/include/__exception/terminate.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___EXCEPTION_TERMINATE_H #define _LIBCPP___EXCEPTION_TERMINATE_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__expected/bad_expected_access.h b/libcxx/include/__expected/bad_expected_access.h --- a/libcxx/include/__expected/bad_expected_access.h +++ b/libcxx/include/__expected/bad_expected_access.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___EXPECTED_BAD_EXPECTED_ACCESS_H #define _LIBCPP___EXPECTED_BAD_EXPECTED_ACCESS_H -#include <__config> +#include <__config_dir/config.h> #include <__exception/exception.h> #include <__utility/move.h> diff --git a/libcxx/include/__expected/expected.h b/libcxx/include/__expected/expected.h --- a/libcxx/include/__expected/expected.h +++ b/libcxx/include/__expected/expected.h @@ -10,7 +10,7 @@ #define _LIBCPP___EXPECTED_EXPECTED_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__expected/bad_expected_access.h> #include <__expected/unexpect.h> #include <__expected/unexpected.h> diff --git a/libcxx/include/__expected/unexpect.h b/libcxx/include/__expected/unexpect.h --- a/libcxx/include/__expected/unexpect.h +++ b/libcxx/include/__expected/unexpect.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___EXPECTED_UNEXPECT_H #define _LIBCPP___EXPECTED_UNEXPECT_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__expected/unexpected.h b/libcxx/include/__expected/unexpected.h --- a/libcxx/include/__expected/unexpected.h +++ b/libcxx/include/__expected/unexpected.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___EXPECTED_UNEXPECTED_H #define _LIBCPP___EXPECTED_UNEXPECTED_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conjunction.h> #include <__type_traits/is_array.h> #include <__type_traits/is_const.h> diff --git a/libcxx/include/__filesystem/copy_options.h b/libcxx/include/__filesystem/copy_options.h --- a/libcxx/include/__filesystem/copy_options.h +++ b/libcxx/include/__filesystem/copy_options.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___FILESYSTEM_COPY_OPTIONS_H #define _LIBCPP___FILESYSTEM_COPY_OPTIONS_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__filesystem/directory_entry.h b/libcxx/include/__filesystem/directory_entry.h --- a/libcxx/include/__filesystem/directory_entry.h +++ b/libcxx/include/__filesystem/directory_entry.h @@ -10,10 +10,10 @@ #ifndef _LIBCPP___FILESYSTEM_DIRECTORY_ENTRY_H #define _LIBCPP___FILESYSTEM_DIRECTORY_ENTRY_H -#include <__availability> #include <__chrono/time_point.h> #include <__compare/ordering.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__filesystem/file_status.h> #include <__filesystem/file_time_type.h> #include <__filesystem/file_type.h> diff --git a/libcxx/include/__filesystem/directory_iterator.h b/libcxx/include/__filesystem/directory_iterator.h --- a/libcxx/include/__filesystem/directory_iterator.h +++ b/libcxx/include/__filesystem/directory_iterator.h @@ -11,8 +11,8 @@ #define _LIBCPP___FILESYSTEM_DIRECTORY_ITERATOR_H #include <__assert> -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__filesystem/directory_entry.h> #include <__filesystem/directory_options.h> #include <__filesystem/path.h> diff --git a/libcxx/include/__filesystem/directory_options.h b/libcxx/include/__filesystem/directory_options.h --- a/libcxx/include/__filesystem/directory_options.h +++ b/libcxx/include/__filesystem/directory_options.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___FILESYSTEM_DIRECTORY_OPTIONS_H #define _LIBCPP___FILESYSTEM_DIRECTORY_OPTIONS_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__filesystem/file_status.h b/libcxx/include/__filesystem/file_status.h --- a/libcxx/include/__filesystem/file_status.h +++ b/libcxx/include/__filesystem/file_status.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___FILESYSTEM_FILE_STATUS_H #define _LIBCPP___FILESYSTEM_FILE_STATUS_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__filesystem/file_type.h> #include <__filesystem/perms.h> diff --git a/libcxx/include/__filesystem/file_time_type.h b/libcxx/include/__filesystem/file_time_type.h --- a/libcxx/include/__filesystem/file_time_type.h +++ b/libcxx/include/__filesystem/file_time_type.h @@ -10,10 +10,10 @@ #ifndef _LIBCPP___FILESYSTEM_FILE_TIME_TYPE_H #define _LIBCPP___FILESYSTEM_FILE_TIME_TYPE_H -#include <__availability> #include <__chrono/file_clock.h> #include <__chrono/time_point.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__filesystem/file_type.h b/libcxx/include/__filesystem/file_type.h --- a/libcxx/include/__filesystem/file_type.h +++ b/libcxx/include/__filesystem/file_type.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___FILESYSTEM_FILE_TYPE_H #define _LIBCPP___FILESYSTEM_FILE_TYPE_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__filesystem/filesystem_error.h b/libcxx/include/__filesystem/filesystem_error.h --- a/libcxx/include/__filesystem/filesystem_error.h +++ b/libcxx/include/__filesystem/filesystem_error.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___FILESYSTEM_FILESYSTEM_ERROR_H #define _LIBCPP___FILESYSTEM_FILESYSTEM_ERROR_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__filesystem/path.h> #include <__memory/shared_ptr.h> #include <__system_error/error_code.h> diff --git a/libcxx/include/__filesystem/operations.h b/libcxx/include/__filesystem/operations.h --- a/libcxx/include/__filesystem/operations.h +++ b/libcxx/include/__filesystem/operations.h @@ -10,9 +10,9 @@ #ifndef _LIBCPP___FILESYSTEM_OPERATIONS_H #define _LIBCPP___FILESYSTEM_OPERATIONS_H -#include <__availability> #include <__chrono/time_point.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__filesystem/copy_options.h> #include <__filesystem/file_status.h> #include <__filesystem/file_time_type.h> diff --git a/libcxx/include/__filesystem/path.h b/libcxx/include/__filesystem/path.h --- a/libcxx/include/__filesystem/path.h +++ b/libcxx/include/__filesystem/path.h @@ -12,8 +12,8 @@ #include <__algorithm/replace.h> #include <__algorithm/replace_copy.h> -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__functional/unary_function.h> #include <__fwd/hash.h> #include <__iterator/back_insert_iterator.h> diff --git a/libcxx/include/__filesystem/path_iterator.h b/libcxx/include/__filesystem/path_iterator.h --- a/libcxx/include/__filesystem/path_iterator.h +++ b/libcxx/include/__filesystem/path_iterator.h @@ -11,8 +11,8 @@ #define _LIBCPP___FILESYSTEM_PATH_ITERATOR_H #include <__assert> -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__filesystem/path.h> #include <__iterator/iterator_traits.h> #include diff --git a/libcxx/include/__filesystem/perm_options.h b/libcxx/include/__filesystem/perm_options.h --- a/libcxx/include/__filesystem/perm_options.h +++ b/libcxx/include/__filesystem/perm_options.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___FILESYSTEM_PERM_OPTIONS_H #define _LIBCPP___FILESYSTEM_PERM_OPTIONS_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__filesystem/perms.h b/libcxx/include/__filesystem/perms.h --- a/libcxx/include/__filesystem/perms.h +++ b/libcxx/include/__filesystem/perms.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___FILESYSTEM_PERMS_H #define _LIBCPP___FILESYSTEM_PERMS_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__filesystem/recursive_directory_iterator.h b/libcxx/include/__filesystem/recursive_directory_iterator.h --- a/libcxx/include/__filesystem/recursive_directory_iterator.h +++ b/libcxx/include/__filesystem/recursive_directory_iterator.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___FILESYSTEM_RECURSIVE_DIRECTORY_ITERATOR_H #define _LIBCPP___FILESYSTEM_RECURSIVE_DIRECTORY_ITERATOR_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__filesystem/directory_entry.h> #include <__filesystem/directory_options.h> #include <__filesystem/path.h> diff --git a/libcxx/include/__filesystem/space_info.h b/libcxx/include/__filesystem/space_info.h --- a/libcxx/include/__filesystem/space_info.h +++ b/libcxx/include/__filesystem/space_info.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___FILESYSTEM_SPACE_INFO_H #define _LIBCPP___FILESYSTEM_SPACE_INFO_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__filesystem/u8path.h b/libcxx/include/__filesystem/u8path.h --- a/libcxx/include/__filesystem/u8path.h +++ b/libcxx/include/__filesystem/u8path.h @@ -11,8 +11,8 @@ #define _LIBCPP___FILESYSTEM_U8PATH_H #include <__algorithm/unwrap_iter.h> -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__filesystem/path.h> #include diff --git a/libcxx/include/__format/buffer.h b/libcxx/include/__format/buffer.h --- a/libcxx/include/__format/buffer.h +++ b/libcxx/include/__format/buffer.h @@ -18,7 +18,7 @@ #include <__algorithm/transform.h> #include <__algorithm/unwrap_iter.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__format/concepts.h> #include <__format/enable_insertable.h> #include <__format/format_to_n_result.h> diff --git a/libcxx/include/__format/concepts.h b/libcxx/include/__format/concepts.h --- a/libcxx/include/__format/concepts.h +++ b/libcxx/include/__format/concepts.h @@ -12,7 +12,7 @@ #include <__concepts/same_as.h> #include <__concepts/semiregular.h> -#include <__config> +#include <__config_dir/config.h> #include <__format/format_fwd.h> #include <__format/format_parse_context.h> #include <__type_traits/is_specialization.h> diff --git a/libcxx/include/__format/container_adaptor.h b/libcxx/include/__format/container_adaptor.h --- a/libcxx/include/__format/container_adaptor.h +++ b/libcxx/include/__format/container_adaptor.h @@ -14,8 +14,8 @@ # pragma GCC system_header #endif -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__format/concepts.h> #include <__format/formatter.h> #include <__format/range_default_formatter.h> diff --git a/libcxx/include/__format/enable_insertable.h b/libcxx/include/__format/enable_insertable.h --- a/libcxx/include/__format/enable_insertable.h +++ b/libcxx/include/__format/enable_insertable.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FORMAT_ENABLE_INSERTABLE_H #define _LIBCPP___FORMAT_ENABLE_INSERTABLE_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__format/escaped_output_table.h b/libcxx/include/__format/escaped_output_table.h --- a/libcxx/include/__format/escaped_output_table.h +++ b/libcxx/include/__format/escaped_output_table.h @@ -62,7 +62,7 @@ #define _LIBCPP___FORMAT_ESCAPED_OUTPUT_TABLE_H #include <__algorithm/ranges_upper_bound.h> -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__format/extended_grapheme_cluster_table.h b/libcxx/include/__format/extended_grapheme_cluster_table.h --- a/libcxx/include/__format/extended_grapheme_cluster_table.h +++ b/libcxx/include/__format/extended_grapheme_cluster_table.h @@ -62,7 +62,7 @@ #define _LIBCPP___FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H #include <__algorithm/ranges_upper_bound.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/access.h> #include #include diff --git a/libcxx/include/__format/format_arg.h b/libcxx/include/__format/format_arg.h --- a/libcxx/include/__format/format_arg.h +++ b/libcxx/include/__format/format_arg.h @@ -12,7 +12,7 @@ #include <__assert> #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> #include <__format/format_error.h> #include <__format/format_fwd.h> #include <__format/format_parse_context.h> diff --git a/libcxx/include/__format/format_arg_store.h b/libcxx/include/__format/format_arg_store.h --- a/libcxx/include/__format/format_arg_store.h +++ b/libcxx/include/__format/format_arg_store.h @@ -16,7 +16,7 @@ #include <__concepts/arithmetic.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__format/concepts.h> #include <__format/format_arg.h> #include <__type_traits/conditional.h> diff --git a/libcxx/include/__format/format_args.h b/libcxx/include/__format/format_args.h --- a/libcxx/include/__format/format_args.h +++ b/libcxx/include/__format/format_args.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___FORMAT_FORMAT_ARGS_H #define _LIBCPP___FORMAT_FORMAT_ARGS_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__format/format_arg.h> #include <__format/format_arg_store.h> #include <__format/format_fwd.h> diff --git a/libcxx/include/__format/format_context.h b/libcxx/include/__format/format_context.h --- a/libcxx/include/__format/format_context.h +++ b/libcxx/include/__format/format_context.h @@ -10,9 +10,9 @@ #ifndef _LIBCPP___FORMAT_FORMAT_CONTEXT_H #define _LIBCPP___FORMAT_FORMAT_CONTEXT_H -#include <__availability> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__format/buffer.h> #include <__format/format_arg.h> #include <__format/format_arg_store.h> diff --git a/libcxx/include/__format/format_error.h b/libcxx/include/__format/format_error.h --- a/libcxx/include/__format/format_error.h +++ b/libcxx/include/__format/format_error.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FORMAT_FORMAT_ERROR_H #define _LIBCPP___FORMAT_FORMAT_ERROR_H -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__format/format_functions.h b/libcxx/include/__format/format_functions.h --- a/libcxx/include/__format/format_functions.h +++ b/libcxx/include/__format/format_functions.h @@ -11,11 +11,11 @@ #define _LIBCPP___FORMAT_FORMAT_FUNCTIONS #include <__algorithm/clamp.h> -#include <__availability> #include <__concepts/convertible_to.h> #include <__concepts/same_as.h> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> +#include <__config_dir/debug.h> #include <__format/buffer.h> #include <__format/format_arg.h> #include <__format/format_arg_store.h> diff --git a/libcxx/include/__format/format_fwd.h b/libcxx/include/__format/format_fwd.h --- a/libcxx/include/__format/format_fwd.h +++ b/libcxx/include/__format/format_fwd.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___FORMAT_FORMAT_FWD_H #define _LIBCPP___FORMAT_FORMAT_FWD_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__iterator/concepts.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__format/format_parse_context.h b/libcxx/include/__format/format_parse_context.h --- a/libcxx/include/__format/format_parse_context.h +++ b/libcxx/include/__format/format_parse_context.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FORMAT_FORMAT_PARSE_CONTEXT_H #define _LIBCPP___FORMAT_FORMAT_PARSE_CONTEXT_H -#include <__config> +#include <__config_dir/config.h> #include <__format/format_error.h> #include <__type_traits/is_constant_evaluated.h> #include diff --git a/libcxx/include/__format/format_string.h b/libcxx/include/__format/format_string.h --- a/libcxx/include/__format/format_string.h +++ b/libcxx/include/__format/format_string.h @@ -11,7 +11,7 @@ #define _LIBCPP___FORMAT_FORMAT_STRING_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__format/format_error.h> #include <__iterator/concepts.h> #include <__iterator/readable_traits.h> // iter_value_t diff --git a/libcxx/include/__format/format_to_n_result.h b/libcxx/include/__format/format_to_n_result.h --- a/libcxx/include/__format/format_to_n_result.h +++ b/libcxx/include/__format/format_to_n_result.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FORMAT_FORMAT_TO_N_RESULT_H #define _LIBCPP___FORMAT_FORMAT_TO_N_RESULT_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/incrementable_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__format/formatter.h b/libcxx/include/__format/formatter.h --- a/libcxx/include/__format/formatter.h +++ b/libcxx/include/__format/formatter.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___FORMAT_FORMATTER_H #define _LIBCPP___FORMAT_FORMATTER_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__format/format_fwd.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__format/formatter_bool.h b/libcxx/include/__format/formatter_bool.h --- a/libcxx/include/__format/formatter_bool.h +++ b/libcxx/include/__format/formatter_bool.h @@ -11,9 +11,9 @@ #define _LIBCPP___FORMAT_FORMATTER_BOOL_H #include <__algorithm/copy.h> -#include <__availability> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> +#include <__config_dir/debug.h> #include <__format/concepts.h> #include <__format/format_error.h> #include <__format/format_parse_context.h> diff --git a/libcxx/include/__format/formatter_char.h b/libcxx/include/__format/formatter_char.h --- a/libcxx/include/__format/formatter_char.h +++ b/libcxx/include/__format/formatter_char.h @@ -10,9 +10,9 @@ #ifndef _LIBCPP___FORMAT_FORMATTER_CHAR_H #define _LIBCPP___FORMAT_FORMATTER_CHAR_H -#include <__availability> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__format/concepts.h> #include <__format/format_parse_context.h> #include <__format/formatter.h> diff --git a/libcxx/include/__format/formatter_floating_point.h b/libcxx/include/__format/formatter_floating_point.h --- a/libcxx/include/__format/formatter_floating_point.h +++ b/libcxx/include/__format/formatter_floating_point.h @@ -21,7 +21,7 @@ #include <__charconv/to_chars_result.h> #include <__concepts/arithmetic.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__format/concepts.h> #include <__format/format_parse_context.h> #include <__format/formatter.h> diff --git a/libcxx/include/__format/formatter_integer.h b/libcxx/include/__format/formatter_integer.h --- a/libcxx/include/__format/formatter_integer.h +++ b/libcxx/include/__format/formatter_integer.h @@ -10,9 +10,9 @@ #ifndef _LIBCPP___FORMAT_FORMATTER_INTEGER_H #define _LIBCPP___FORMAT_FORMATTER_INTEGER_H -#include <__availability> #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__format/concepts.h> #include <__format/format_parse_context.h> #include <__format/formatter.h> diff --git a/libcxx/include/__format/formatter_integral.h b/libcxx/include/__format/formatter_integral.h --- a/libcxx/include/__format/formatter_integral.h +++ b/libcxx/include/__format/formatter_integral.h @@ -15,7 +15,7 @@ #include <__charconv/traits.h> #include <__concepts/arithmetic.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__format/concepts.h> #include <__format/format_error.h> #include <__format/formatter_output.h> diff --git a/libcxx/include/__format/formatter_output.h b/libcxx/include/__format/formatter_output.h --- a/libcxx/include/__format/formatter_output.h +++ b/libcxx/include/__format/formatter_output.h @@ -19,7 +19,7 @@ #include <__charconv/to_chars_result.h> #include <__chrono/statically_widen.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__format/buffer.h> #include <__format/concepts.h> #include <__format/escaped_output_table.h> diff --git a/libcxx/include/__format/formatter_pointer.h b/libcxx/include/__format/formatter_pointer.h --- a/libcxx/include/__format/formatter_pointer.h +++ b/libcxx/include/__format/formatter_pointer.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___FORMAT_FORMATTER_POINTER_H #define _LIBCPP___FORMAT_FORMATTER_POINTER_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__format/concepts.h> #include <__format/format_parse_context.h> #include <__format/formatter.h> diff --git a/libcxx/include/__format/formatter_string.h b/libcxx/include/__format/formatter_string.h --- a/libcxx/include/__format/formatter_string.h +++ b/libcxx/include/__format/formatter_string.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___FORMAT_FORMATTER_STRING_H #define _LIBCPP___FORMAT_FORMATTER_STRING_H -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__format/concepts.h> #include <__format/format_parse_context.h> #include <__format/formatter.h> diff --git a/libcxx/include/__format/formatter_tuple.h b/libcxx/include/__format/formatter_tuple.h --- a/libcxx/include/__format/formatter_tuple.h +++ b/libcxx/include/__format/formatter_tuple.h @@ -11,9 +11,9 @@ #define _LIBCPP___FORMAT_FORMATTER_TUPLE_H #include <__algorithm/ranges_copy.h> -#include <__availability> #include <__chrono/statically_widen.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__format/buffer.h> #include <__format/concepts.h> #include <__format/format_args.h> diff --git a/libcxx/include/__format/parser_std_format_spec.h b/libcxx/include/__format/parser_std_format_spec.h --- a/libcxx/include/__format/parser_std_format_spec.h +++ b/libcxx/include/__format/parser_std_format_spec.h @@ -22,8 +22,8 @@ #include <__assert> #include <__concepts/arithmetic.h> #include <__concepts/same_as.h> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__format/format_arg.h> #include <__format/format_error.h> #include <__format/format_parse_context.h> diff --git a/libcxx/include/__format/range_default_formatter.h b/libcxx/include/__format/range_default_formatter.h --- a/libcxx/include/__format/range_default_formatter.h +++ b/libcxx/include/__format/range_default_formatter.h @@ -15,10 +15,10 @@ #endif #include <__algorithm/ranges_copy.h> -#include <__availability> #include <__chrono/statically_widen.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__format/concepts.h> #include <__format/formatter.h> #include <__format/range_formatter.h> diff --git a/libcxx/include/__format/range_formatter.h b/libcxx/include/__format/range_formatter.h --- a/libcxx/include/__format/range_formatter.h +++ b/libcxx/include/__format/range_formatter.h @@ -15,10 +15,10 @@ #endif #include <__algorithm/ranges_copy.h> -#include <__availability> #include <__chrono/statically_widen.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__format/buffer.h> #include <__format/concepts.h> #include <__format/format_args.h> diff --git a/libcxx/include/__format/unicode.h b/libcxx/include/__format/unicode.h --- a/libcxx/include/__format/unicode.h +++ b/libcxx/include/__format/unicode.h @@ -13,7 +13,7 @@ #include <__assert> #include <__bit/countl.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__format/extended_grapheme_cluster_table.h> #include <__iterator/concepts.h> #include <__iterator/readable_traits.h> // iter_value_t diff --git a/libcxx/include/__format/width_estimation_table.h b/libcxx/include/__format/width_estimation_table.h --- a/libcxx/include/__format/width_estimation_table.h +++ b/libcxx/include/__format/width_estimation_table.h @@ -62,7 +62,7 @@ #define _LIBCPP___FORMAT_WIDTH_ESTIMATION_TABLE_H #include <__algorithm/ranges_upper_bound.h> -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__functional/binary_function.h b/libcxx/include/__functional/binary_function.h --- a/libcxx/include/__functional/binary_function.h +++ b/libcxx/include/__functional/binary_function.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_BINARY_FUNCTION_H #define _LIBCPP___FUNCTIONAL_BINARY_FUNCTION_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__functional/binary_negate.h b/libcxx/include/__functional/binary_negate.h --- a/libcxx/include/__functional/binary_negate.h +++ b/libcxx/include/__functional/binary_negate.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_BINARY_NEGATE_H #define _LIBCPP___FUNCTIONAL_BINARY_NEGATE_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/binary_function.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__functional/bind.h b/libcxx/include/__functional/bind.h --- a/libcxx/include/__functional/bind.h +++ b/libcxx/include/__functional/bind.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_BIND_H #define _LIBCPP___FUNCTIONAL_BIND_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #include <__functional/weak_result_type.h> #include <__type_traits/decay.h> diff --git a/libcxx/include/__functional/bind_back.h b/libcxx/include/__functional/bind_back.h --- a/libcxx/include/__functional/bind_back.h +++ b/libcxx/include/__functional/bind_back.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_BIND_BACK_H #define _LIBCPP___FUNCTIONAL_BIND_BACK_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #include <__functional/perfect_forward.h> #include <__type_traits/decay.h> diff --git a/libcxx/include/__functional/bind_front.h b/libcxx/include/__functional/bind_front.h --- a/libcxx/include/__functional/bind_front.h +++ b/libcxx/include/__functional/bind_front.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_BIND_FRONT_H #define _LIBCPP___FUNCTIONAL_BIND_FRONT_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #include <__functional/perfect_forward.h> #include <__type_traits/conjunction.h> diff --git a/libcxx/include/__functional/binder1st.h b/libcxx/include/__functional/binder1st.h --- a/libcxx/include/__functional/binder1st.h +++ b/libcxx/include/__functional/binder1st.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_BINDER1ST_H #define _LIBCPP___FUNCTIONAL_BINDER1ST_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/unary_function.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__functional/binder2nd.h b/libcxx/include/__functional/binder2nd.h --- a/libcxx/include/__functional/binder2nd.h +++ b/libcxx/include/__functional/binder2nd.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_BINDER2ND_H #define _LIBCPP___FUNCTIONAL_BINDER2ND_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/unary_function.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__functional/boyer_moore_searcher.h b/libcxx/include/__functional/boyer_moore_searcher.h --- a/libcxx/include/__functional/boyer_moore_searcher.h +++ b/libcxx/include/__functional/boyer_moore_searcher.h @@ -14,7 +14,7 @@ #endif #include <__algorithm/fill_n.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/hash.h> #include <__functional/operations.h> #include <__iterator/distance.h> diff --git a/libcxx/include/__functional/compose.h b/libcxx/include/__functional/compose.h --- a/libcxx/include/__functional/compose.h +++ b/libcxx/include/__functional/compose.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_COMPOSE_H #define _LIBCPP___FUNCTIONAL_COMPOSE_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #include <__functional/perfect_forward.h> #include <__type_traits/decay.h> diff --git a/libcxx/include/__functional/default_searcher.h b/libcxx/include/__functional/default_searcher.h --- a/libcxx/include/__functional/default_searcher.h +++ b/libcxx/include/__functional/default_searcher.h @@ -11,7 +11,7 @@ #define _LIBCPP___FUNCTIONAL_DEFAULT_SEARCHER_H #include <__algorithm/search.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/operations.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__functional/function.h b/libcxx/include/__functional/function.h --- a/libcxx/include/__functional/function.h +++ b/libcxx/include/__functional/function.h @@ -11,7 +11,7 @@ #define _LIBCPP___FUNCTIONAL_FUNCTION_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__exception/exception.h> #include <__functional/binary_function.h> #include <__functional/invoke.h> diff --git a/libcxx/include/__functional/hash.h b/libcxx/include/__functional/hash.h --- a/libcxx/include/__functional/hash.h +++ b/libcxx/include/__functional/hash.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FUNCTIONAL_HASH_H #define _LIBCPP___FUNCTIONAL_HASH_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #include <__functional/unary_function.h> #include <__fwd/hash.h> diff --git a/libcxx/include/__functional/identity.h b/libcxx/include/__functional/identity.h --- a/libcxx/include/__functional/identity.h +++ b/libcxx/include/__functional/identity.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_IDENTITY_H #define _LIBCPP___FUNCTIONAL_IDENTITY_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__utility/forward.h> diff --git a/libcxx/include/__functional/invoke.h b/libcxx/include/__functional/invoke.h --- a/libcxx/include/__functional/invoke.h +++ b/libcxx/include/__functional/invoke.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_INVOKE_H #define _LIBCPP___FUNCTIONAL_INVOKE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/invoke.h> #include <__utility/forward.h> diff --git a/libcxx/include/__functional/is_transparent.h b/libcxx/include/__functional/is_transparent.h --- a/libcxx/include/__functional/is_transparent.h +++ b/libcxx/include/__functional/is_transparent.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_IS_TRANSPARENT #define _LIBCPP___FUNCTIONAL_IS_TRANSPARENT -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/void_t.h> diff --git a/libcxx/include/__functional/mem_fn.h b/libcxx/include/__functional/mem_fn.h --- a/libcxx/include/__functional/mem_fn.h +++ b/libcxx/include/__functional/mem_fn.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_MEM_FN_H #define _LIBCPP___FUNCTIONAL_MEM_FN_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/binary_function.h> #include <__functional/invoke.h> #include <__functional/weak_result_type.h> diff --git a/libcxx/include/__functional/mem_fun_ref.h b/libcxx/include/__functional/mem_fun_ref.h --- a/libcxx/include/__functional/mem_fun_ref.h +++ b/libcxx/include/__functional/mem_fun_ref.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_MEM_FUN_REF_H #define _LIBCPP___FUNCTIONAL_MEM_FUN_REF_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/binary_function.h> #include <__functional/unary_function.h> diff --git a/libcxx/include/__functional/not_fn.h b/libcxx/include/__functional/not_fn.h --- a/libcxx/include/__functional/not_fn.h +++ b/libcxx/include/__functional/not_fn.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_NOT_FN_H #define _LIBCPP___FUNCTIONAL_NOT_FN_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #include <__functional/perfect_forward.h> #include <__type_traits/decay.h> diff --git a/libcxx/include/__functional/operations.h b/libcxx/include/__functional/operations.h --- a/libcxx/include/__functional/operations.h +++ b/libcxx/include/__functional/operations.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_OPERATIONS_H #define _LIBCPP___FUNCTIONAL_OPERATIONS_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/binary_function.h> #include <__functional/unary_function.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__functional/perfect_forward.h b/libcxx/include/__functional/perfect_forward.h --- a/libcxx/include/__functional/perfect_forward.h +++ b/libcxx/include/__functional/perfect_forward.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_PERFECT_FORWARD_H #define _LIBCPP___FUNCTIONAL_PERFECT_FORWARD_H -#include <__config> +#include <__config_dir/config.h> #include <__utility/declval.h> #include <__utility/forward.h> #include <__utility/move.h> diff --git a/libcxx/include/__functional/pointer_to_binary_function.h b/libcxx/include/__functional/pointer_to_binary_function.h --- a/libcxx/include/__functional/pointer_to_binary_function.h +++ b/libcxx/include/__functional/pointer_to_binary_function.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_POINTER_TO_BINARY_FUNCTION_H #define _LIBCPP___FUNCTIONAL_POINTER_TO_BINARY_FUNCTION_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/binary_function.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__functional/pointer_to_unary_function.h b/libcxx/include/__functional/pointer_to_unary_function.h --- a/libcxx/include/__functional/pointer_to_unary_function.h +++ b/libcxx/include/__functional/pointer_to_unary_function.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H #define _LIBCPP___FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/unary_function.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__functional/ranges_operations.h b/libcxx/include/__functional/ranges_operations.h --- a/libcxx/include/__functional/ranges_operations.h +++ b/libcxx/include/__functional/ranges_operations.h @@ -12,7 +12,7 @@ #include <__concepts/equality_comparable.h> #include <__concepts/totally_ordered.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/predicate_traits.h> #include <__utility/forward.h> diff --git a/libcxx/include/__functional/reference_wrapper.h b/libcxx/include/__functional/reference_wrapper.h --- a/libcxx/include/__functional/reference_wrapper.h +++ b/libcxx/include/__functional/reference_wrapper.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_REFERENCE_WRAPPER_H #define _LIBCPP___FUNCTIONAL_REFERENCE_WRAPPER_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #include <__functional/weak_result_type.h> #include <__memory/addressof.h> diff --git a/libcxx/include/__functional/unary_function.h b/libcxx/include/__functional/unary_function.h --- a/libcxx/include/__functional/unary_function.h +++ b/libcxx/include/__functional/unary_function.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FUNCTIONAL_UNARY_FUNCTION_H #define _LIBCPP___FUNCTIONAL_UNARY_FUNCTION_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__functional/unary_negate.h b/libcxx/include/__functional/unary_negate.h --- a/libcxx/include/__functional/unary_negate.h +++ b/libcxx/include/__functional/unary_negate.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_UNARY_NEGATE_H #define _LIBCPP___FUNCTIONAL_UNARY_NEGATE_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/unary_function.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__functional/weak_result_type.h b/libcxx/include/__functional/weak_result_type.h --- a/libcxx/include/__functional/weak_result_type.h +++ b/libcxx/include/__functional/weak_result_type.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_WEAK_RESULT_TYPE_H #define _LIBCPP___FUNCTIONAL_WEAK_RESULT_TYPE_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/binary_function.h> #include <__functional/invoke.h> #include <__functional/unary_function.h> diff --git a/libcxx/include/__fwd/array.h b/libcxx/include/__fwd/array.h --- a/libcxx/include/__fwd/array.h +++ b/libcxx/include/__fwd/array.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FWD_ARRAY_H #define _LIBCPP___FWD_ARRAY_H -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__fwd/fstream.h b/libcxx/include/__fwd/fstream.h --- a/libcxx/include/__fwd/fstream.h +++ b/libcxx/include/__fwd/fstream.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FWD_FSTREAM_H #define _LIBCPP___FWD_FSTREAM_H -#include <__config> +#include <__config_dir/config.h> #include <__fwd/string.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__fwd/get.h b/libcxx/include/__fwd/get.h --- a/libcxx/include/__fwd/get.h +++ b/libcxx/include/__fwd/get.h @@ -10,7 +10,7 @@ #define _LIBCPP___FWD_GET_H #include <__concepts/copyable.h> -#include <__config> +#include <__config_dir/config.h> #include <__fwd/array.h> #include <__fwd/pair.h> #include <__fwd/subrange.h> diff --git a/libcxx/include/__fwd/hash.h b/libcxx/include/__fwd/hash.h --- a/libcxx/include/__fwd/hash.h +++ b/libcxx/include/__fwd/hash.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FWD_HASH_H #define _LIBCPP___FWD_HASH_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__fwd/ios.h b/libcxx/include/__fwd/ios.h --- a/libcxx/include/__fwd/ios.h +++ b/libcxx/include/__fwd/ios.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FWD_IOS_H #define _LIBCPP___FWD_IOS_H -#include <__config> +#include <__config_dir/config.h> #include <__fwd/string.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__fwd/istream.h b/libcxx/include/__fwd/istream.h --- a/libcxx/include/__fwd/istream.h +++ b/libcxx/include/__fwd/istream.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FWD_ISTREAM_H #define _LIBCPP___FWD_ISTREAM_H -#include <__config> +#include <__config_dir/config.h> #include <__fwd/string.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__fwd/memory_resource.h b/libcxx/include/__fwd/memory_resource.h --- a/libcxx/include/__fwd/memory_resource.h +++ b/libcxx/include/__fwd/memory_resource.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FWD_MEMORY_RESOURCE_H #define _LIBCPP___FWD_MEMORY_RESOURCE_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__fwd/ostream.h b/libcxx/include/__fwd/ostream.h --- a/libcxx/include/__fwd/ostream.h +++ b/libcxx/include/__fwd/ostream.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FWD_OSTREAM_H #define _LIBCPP___FWD_OSTREAM_H -#include <__config> +#include <__config_dir/config.h> #include <__fwd/string.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__fwd/pair.h b/libcxx/include/__fwd/pair.h --- a/libcxx/include/__fwd/pair.h +++ b/libcxx/include/__fwd/pair.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FWD_PAIR_H #define _LIBCPP___FWD_PAIR_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__fwd/span.h b/libcxx/include/__fwd/span.h --- a/libcxx/include/__fwd/span.h +++ b/libcxx/include/__fwd/span.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FWD_SPAN_H #define _LIBCPP___FWD_SPAN_H -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__fwd/sstream.h b/libcxx/include/__fwd/sstream.h --- a/libcxx/include/__fwd/sstream.h +++ b/libcxx/include/__fwd/sstream.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FWD_SSTREAM_H #define _LIBCPP___FWD_SSTREAM_H -#include <__config> +#include <__config_dir/config.h> #include <__fwd/string.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__fwd/streambuf.h b/libcxx/include/__fwd/streambuf.h --- a/libcxx/include/__fwd/streambuf.h +++ b/libcxx/include/__fwd/streambuf.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FWD_STREAMBUF_H #define _LIBCPP___FWD_STREAMBUF_H -#include <__config> +#include <__config_dir/config.h> #include <__fwd/string.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__fwd/string.h b/libcxx/include/__fwd/string.h --- a/libcxx/include/__fwd/string.h +++ b/libcxx/include/__fwd/string.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FWD_STRING_H #define _LIBCPP___FWD_STRING_H -#include <__config> +#include <__config_dir/config.h> #include <__fwd/memory_resource.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__fwd/string_view.h b/libcxx/include/__fwd/string_view.h --- a/libcxx/include/__fwd/string_view.h +++ b/libcxx/include/__fwd/string_view.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FWD_STRING_VIEW_H #define _LIBCPP___FWD_STRING_VIEW_H -#include <__config> +#include <__config_dir/config.h> #include // char_traits #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__fwd/subrange.h b/libcxx/include/__fwd/subrange.h --- a/libcxx/include/__fwd/subrange.h +++ b/libcxx/include/__fwd/subrange.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FWD_SUBRANGE_H #define _LIBCPP___FWD_SUBRANGE_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__fwd/tuple.h b/libcxx/include/__fwd/tuple.h --- a/libcxx/include/__fwd/tuple.h +++ b/libcxx/include/__fwd/tuple.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___FWD_TUPLE_H #define _LIBCPP___FWD_TUPLE_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__hash_table b/libcxx/include/__hash_table --- a/libcxx/include/__hash_table +++ b/libcxx/include/__hash_table @@ -14,8 +14,8 @@ #include <__algorithm/min.h> #include <__assert> #include <__bit/countl.h> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__functional/hash.h> #include <__functional/invoke.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__ios/fpos.h b/libcxx/include/__ios/fpos.h --- a/libcxx/include/__ios/fpos.h +++ b/libcxx/include/__ios/fpos.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___IOS_FPOS_H #define _LIBCPP___IOS_FPOS_H -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__iterator/access.h b/libcxx/include/__iterator/access.h --- a/libcxx/include/__iterator/access.h +++ b/libcxx/include/__iterator/access.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_ACCESS_H #define _LIBCPP___ITERATOR_ACCESS_H -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__iterator/advance.h b/libcxx/include/__iterator/advance.h --- a/libcxx/include/__iterator/advance.h +++ b/libcxx/include/__iterator/advance.h @@ -13,7 +13,7 @@ #include <__assert> #include <__concepts/assignable.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__iterator/back_insert_iterator.h b/libcxx/include/__iterator/back_insert_iterator.h --- a/libcxx/include/__iterator/back_insert_iterator.h +++ b/libcxx/include/__iterator/back_insert_iterator.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_BACK_INSERT_ITERATOR_H #define _LIBCPP___ITERATOR_BACK_INSERT_ITERATOR_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator.h> #include <__iterator/iterator_traits.h> #include <__memory/addressof.h> diff --git a/libcxx/include/__iterator/bounded_iter.h b/libcxx/include/__iterator/bounded_iter.h --- a/libcxx/include/__iterator/bounded_iter.h +++ b/libcxx/include/__iterator/bounded_iter.h @@ -11,7 +11,7 @@ #define _LIBCPP___ITERATOR_BOUNDED_ITER_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__memory/pointer_traits.h> #include <__type_traits/enable_if.h> diff --git a/libcxx/include/__iterator/common_iterator.h b/libcxx/include/__iterator/common_iterator.h --- a/libcxx/include/__iterator/common_iterator.h +++ b/libcxx/include/__iterator/common_iterator.h @@ -18,7 +18,7 @@ #include <__concepts/derived_from.h> #include <__concepts/equality_comparable.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> #include <__iterator/iter_move.h> diff --git a/libcxx/include/__iterator/concepts.h b/libcxx/include/__iterator/concepts.h --- a/libcxx/include/__iterator/concepts.h +++ b/libcxx/include/__iterator/concepts.h @@ -25,7 +25,7 @@ #include <__concepts/same_as.h> #include <__concepts/semiregular.h> #include <__concepts/totally_ordered.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #include <__iterator/incrementable_traits.h> #include <__iterator/iter_move.h> diff --git a/libcxx/include/__iterator/counted_iterator.h b/libcxx/include/__iterator/counted_iterator.h --- a/libcxx/include/__iterator/counted_iterator.h +++ b/libcxx/include/__iterator/counted_iterator.h @@ -16,7 +16,7 @@ #include <__concepts/constructible.h> #include <__concepts/convertible_to.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/default_sentinel.h> #include <__iterator/incrementable_traits.h> diff --git a/libcxx/include/__iterator/data.h b/libcxx/include/__iterator/data.h --- a/libcxx/include/__iterator/data.h +++ b/libcxx/include/__iterator/data.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_DATA_H #define _LIBCPP___ITERATOR_DATA_H -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__iterator/default_sentinel.h b/libcxx/include/__iterator/default_sentinel.h --- a/libcxx/include/__iterator/default_sentinel.h +++ b/libcxx/include/__iterator/default_sentinel.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_DEFAULT_SENTINEL_H #define _LIBCPP___ITERATOR_DEFAULT_SENTINEL_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__iterator/distance.h b/libcxx/include/__iterator/distance.h --- a/libcxx/include/__iterator/distance.h +++ b/libcxx/include/__iterator/distance.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_DISTANCE_H #define _LIBCPP___ITERATOR_DISTANCE_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__iterator/empty.h b/libcxx/include/__iterator/empty.h --- a/libcxx/include/__iterator/empty.h +++ b/libcxx/include/__iterator/empty.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_EMPTY_H #define _LIBCPP___ITERATOR_EMPTY_H -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__iterator/erase_if_container.h b/libcxx/include/__iterator/erase_if_container.h --- a/libcxx/include/__iterator/erase_if_container.h +++ b/libcxx/include/__iterator/erase_if_container.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_ERASE_IF_CONTAINER_H #define _LIBCPP___ITERATOR_ERASE_IF_CONTAINER_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__iterator/front_insert_iterator.h b/libcxx/include/__iterator/front_insert_iterator.h --- a/libcxx/include/__iterator/front_insert_iterator.h +++ b/libcxx/include/__iterator/front_insert_iterator.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_FRONT_INSERT_ITERATOR_H #define _LIBCPP___ITERATOR_FRONT_INSERT_ITERATOR_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator.h> #include <__iterator/iterator_traits.h> #include <__memory/addressof.h> diff --git a/libcxx/include/__iterator/incrementable_traits.h b/libcxx/include/__iterator/incrementable_traits.h --- a/libcxx/include/__iterator/incrementable_traits.h +++ b/libcxx/include/__iterator/incrementable_traits.h @@ -11,7 +11,7 @@ #define _LIBCPP___ITERATOR_INCREMENTABLE_TRAITS_H #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conditional.h> #include <__type_traits/is_object.h> #include <__type_traits/is_primary_template.h> diff --git a/libcxx/include/__iterator/indirectly_comparable.h b/libcxx/include/__iterator/indirectly_comparable.h --- a/libcxx/include/__iterator/indirectly_comparable.h +++ b/libcxx/include/__iterator/indirectly_comparable.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_INDIRECTLY_COMPARABLE_H #define _LIBCPP___ITERATOR_INDIRECTLY_COMPARABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__iterator/concepts.h> #include <__iterator/projected.h> diff --git a/libcxx/include/__iterator/insert_iterator.h b/libcxx/include/__iterator/insert_iterator.h --- a/libcxx/include/__iterator/insert_iterator.h +++ b/libcxx/include/__iterator/insert_iterator.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_INSERT_ITERATOR_H #define _LIBCPP___ITERATOR_INSERT_ITERATOR_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator.h> #include <__iterator/iterator_traits.h> #include <__memory/addressof.h> diff --git a/libcxx/include/__iterator/istream_iterator.h b/libcxx/include/__iterator/istream_iterator.h --- a/libcxx/include/__iterator/istream_iterator.h +++ b/libcxx/include/__iterator/istream_iterator.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_ISTREAM_ITERATOR_H #define _LIBCPP___ITERATOR_ISTREAM_ITERATOR_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/default_sentinel.h> #include <__iterator/iterator.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__iterator/istreambuf_iterator.h b/libcxx/include/__iterator/istreambuf_iterator.h --- a/libcxx/include/__iterator/istreambuf_iterator.h +++ b/libcxx/include/__iterator/istreambuf_iterator.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_ISTREAMBUF_ITERATOR_H #define _LIBCPP___ITERATOR_ISTREAMBUF_ITERATOR_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/default_sentinel.h> #include <__iterator/iterator.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__iterator/iter_move.h b/libcxx/include/__iterator/iter_move.h --- a/libcxx/include/__iterator/iter_move.h +++ b/libcxx/include/__iterator/iter_move.h @@ -11,7 +11,7 @@ #define _LIBCPP___ITERATOR_ITER_MOVE_H #include <__concepts/class_or_enum.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_reference.h> #include <__type_traits/remove_cvref.h> diff --git a/libcxx/include/__iterator/iter_swap.h b/libcxx/include/__iterator/iter_swap.h --- a/libcxx/include/__iterator/iter_swap.h +++ b/libcxx/include/__iterator/iter_swap.h @@ -12,7 +12,7 @@ #include <__concepts/class_or_enum.h> #include <__concepts/swappable.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/iter_move.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__iterator/iterator.h b/libcxx/include/__iterator/iterator.h --- a/libcxx/include/__iterator/iterator.h +++ b/libcxx/include/__iterator/iterator.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_ITERATOR_H #define _LIBCPP___ITERATOR_ITERATOR_H -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__iterator/iterator_traits.h b/libcxx/include/__iterator/iterator_traits.h --- a/libcxx/include/__iterator/iterator_traits.h +++ b/libcxx/include/__iterator/iterator_traits.h @@ -17,7 +17,7 @@ #include <__concepts/equality_comparable.h> #include <__concepts/same_as.h> #include <__concepts/totally_ordered.h> -#include <__config> +#include <__config_dir/config.h> #include <__fwd/pair.h> #include <__iterator/incrementable_traits.h> #include <__iterator/readable_traits.h> diff --git a/libcxx/include/__iterator/iterator_with_data.h b/libcxx/include/__iterator/iterator_with_data.h --- a/libcxx/include/__iterator/iterator_with_data.h +++ b/libcxx/include/__iterator/iterator_with_data.h @@ -11,7 +11,7 @@ #include <__compare/compare_three_way_result.h> #include <__compare/three_way_comparable.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> #include <__iterator/iter_move.h> diff --git a/libcxx/include/__iterator/mergeable.h b/libcxx/include/__iterator/mergeable.h --- a/libcxx/include/__iterator/mergeable.h +++ b/libcxx/include/__iterator/mergeable.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_MERGEABLE_H #define _LIBCPP___ITERATOR_MERGEABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__iterator/move_iterator.h b/libcxx/include/__iterator/move_iterator.h --- a/libcxx/include/__iterator/move_iterator.h +++ b/libcxx/include/__iterator/move_iterator.h @@ -16,7 +16,7 @@ #include <__concepts/convertible_to.h> #include <__concepts/derived_from.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> #include <__iterator/iter_move.h> diff --git a/libcxx/include/__iterator/move_sentinel.h b/libcxx/include/__iterator/move_sentinel.h --- a/libcxx/include/__iterator/move_sentinel.h +++ b/libcxx/include/__iterator/move_sentinel.h @@ -12,7 +12,7 @@ #include <__concepts/assignable.h> #include <__concepts/convertible_to.h> #include <__concepts/semiregular.h> -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__iterator/next.h b/libcxx/include/__iterator/next.h --- a/libcxx/include/__iterator/next.h +++ b/libcxx/include/__iterator/next.h @@ -11,7 +11,7 @@ #define _LIBCPP___ITERATOR_NEXT_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/advance.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> diff --git a/libcxx/include/__iterator/ostream_iterator.h b/libcxx/include/__iterator/ostream_iterator.h --- a/libcxx/include/__iterator/ostream_iterator.h +++ b/libcxx/include/__iterator/ostream_iterator.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_OSTREAM_ITERATOR_H #define _LIBCPP___ITERATOR_OSTREAM_ITERATOR_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator.h> #include <__iterator/iterator_traits.h> #include <__memory/addressof.h> diff --git a/libcxx/include/__iterator/ostreambuf_iterator.h b/libcxx/include/__iterator/ostreambuf_iterator.h --- a/libcxx/include/__iterator/ostreambuf_iterator.h +++ b/libcxx/include/__iterator/ostreambuf_iterator.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_OSTREAMBUF_ITERATOR_H #define _LIBCPP___ITERATOR_OSTREAMBUF_ITERATOR_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator.h> #include <__iterator/iterator_traits.h> #include diff --git a/libcxx/include/__iterator/permutable.h b/libcxx/include/__iterator/permutable.h --- a/libcxx/include/__iterator/permutable.h +++ b/libcxx/include/__iterator/permutable.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_PERMUTABLE_H #define _LIBCPP___ITERATOR_PERMUTABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/iter_swap.h> diff --git a/libcxx/include/__iterator/prev.h b/libcxx/include/__iterator/prev.h --- a/libcxx/include/__iterator/prev.h +++ b/libcxx/include/__iterator/prev.h @@ -11,7 +11,7 @@ #define _LIBCPP___ITERATOR_PREV_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/advance.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> diff --git a/libcxx/include/__iterator/projected.h b/libcxx/include/__iterator/projected.h --- a/libcxx/include/__iterator/projected.h +++ b/libcxx/include/__iterator/projected.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_PROJECTED_H #define _LIBCPP___ITERATOR_PROJECTED_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> #include <__type_traits/remove_cvref.h> diff --git a/libcxx/include/__iterator/readable_traits.h b/libcxx/include/__iterator/readable_traits.h --- a/libcxx/include/__iterator/readable_traits.h +++ b/libcxx/include/__iterator/readable_traits.h @@ -11,7 +11,7 @@ #define _LIBCPP___ITERATOR_READABLE_TRAITS_H #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conditional.h> #include <__type_traits/is_array.h> #include <__type_traits/is_object.h> diff --git a/libcxx/include/__iterator/reverse_access.h b/libcxx/include/__iterator/reverse_access.h --- a/libcxx/include/__iterator/reverse_access.h +++ b/libcxx/include/__iterator/reverse_access.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_REVERSE_ACCESS_H #define _LIBCPP___ITERATOR_REVERSE_ACCESS_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/reverse_iterator.h> #include #include diff --git a/libcxx/include/__iterator/reverse_iterator.h b/libcxx/include/__iterator/reverse_iterator.h --- a/libcxx/include/__iterator/reverse_iterator.h +++ b/libcxx/include/__iterator/reverse_iterator.h @@ -14,7 +14,7 @@ #include <__compare/compare_three_way_result.h> #include <__compare/three_way_comparable.h> #include <__concepts/convertible_to.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/advance.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> diff --git a/libcxx/include/__iterator/segmented_iterator.h b/libcxx/include/__iterator/segmented_iterator.h --- a/libcxx/include/__iterator/segmented_iterator.h +++ b/libcxx/include/__iterator/segmented_iterator.h @@ -40,7 +40,7 @@ // - static It Traits::__compose(__segment_iterator, __local_iterator) // Returns the iterator composed of the segment iterator and local iterator. -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include diff --git a/libcxx/include/__iterator/size.h b/libcxx/include/__iterator/size.h --- a/libcxx/include/__iterator/size.h +++ b/libcxx/include/__iterator/size.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_SIZE_H #define _LIBCPP___ITERATOR_SIZE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/common_type.h> #include <__type_traits/make_signed.h> #include diff --git a/libcxx/include/__iterator/sortable.h b/libcxx/include/__iterator/sortable.h --- a/libcxx/include/__iterator/sortable.h +++ b/libcxx/include/__iterator/sortable.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_SORTABLE_H #define _LIBCPP___ITERATOR_SORTABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__iterator/unreachable_sentinel.h b/libcxx/include/__iterator/unreachable_sentinel.h --- a/libcxx/include/__iterator/unreachable_sentinel.h +++ b/libcxx/include/__iterator/unreachable_sentinel.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___ITERATOR_UNREACHABLE_SENTINEL_H #define _LIBCPP___ITERATOR_UNREACHABLE_SENTINEL_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__iterator/wrap_iter.h b/libcxx/include/__iterator/wrap_iter.h --- a/libcxx/include/__iterator/wrap_iter.h +++ b/libcxx/include/__iterator/wrap_iter.h @@ -10,8 +10,8 @@ #ifndef _LIBCPP___ITERATOR_WRAP_ITER_H #define _LIBCPP___ITERATOR_WRAP_ITER_H -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__iterator/iterator_traits.h> #include <__memory/addressof.h> #include <__memory/pointer_traits.h> diff --git a/libcxx/include/__locale b/libcxx/include/__locale --- a/libcxx/include/__locale +++ b/libcxx/include/__locale @@ -10,8 +10,8 @@ #ifndef _LIBCPP___LOCALE #define _LIBCPP___LOCALE -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__type_traits/make_unsigned.h> #include #include diff --git a/libcxx/include/__locale_dir/locale_base_api/locale_guard.h b/libcxx/include/__locale_dir/locale_base_api/locale_guard.h --- a/libcxx/include/__locale_dir/locale_base_api/locale_guard.h +++ b/libcxx/include/__locale_dir/locale_base_api/locale_guard.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_LOCALE_GUARD_H #define _LIBCPP___LOCALE_LOCALE_BASE_API_LOCALE_GUARD_H -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__mbstate_t.h b/libcxx/include/__mbstate_t.h --- a/libcxx/include/__mbstate_t.h +++ b/libcxx/include/__mbstate_t.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___MBSTATE_T_H #define _LIBCPP___MBSTATE_T_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__mdspan/extents.h b/libcxx/include/__mdspan/extents.h --- a/libcxx/include/__mdspan/extents.h +++ b/libcxx/include/__mdspan/extents.h @@ -18,7 +18,7 @@ #define _LIBCPP___MDSPAN_EXTENTS_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/common_type.h> #include <__type_traits/is_convertible.h> #include <__type_traits/is_nothrow_constructible.h> diff --git a/libcxx/include/__memory/addressof.h b/libcxx/include/__memory/addressof.h --- a/libcxx/include/__memory/addressof.h +++ b/libcxx/include/__memory/addressof.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___MEMORY_ADDRESSOF_H #define _LIBCPP___MEMORY_ADDRESSOF_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__memory/align.h b/libcxx/include/__memory/align.h --- a/libcxx/include/__memory/align.h +++ b/libcxx/include/__memory/align.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MEMORY_ALIGN_H #define _LIBCPP___MEMORY_ALIGN_H -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__memory/aligned_alloc.h b/libcxx/include/__memory/aligned_alloc.h --- a/libcxx/include/__memory/aligned_alloc.h +++ b/libcxx/include/__memory/aligned_alloc.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MEMORY_ALIGNED_ALLOC_H #define _LIBCPP___MEMORY_ALIGNED_ALLOC_H -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__memory/allocate_at_least.h b/libcxx/include/__memory/allocate_at_least.h --- a/libcxx/include/__memory/allocate_at_least.h +++ b/libcxx/include/__memory/allocate_at_least.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MEMORY_ALLOCATE_AT_LEAST_H #define _LIBCPP___MEMORY_ALLOCATE_AT_LEAST_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/allocator_traits.h> #include diff --git a/libcxx/include/__memory/allocation_guard.h b/libcxx/include/__memory/allocation_guard.h --- a/libcxx/include/__memory/allocation_guard.h +++ b/libcxx/include/__memory/allocation_guard.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___MEMORY_ALLOCATION_GUARD_H #define _LIBCPP___MEMORY_ALLOCATION_GUARD_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/allocator_traits.h> #include <__utility/move.h> #include diff --git a/libcxx/include/__memory/allocator.h b/libcxx/include/__memory/allocator.h --- a/libcxx/include/__memory/allocator.h +++ b/libcxx/include/__memory/allocator.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___MEMORY_ALLOCATOR_H #define _LIBCPP___MEMORY_ALLOCATOR_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/addressof.h> #include <__memory/allocate_at_least.h> #include <__memory/allocator_traits.h> diff --git a/libcxx/include/__memory/allocator_arg_t.h b/libcxx/include/__memory/allocator_arg_t.h --- a/libcxx/include/__memory/allocator_arg_t.h +++ b/libcxx/include/__memory/allocator_arg_t.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___FUNCTIONAL_ALLOCATOR_ARG_T_H #define _LIBCPP___FUNCTIONAL_ALLOCATOR_ARG_T_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/uses_allocator.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_constructible.h> diff --git a/libcxx/include/__memory/allocator_destructor.h b/libcxx/include/__memory/allocator_destructor.h --- a/libcxx/include/__memory/allocator_destructor.h +++ b/libcxx/include/__memory/allocator_destructor.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MEMORY_ALLOCATOR_DESTRUCTOR_H #define _LIBCPP___MEMORY_ALLOCATOR_DESTRUCTOR_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/allocator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__memory/allocator_traits.h b/libcxx/include/__memory/allocator_traits.h --- a/libcxx/include/__memory/allocator_traits.h +++ b/libcxx/include/__memory/allocator_traits.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___MEMORY_ALLOCATOR_TRAITS_H #define _LIBCPP___MEMORY_ALLOCATOR_TRAITS_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/construct_at.h> #include <__memory/pointer_traits.h> #include <__type_traits/enable_if.h> diff --git a/libcxx/include/__memory/assume_aligned.h b/libcxx/include/__memory/assume_aligned.h --- a/libcxx/include/__memory/assume_aligned.h +++ b/libcxx/include/__memory/assume_aligned.h @@ -11,7 +11,7 @@ #define _LIBCPP___MEMORY_ASSUME_ALIGNED_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_constant_evaluated.h> #include #include diff --git a/libcxx/include/__memory/auto_ptr.h b/libcxx/include/__memory/auto_ptr.h --- a/libcxx/include/__memory/auto_ptr.h +++ b/libcxx/include/__memory/auto_ptr.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___MEMORY_AUTO_PTR_H #define _LIBCPP___MEMORY_AUTO_PTR_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__memory/builtin_new_allocator.h b/libcxx/include/__memory/builtin_new_allocator.h --- a/libcxx/include/__memory/builtin_new_allocator.h +++ b/libcxx/include/__memory/builtin_new_allocator.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MEMORY_BUILTIN_NEW_ALLOCATOR_H #define _LIBCPP___MEMORY_BUILTIN_NEW_ALLOCATOR_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/unique_ptr.h> #include #include diff --git a/libcxx/include/__memory/compressed_pair.h b/libcxx/include/__memory/compressed_pair.h --- a/libcxx/include/__memory/compressed_pair.h +++ b/libcxx/include/__memory/compressed_pair.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___MEMORY_COMPRESSED_PAIR_H #define _LIBCPP___MEMORY_COMPRESSED_PAIR_H -#include <__config> +#include <__config_dir/config.h> #include <__fwd/get.h> #include <__fwd/tuple.h> #include <__tuple/tuple_indices.h> diff --git a/libcxx/include/__memory/concepts.h b/libcxx/include/__memory/concepts.h --- a/libcxx/include/__memory/concepts.h +++ b/libcxx/include/__memory/concepts.h @@ -11,7 +11,7 @@ #define _LIBCPP___MEMORY_CONCEPTS_H #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/iterator_traits.h> #include <__iterator/readable_traits.h> diff --git a/libcxx/include/__memory/construct_at.h b/libcxx/include/__memory/construct_at.h --- a/libcxx/include/__memory/construct_at.h +++ b/libcxx/include/__memory/construct_at.h @@ -11,7 +11,7 @@ #define _LIBCPP___MEMORY_CONSTRUCT_AT_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/access.h> #include <__memory/addressof.h> #include <__memory/voidify.h> diff --git a/libcxx/include/__memory/destruct_n.h b/libcxx/include/__memory/destruct_n.h --- a/libcxx/include/__memory/destruct_n.h +++ b/libcxx/include/__memory/destruct_n.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MEMORY_DESTRUCT_N_H #define _LIBCPP___MEMORY_DESTRUCT_N_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_trivially_destructible.h> #include diff --git a/libcxx/include/__memory/pointer_traits.h b/libcxx/include/__memory/pointer_traits.h --- a/libcxx/include/__memory/pointer_traits.h +++ b/libcxx/include/__memory/pointer_traits.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___MEMORY_POINTER_TRAITS_H #define _LIBCPP___MEMORY_POINTER_TRAITS_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/addressof.h> #include <__type_traits/conditional.h> #include <__type_traits/conjunction.h> diff --git a/libcxx/include/__memory/ranges_construct_at.h b/libcxx/include/__memory/ranges_construct_at.h --- a/libcxx/include/__memory/ranges_construct_at.h +++ b/libcxx/include/__memory/ranges_construct_at.h @@ -11,7 +11,7 @@ #define _LIBCPP___MEMORY_RANGES_CONSTRUCT_AT_H #include <__concepts/destructible.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/incrementable_traits.h> #include <__iterator/readable_traits.h> #include <__memory/concepts.h> diff --git a/libcxx/include/__memory/ranges_uninitialized_algorithms.h b/libcxx/include/__memory/ranges_uninitialized_algorithms.h --- a/libcxx/include/__memory/ranges_uninitialized_algorithms.h +++ b/libcxx/include/__memory/ranges_uninitialized_algorithms.h @@ -12,7 +12,7 @@ #include <__algorithm/in_out_result.h> #include <__concepts/constructible.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> #include <__iterator/iter_move.h> diff --git a/libcxx/include/__memory/raw_storage_iterator.h b/libcxx/include/__memory/raw_storage_iterator.h --- a/libcxx/include/__memory/raw_storage_iterator.h +++ b/libcxx/include/__memory/raw_storage_iterator.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___MEMORY_RAW_STORAGE_ITERATOR_H #define _LIBCPP___MEMORY_RAW_STORAGE_ITERATOR_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator.h> #include <__iterator/iterator_traits.h> #include <__memory/addressof.h> diff --git a/libcxx/include/__memory/shared_ptr.h b/libcxx/include/__memory/shared_ptr.h --- a/libcxx/include/__memory/shared_ptr.h +++ b/libcxx/include/__memory/shared_ptr.h @@ -10,10 +10,10 @@ #ifndef _LIBCPP___MEMORY_SHARED_PTR_H #define _LIBCPP___MEMORY_SHARED_PTR_H -#include <__availability> #include <__compare/compare_three_way.h> #include <__compare/ordering.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__functional/binary_function.h> #include <__functional/operations.h> #include <__functional/reference_wrapper.h> diff --git a/libcxx/include/__memory/swap_allocator.h b/libcxx/include/__memory/swap_allocator.h --- a/libcxx/include/__memory/swap_allocator.h +++ b/libcxx/include/__memory/swap_allocator.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MEMORY_SWAP_ALLOCATOR_H #define _LIBCPP___MEMORY_SWAP_ALLOCATOR_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/allocator_traits.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_swappable.h> diff --git a/libcxx/include/__memory/temp_value.h b/libcxx/include/__memory/temp_value.h --- a/libcxx/include/__memory/temp_value.h +++ b/libcxx/include/__memory/temp_value.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MEMORY_TEMP_VALUE_H #define _LIBCPP___MEMORY_TEMP_VALUE_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/addressof.h> #include <__memory/allocator_traits.h> #include <__type_traits/aligned_storage.h> diff --git a/libcxx/include/__memory/temporary_buffer.h b/libcxx/include/__memory/temporary_buffer.h --- a/libcxx/include/__memory/temporary_buffer.h +++ b/libcxx/include/__memory/temporary_buffer.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___MEMORY_TEMPORARY_BUFFER_H #define _LIBCPP___MEMORY_TEMPORARY_BUFFER_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/alignment_of.h> #include <__utility/pair.h> #include diff --git a/libcxx/include/__memory/uninitialized_algorithms.h b/libcxx/include/__memory/uninitialized_algorithms.h --- a/libcxx/include/__memory/uninitialized_algorithms.h +++ b/libcxx/include/__memory/uninitialized_algorithms.h @@ -14,7 +14,7 @@ #include <__algorithm/move.h> #include <__algorithm/unwrap_iter.h> #include <__algorithm/unwrap_range.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__iterator/reverse_iterator.h> #include <__memory/addressof.h> diff --git a/libcxx/include/__memory/unique_ptr.h b/libcxx/include/__memory/unique_ptr.h --- a/libcxx/include/__memory/unique_ptr.h +++ b/libcxx/include/__memory/unique_ptr.h @@ -13,7 +13,7 @@ #include <__compare/compare_three_way.h> #include <__compare/compare_three_way_result.h> #include <__compare/three_way_comparable.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/hash.h> #include <__functional/operations.h> #include <__memory/allocator_traits.h> // __pointer diff --git a/libcxx/include/__memory/uses_allocator.h b/libcxx/include/__memory/uses_allocator.h --- a/libcxx/include/__memory/uses_allocator.h +++ b/libcxx/include/__memory/uses_allocator.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___MEMORY_USES_ALLOCATOR_H #define _LIBCPP___MEMORY_USES_ALLOCATOR_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_convertible.h> #include diff --git a/libcxx/include/__memory/uses_allocator_construction.h b/libcxx/include/__memory/uses_allocator_construction.h --- a/libcxx/include/__memory/uses_allocator_construction.h +++ b/libcxx/include/__memory/uses_allocator_construction.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MEMORY_USES_ALLOCATOR_CONSTRUCTION_H #define _LIBCPP___MEMORY_USES_ALLOCATOR_CONSTRUCTION_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/construct_at.h> #include <__memory/uses_allocator.h> #include <__type_traits/enable_if.h> diff --git a/libcxx/include/__memory/voidify.h b/libcxx/include/__memory/voidify.h --- a/libcxx/include/__memory/voidify.h +++ b/libcxx/include/__memory/voidify.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___MEMORY_VOIDIFY_H #define _LIBCPP___MEMORY_VOIDIFY_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/addressof.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__memory_resource/memory_resource.h b/libcxx/include/__memory_resource/memory_resource.h --- a/libcxx/include/__memory_resource/memory_resource.h +++ b/libcxx/include/__memory_resource/memory_resource.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MEMORY_RESOURCE_MEMORY_RESOURCE_H #define _LIBCPP___MEMORY_RESOURCE_MEMORY_RESOURCE_H -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__memory_resource/monotonic_buffer_resource.h b/libcxx/include/__memory_resource/monotonic_buffer_resource.h --- a/libcxx/include/__memory_resource/monotonic_buffer_resource.h +++ b/libcxx/include/__memory_resource/monotonic_buffer_resource.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H #define _LIBCPP___MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/addressof.h> #include <__memory_resource/memory_resource.h> #include diff --git a/libcxx/include/__memory_resource/polymorphic_allocator.h b/libcxx/include/__memory_resource/polymorphic_allocator.h --- a/libcxx/include/__memory_resource/polymorphic_allocator.h +++ b/libcxx/include/__memory_resource/polymorphic_allocator.h @@ -10,7 +10,7 @@ #define _LIBCPP___MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__memory_resource/memory_resource.h> #include <__utility/exception_guard.h> #include diff --git a/libcxx/include/__memory_resource/pool_options.h b/libcxx/include/__memory_resource/pool_options.h --- a/libcxx/include/__memory_resource/pool_options.h +++ b/libcxx/include/__memory_resource/pool_options.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MEMORY_RESOURCE_POOL_OPTIONS_H #define _LIBCPP___MEMORY_RESOURCE_POOL_OPTIONS_H -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__memory_resource/synchronized_pool_resource.h b/libcxx/include/__memory_resource/synchronized_pool_resource.h --- a/libcxx/include/__memory_resource/synchronized_pool_resource.h +++ b/libcxx/include/__memory_resource/synchronized_pool_resource.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H #define _LIBCPP___MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H -#include <__config> +#include <__config_dir/config.h> #include <__memory_resource/memory_resource.h> #include <__memory_resource/pool_options.h> #include <__memory_resource/unsynchronized_pool_resource.h> diff --git a/libcxx/include/__memory_resource/unsynchronized_pool_resource.h b/libcxx/include/__memory_resource/unsynchronized_pool_resource.h --- a/libcxx/include/__memory_resource/unsynchronized_pool_resource.h +++ b/libcxx/include/__memory_resource/unsynchronized_pool_resource.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H #define _LIBCPP___MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H -#include <__config> +#include <__config_dir/config.h> #include <__memory_resource/memory_resource.h> #include <__memory_resource/pool_options.h> #include diff --git a/libcxx/include/__mutex/lock_guard.h b/libcxx/include/__mutex/lock_guard.h --- a/libcxx/include/__mutex/lock_guard.h +++ b/libcxx/include/__mutex/lock_guard.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MUTEX_LOCK_GUARD_H #define _LIBCPP___MUTEX_LOCK_GUARD_H -#include <__config> +#include <__config_dir/config.h> #include <__mutex/tag_types.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__mutex/mutex.h b/libcxx/include/__mutex/mutex.h --- a/libcxx/include/__mutex/mutex.h +++ b/libcxx/include/__mutex/mutex.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MUTEX_MUTEX_H #define _LIBCPP___MUTEX_MUTEX_H -#include <__config> +#include <__config_dir/config.h> #include <__threading_support> #include <__type_traits/is_nothrow_default_constructible.h> diff --git a/libcxx/include/__mutex/tag_types.h b/libcxx/include/__mutex/tag_types.h --- a/libcxx/include/__mutex/tag_types.h +++ b/libcxx/include/__mutex/tag_types.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___MUTEX_TAG_TYPES_H #define _LIBCPP___MUTEX_TAG_TYPES_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__mutex/unique_lock.h b/libcxx/include/__mutex/unique_lock.h --- a/libcxx/include/__mutex/unique_lock.h +++ b/libcxx/include/__mutex/unique_lock.h @@ -11,7 +11,7 @@ #include <__chrono/duration.h> #include <__chrono/time_point.h> -#include <__config> +#include <__config_dir/config.h> #include <__memory/addressof.h> #include <__mutex/tag_types.h> #include <__system_error/system_error.h> diff --git a/libcxx/include/__node_handle b/libcxx/include/__node_handle --- a/libcxx/include/__node_handle +++ b/libcxx/include/__node_handle @@ -59,7 +59,7 @@ */ #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__memory/allocator_traits.h> #include <__memory/pointer_traits.h> #include diff --git a/libcxx/include/__numeric/accumulate.h b/libcxx/include/__numeric/accumulate.h --- a/libcxx/include/__numeric/accumulate.h +++ b/libcxx/include/__numeric/accumulate.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___NUMERIC_ACCUMULATE_H #define _LIBCPP___NUMERIC_ACCUMULATE_H -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__numeric/adjacent_difference.h b/libcxx/include/__numeric/adjacent_difference.h --- a/libcxx/include/__numeric/adjacent_difference.h +++ b/libcxx/include/__numeric/adjacent_difference.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___NUMERIC_ADJACENT_DIFFERENCE_H #define _LIBCPP___NUMERIC_ADJACENT_DIFFERENCE_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/move.h> diff --git a/libcxx/include/__numeric/exclusive_scan.h b/libcxx/include/__numeric/exclusive_scan.h --- a/libcxx/include/__numeric/exclusive_scan.h +++ b/libcxx/include/__numeric/exclusive_scan.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___NUMERIC_EXCLUSIVE_SCAN_H #define _LIBCPP___NUMERIC_EXCLUSIVE_SCAN_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/operations.h> #include <__utility/move.h> diff --git a/libcxx/include/__numeric/gcd_lcm.h b/libcxx/include/__numeric/gcd_lcm.h --- a/libcxx/include/__numeric/gcd_lcm.h +++ b/libcxx/include/__numeric/gcd_lcm.h @@ -11,7 +11,7 @@ #define _LIBCPP___NUMERIC_GCD_LCM_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/common_type.h> #include <__type_traits/is_integral.h> #include <__type_traits/is_same.h> diff --git a/libcxx/include/__numeric/inclusive_scan.h b/libcxx/include/__numeric/inclusive_scan.h --- a/libcxx/include/__numeric/inclusive_scan.h +++ b/libcxx/include/__numeric/inclusive_scan.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___NUMERIC_INCLUSIVE_SCAN_H #define _LIBCPP___NUMERIC_INCLUSIVE_SCAN_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/operations.h> #include <__iterator/iterator_traits.h> #include <__utility/move.h> diff --git a/libcxx/include/__numeric/inner_product.h b/libcxx/include/__numeric/inner_product.h --- a/libcxx/include/__numeric/inner_product.h +++ b/libcxx/include/__numeric/inner_product.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___NUMERIC_INNER_PRODUCT_H #define _LIBCPP___NUMERIC_INNER_PRODUCT_H -#include <__config> +#include <__config_dir/config.h> #include <__utility/move.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__numeric/iota.h b/libcxx/include/__numeric/iota.h --- a/libcxx/include/__numeric/iota.h +++ b/libcxx/include/__numeric/iota.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___NUMERIC_IOTA_H #define _LIBCPP___NUMERIC_IOTA_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__numeric/midpoint.h b/libcxx/include/__numeric/midpoint.h --- a/libcxx/include/__numeric/midpoint.h +++ b/libcxx/include/__numeric/midpoint.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___NUMERIC_MIDPOINT_H #define _LIBCPP___NUMERIC_MIDPOINT_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/enable_if.h> #include <__type_traits/is_floating_point.h> #include <__type_traits/is_integral.h> diff --git a/libcxx/include/__numeric/partial_sum.h b/libcxx/include/__numeric/partial_sum.h --- a/libcxx/include/__numeric/partial_sum.h +++ b/libcxx/include/__numeric/partial_sum.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___NUMERIC_PARTIAL_SUM_H #define _LIBCPP___NUMERIC_PARTIAL_SUM_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__utility/move.h> diff --git a/libcxx/include/__numeric/pstl_reduce.h b/libcxx/include/__numeric/pstl_reduce.h --- a/libcxx/include/__numeric/pstl_reduce.h +++ b/libcxx/include/__numeric/pstl_reduce.h @@ -10,7 +10,7 @@ #define _LIBCPP___NUMERIC_PSTL_REDUCE_H #include <__algorithm/pstl_frontend_dispatch.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/identity.h> #include <__iterator/iterator_traits.h> #include <__numeric/pstl_transform_reduce.h> diff --git a/libcxx/include/__numeric/pstl_transform_reduce.h b/libcxx/include/__numeric/pstl_transform_reduce.h --- a/libcxx/include/__numeric/pstl_transform_reduce.h +++ b/libcxx/include/__numeric/pstl_transform_reduce.h @@ -11,7 +11,7 @@ #include <__algorithm/pstl_backend.h> #include <__algorithm/pstl_frontend_dispatch.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/operations.h> #include <__numeric/transform_reduce.h> #include <__type_traits/is_execution_policy.h> diff --git a/libcxx/include/__numeric/reduce.h b/libcxx/include/__numeric/reduce.h --- a/libcxx/include/__numeric/reduce.h +++ b/libcxx/include/__numeric/reduce.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___NUMERIC_REDUCE_H #define _LIBCPP___NUMERIC_REDUCE_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/operations.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__numeric/transform_exclusive_scan.h b/libcxx/include/__numeric/transform_exclusive_scan.h --- a/libcxx/include/__numeric/transform_exclusive_scan.h +++ b/libcxx/include/__numeric/transform_exclusive_scan.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___NUMERIC_TRANSFORM_EXCLUSIVE_SCAN_H #define _LIBCPP___NUMERIC_TRANSFORM_EXCLUSIVE_SCAN_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__numeric/transform_inclusive_scan.h b/libcxx/include/__numeric/transform_inclusive_scan.h --- a/libcxx/include/__numeric/transform_inclusive_scan.h +++ b/libcxx/include/__numeric/transform_inclusive_scan.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___NUMERIC_TRANSFORM_INCLUSIVE_SCAN_H #define _LIBCPP___NUMERIC_TRANSFORM_INCLUSIVE_SCAN_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__numeric/transform_reduce.h b/libcxx/include/__numeric/transform_reduce.h --- a/libcxx/include/__numeric/transform_reduce.h +++ b/libcxx/include/__numeric/transform_reduce.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___NUMERIC_TRANSFORM_REDUCE_H #define _LIBCPP___NUMERIC_TRANSFORM_REDUCE_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/operations.h> #include <__utility/move.h> diff --git a/libcxx/include/__pstl/internal/algorithm_fwd.h b/libcxx/include/__pstl/internal/algorithm_fwd.h --- a/libcxx/include/__pstl/internal/algorithm_fwd.h +++ b/libcxx/include/__pstl/internal/algorithm_fwd.h @@ -10,7 +10,7 @@ #ifndef _PSTL_ALGORITHM_FWD_H #define _PSTL_ALGORITHM_FWD_H -#include <__config> +#include <__config_dir/config.h> #include #include #include diff --git a/libcxx/include/__pstl/internal/algorithm_impl.h b/libcxx/include/__pstl/internal/algorithm_impl.h --- a/libcxx/include/__pstl/internal/algorithm_impl.h +++ b/libcxx/include/__pstl/internal/algorithm_impl.h @@ -11,7 +11,7 @@ #define _PSTL_ALGORITHM_IMPL_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include #include #include diff --git a/libcxx/include/__pstl/internal/execution_defs.h b/libcxx/include/__pstl/internal/execution_defs.h --- a/libcxx/include/__pstl/internal/execution_defs.h +++ b/libcxx/include/__pstl/internal/execution_defs.h @@ -10,7 +10,7 @@ #ifndef _PSTL_EXECUTION_POLICY_DEFS_H #define _PSTL_EXECUTION_POLICY_DEFS_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/decay.h> #include <__type_traits/enable_if.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__pstl/internal/execution_impl.h b/libcxx/include/__pstl/internal/execution_impl.h --- a/libcxx/include/__pstl/internal/execution_impl.h +++ b/libcxx/include/__pstl/internal/execution_impl.h @@ -10,7 +10,7 @@ #ifndef _PSTL_EXECUTION_IMPL_H #define _PSTL_EXECUTION_IMPL_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__type_traits/conditional.h> #include <__type_traits/conjunction.h> diff --git a/libcxx/include/__pstl/internal/glue_algorithm_defs.h b/libcxx/include/__pstl/internal/glue_algorithm_defs.h --- a/libcxx/include/__pstl/internal/glue_algorithm_defs.h +++ b/libcxx/include/__pstl/internal/glue_algorithm_defs.h @@ -10,7 +10,7 @@ #ifndef _PSTL_GLUE_ALGORITHM_DEFS_H #define _PSTL_GLUE_ALGORITHM_DEFS_H -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__pstl/internal/glue_algorithm_impl.h b/libcxx/include/__pstl/internal/glue_algorithm_impl.h --- a/libcxx/include/__pstl/internal/glue_algorithm_impl.h +++ b/libcxx/include/__pstl/internal/glue_algorithm_impl.h @@ -10,7 +10,7 @@ #ifndef _PSTL_GLUE_ALGORITHM_IMPL_H #define _PSTL_GLUE_ALGORITHM_IMPL_H -#include <__config> +#include <__config_dir/config.h> #include #include "algorithm_fwd.h" diff --git a/libcxx/include/__pstl/internal/glue_memory_defs.h b/libcxx/include/__pstl/internal/glue_memory_defs.h --- a/libcxx/include/__pstl/internal/glue_memory_defs.h +++ b/libcxx/include/__pstl/internal/glue_memory_defs.h @@ -10,7 +10,7 @@ #ifndef _PSTL_GLUE_MEMORY_DEFS_H #define _PSTL_GLUE_MEMORY_DEFS_H -#include <__config> +#include <__config_dir/config.h> #include "execution_defs.h" diff --git a/libcxx/include/__pstl/internal/glue_memory_impl.h b/libcxx/include/__pstl/internal/glue_memory_impl.h --- a/libcxx/include/__pstl/internal/glue_memory_impl.h +++ b/libcxx/include/__pstl/internal/glue_memory_impl.h @@ -10,7 +10,7 @@ #ifndef _PSTL_GLUE_MEMORY_IMPL_H #define _PSTL_GLUE_MEMORY_IMPL_H -#include <__config> +#include <__config_dir/config.h> #include "algorithm_fwd.h" #include "execution_defs.h" diff --git a/libcxx/include/__pstl/internal/glue_numeric_defs.h b/libcxx/include/__pstl/internal/glue_numeric_defs.h --- a/libcxx/include/__pstl/internal/glue_numeric_defs.h +++ b/libcxx/include/__pstl/internal/glue_numeric_defs.h @@ -10,7 +10,7 @@ #ifndef _PSTL_GLUE_NUMERIC_DEFS_H #define _PSTL_GLUE_NUMERIC_DEFS_H -#include <__config> +#include <__config_dir/config.h> #include #include "execution_defs.h" diff --git a/libcxx/include/__pstl/internal/glue_numeric_impl.h b/libcxx/include/__pstl/internal/glue_numeric_impl.h --- a/libcxx/include/__pstl/internal/glue_numeric_impl.h +++ b/libcxx/include/__pstl/internal/glue_numeric_impl.h @@ -10,7 +10,7 @@ #ifndef _PSTL_GLUE_NUMERIC_IMPL_H #define _PSTL_GLUE_NUMERIC_IMPL_H -#include <__config> +#include <__config_dir/config.h> #include #include "execution_impl.h" diff --git a/libcxx/include/__pstl/internal/memory_impl.h b/libcxx/include/__pstl/internal/memory_impl.h --- a/libcxx/include/__pstl/internal/memory_impl.h +++ b/libcxx/include/__pstl/internal/memory_impl.h @@ -10,7 +10,7 @@ #ifndef _PSTL_MEMORY_IMPL_H #define _PSTL_MEMORY_IMPL_H -#include <__config> +#include <__config_dir/config.h> #include #include "unseq_backend_simd.h" diff --git a/libcxx/include/__pstl/internal/numeric_fwd.h b/libcxx/include/__pstl/internal/numeric_fwd.h --- a/libcxx/include/__pstl/internal/numeric_fwd.h +++ b/libcxx/include/__pstl/internal/numeric_fwd.h @@ -10,7 +10,7 @@ #ifndef _PSTL_NUMERIC_FWD_H #define _PSTL_NUMERIC_FWD_H -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__pstl/internal/numeric_impl.h b/libcxx/include/__pstl/internal/numeric_impl.h --- a/libcxx/include/__pstl/internal/numeric_impl.h +++ b/libcxx/include/__pstl/internal/numeric_impl.h @@ -11,7 +11,7 @@ #define _PSTL_NUMERIC_IMPL_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include #include #include diff --git a/libcxx/include/__pstl/internal/parallel_backend.h b/libcxx/include/__pstl/internal/parallel_backend.h --- a/libcxx/include/__pstl/internal/parallel_backend.h +++ b/libcxx/include/__pstl/internal/parallel_backend.h @@ -10,7 +10,7 @@ #ifndef _PSTL_PARALLEL_BACKEND_H #define _PSTL_PARALLEL_BACKEND_H -#include <__config> +#include <__config_dir/config.h> #if defined(_PSTL_PAR_BACKEND_SERIAL) # include "parallel_backend_serial.h" diff --git a/libcxx/include/__pstl/internal/parallel_backend_serial.h b/libcxx/include/__pstl/internal/parallel_backend_serial.h --- a/libcxx/include/__pstl/internal/parallel_backend_serial.h +++ b/libcxx/include/__pstl/internal/parallel_backend_serial.h @@ -10,7 +10,7 @@ #ifndef _PSTL_PARALLEL_BACKEND_SERIAL_H #define _PSTL_PARALLEL_BACKEND_SERIAL_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/allocator.h> #include <__pstl/internal/execution_impl.h> #include <__utility/forward.h> diff --git a/libcxx/include/__pstl/internal/parallel_backend_tbb.h b/libcxx/include/__pstl/internal/parallel_backend_tbb.h --- a/libcxx/include/__pstl/internal/parallel_backend_tbb.h +++ b/libcxx/include/__pstl/internal/parallel_backend_tbb.h @@ -11,7 +11,7 @@ #define _PSTL_PARALLEL_BACKEND_TBB_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__pstl/internal/parallel_backend_utils.h b/libcxx/include/__pstl/internal/parallel_backend_utils.h --- a/libcxx/include/__pstl/internal/parallel_backend_utils.h +++ b/libcxx/include/__pstl/internal/parallel_backend_utils.h @@ -11,7 +11,7 @@ #define _PSTL_PARALLEL_BACKEND_UTILS_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__memory/addressof.h> diff --git a/libcxx/include/__pstl/internal/unseq_backend_simd.h b/libcxx/include/__pstl/internal/unseq_backend_simd.h --- a/libcxx/include/__pstl/internal/unseq_backend_simd.h +++ b/libcxx/include/__pstl/internal/unseq_backend_simd.h @@ -10,7 +10,7 @@ #ifndef _PSTL_UNSEQ_BACKEND_SIMD_H #define _PSTL_UNSEQ_BACKEND_SIMD_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/operations.h> #include <__iterator/iterator_traits.h> #include <__type_traits/is_arithmetic.h> diff --git a/libcxx/include/__pstl/internal/utils.h b/libcxx/include/__pstl/internal/utils.h --- a/libcxx/include/__pstl/internal/utils.h +++ b/libcxx/include/__pstl/internal/utils.h @@ -10,7 +10,7 @@ #ifndef _PSTL_UTILS_H #define _PSTL_UTILS_H -#include <__config> +#include <__config_dir/config.h> #include <__exception/terminate.h> #include <__utility/forward.h> #include diff --git a/libcxx/include/__random/bernoulli_distribution.h b/libcxx/include/__random/bernoulli_distribution.h --- a/libcxx/include/__random/bernoulli_distribution.h +++ b/libcxx/include/__random/bernoulli_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_BERNOULLI_DISTRIBUTION_H #define _LIBCPP___RANDOM_BERNOULLI_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/is_valid.h> #include <__random/uniform_real_distribution.h> #include diff --git a/libcxx/include/__random/binomial_distribution.h b/libcxx/include/__random/binomial_distribution.h --- a/libcxx/include/__random/binomial_distribution.h +++ b/libcxx/include/__random/binomial_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_BINOMIAL_DISTRIBUTION_H #define _LIBCPP___RANDOM_BINOMIAL_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/is_valid.h> #include <__random/uniform_real_distribution.h> #include diff --git a/libcxx/include/__random/cauchy_distribution.h b/libcxx/include/__random/cauchy_distribution.h --- a/libcxx/include/__random/cauchy_distribution.h +++ b/libcxx/include/__random/cauchy_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_CAUCHY_DISTRIBUTION_H #define _LIBCPP___RANDOM_CAUCHY_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/is_valid.h> #include <__random/uniform_real_distribution.h> #include diff --git a/libcxx/include/__random/chi_squared_distribution.h b/libcxx/include/__random/chi_squared_distribution.h --- a/libcxx/include/__random/chi_squared_distribution.h +++ b/libcxx/include/__random/chi_squared_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_CHI_SQUARED_DISTRIBUTION_H #define _LIBCPP___RANDOM_CHI_SQUARED_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/gamma_distribution.h> #include #include diff --git a/libcxx/include/__random/clamp_to_integral.h b/libcxx/include/__random/clamp_to_integral.h --- a/libcxx/include/__random/clamp_to_integral.h +++ b/libcxx/include/__random/clamp_to_integral.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_CLAMP_TO_INTEGRAL_H #define _LIBCPP___RANDOM_CLAMP_TO_INTEGRAL_H -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__random/default_random_engine.h b/libcxx/include/__random/default_random_engine.h --- a/libcxx/include/__random/default_random_engine.h +++ b/libcxx/include/__random/default_random_engine.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_DEFAULT_RANDOM_ENGINE_H #define _LIBCPP___RANDOM_DEFAULT_RANDOM_ENGINE_H -#include <__config> +#include <__config_dir/config.h> #include <__random/linear_congruential_engine.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__random/discard_block_engine.h b/libcxx/include/__random/discard_block_engine.h --- a/libcxx/include/__random/discard_block_engine.h +++ b/libcxx/include/__random/discard_block_engine.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_DISCARD_BLOCK_ENGINE_H #define _LIBCPP___RANDOM_DISCARD_BLOCK_ENGINE_H -#include <__config> +#include <__config_dir/config.h> #include <__random/is_seed_sequence.h> #include <__type_traits/enable_if.h> #include <__type_traits/is_convertible.h> diff --git a/libcxx/include/__random/discrete_distribution.h b/libcxx/include/__random/discrete_distribution.h --- a/libcxx/include/__random/discrete_distribution.h +++ b/libcxx/include/__random/discrete_distribution.h @@ -10,7 +10,7 @@ #define _LIBCPP___RANDOM_DISCRETE_DISTRIBUTION_H #include <__algorithm/upper_bound.h> -#include <__config> +#include <__config_dir/config.h> #include <__random/is_valid.h> #include <__random/uniform_real_distribution.h> #include diff --git a/libcxx/include/__random/exponential_distribution.h b/libcxx/include/__random/exponential_distribution.h --- a/libcxx/include/__random/exponential_distribution.h +++ b/libcxx/include/__random/exponential_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_EXPONENTIAL_DISTRIBUTION_H #define _LIBCPP___RANDOM_EXPONENTIAL_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/generate_canonical.h> #include <__random/is_valid.h> #include <__random/uniform_real_distribution.h> diff --git a/libcxx/include/__random/extreme_value_distribution.h b/libcxx/include/__random/extreme_value_distribution.h --- a/libcxx/include/__random/extreme_value_distribution.h +++ b/libcxx/include/__random/extreme_value_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_EXTREME_VALUE_DISTRIBUTION_H #define _LIBCPP___RANDOM_EXTREME_VALUE_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/is_valid.h> #include <__random/uniform_real_distribution.h> #include diff --git a/libcxx/include/__random/fisher_f_distribution.h b/libcxx/include/__random/fisher_f_distribution.h --- a/libcxx/include/__random/fisher_f_distribution.h +++ b/libcxx/include/__random/fisher_f_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_FISHER_F_DISTRIBUTION_H #define _LIBCPP___RANDOM_FISHER_F_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/gamma_distribution.h> #include <__random/is_valid.h> #include diff --git a/libcxx/include/__random/gamma_distribution.h b/libcxx/include/__random/gamma_distribution.h --- a/libcxx/include/__random/gamma_distribution.h +++ b/libcxx/include/__random/gamma_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_GAMMA_DISTRIBUTION_H #define _LIBCPP___RANDOM_GAMMA_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/exponential_distribution.h> #include <__random/is_valid.h> #include <__random/uniform_real_distribution.h> diff --git a/libcxx/include/__random/generate_canonical.h b/libcxx/include/__random/generate_canonical.h --- a/libcxx/include/__random/generate_canonical.h +++ b/libcxx/include/__random/generate_canonical.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_GENERATE_CANONICAL_H #define _LIBCPP___RANDOM_GENERATE_CANONICAL_H -#include <__config> +#include <__config_dir/config.h> #include <__random/log2.h> #include #include diff --git a/libcxx/include/__random/geometric_distribution.h b/libcxx/include/__random/geometric_distribution.h --- a/libcxx/include/__random/geometric_distribution.h +++ b/libcxx/include/__random/geometric_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_GEOMETRIC_DISTRIBUTION_H #define _LIBCPP___RANDOM_GEOMETRIC_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/is_valid.h> #include <__random/negative_binomial_distribution.h> #include diff --git a/libcxx/include/__random/independent_bits_engine.h b/libcxx/include/__random/independent_bits_engine.h --- a/libcxx/include/__random/independent_bits_engine.h +++ b/libcxx/include/__random/independent_bits_engine.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_INDEPENDENT_BITS_ENGINE_H #define _LIBCPP___RANDOM_INDEPENDENT_BITS_ENGINE_H -#include <__config> +#include <__config_dir/config.h> #include <__random/is_seed_sequence.h> #include <__random/log2.h> #include <__type_traits/conditional.h> diff --git a/libcxx/include/__random/is_seed_sequence.h b/libcxx/include/__random/is_seed_sequence.h --- a/libcxx/include/__random/is_seed_sequence.h +++ b/libcxx/include/__random/is_seed_sequence.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_IS_SEED_SEQUENCE_H #define _LIBCPP___RANDOM_IS_SEED_SEQUENCE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_convertible.h> #include <__type_traits/is_same.h> #include <__type_traits/remove_cv.h> diff --git a/libcxx/include/__random/is_valid.h b/libcxx/include/__random/is_valid.h --- a/libcxx/include/__random/is_valid.h +++ b/libcxx/include/__random/is_valid.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_IS_VALID_H #define _LIBCPP___RANDOM_IS_VALID_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/enable_if.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_same.h> diff --git a/libcxx/include/__random/knuth_b.h b/libcxx/include/__random/knuth_b.h --- a/libcxx/include/__random/knuth_b.h +++ b/libcxx/include/__random/knuth_b.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_KNUTH_B_H #define _LIBCPP___RANDOM_KNUTH_B_H -#include <__config> +#include <__config_dir/config.h> #include <__random/linear_congruential_engine.h> #include <__random/shuffle_order_engine.h> diff --git a/libcxx/include/__random/linear_congruential_engine.h b/libcxx/include/__random/linear_congruential_engine.h --- a/libcxx/include/__random/linear_congruential_engine.h +++ b/libcxx/include/__random/linear_congruential_engine.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_LINEAR_CONGRUENTIAL_ENGINE_H #define _LIBCPP___RANDOM_LINEAR_CONGRUENTIAL_ENGINE_H -#include <__config> +#include <__config_dir/config.h> #include <__random/is_seed_sequence.h> #include <__type_traits/enable_if.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__random/log2.h b/libcxx/include/__random/log2.h --- a/libcxx/include/__random/log2.h +++ b/libcxx/include/__random/log2.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_LOG2_H #define _LIBCPP___RANDOM_LOG2_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conditional.h> #include diff --git a/libcxx/include/__random/lognormal_distribution.h b/libcxx/include/__random/lognormal_distribution.h --- a/libcxx/include/__random/lognormal_distribution.h +++ b/libcxx/include/__random/lognormal_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_LOGNORMAL_DISTRIBUTION_H #define _LIBCPP___RANDOM_LOGNORMAL_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/normal_distribution.h> #include #include diff --git a/libcxx/include/__random/mersenne_twister_engine.h b/libcxx/include/__random/mersenne_twister_engine.h --- a/libcxx/include/__random/mersenne_twister_engine.h +++ b/libcxx/include/__random/mersenne_twister_engine.h @@ -11,7 +11,7 @@ #include <__algorithm/equal.h> #include <__algorithm/min.h> -#include <__config> +#include <__config_dir/config.h> #include <__random/is_seed_sequence.h> #include #include diff --git a/libcxx/include/__random/negative_binomial_distribution.h b/libcxx/include/__random/negative_binomial_distribution.h --- a/libcxx/include/__random/negative_binomial_distribution.h +++ b/libcxx/include/__random/negative_binomial_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_NEGATIVE_BINOMIAL_DISTRIBUTION_H #define _LIBCPP___RANDOM_NEGATIVE_BINOMIAL_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/bernoulli_distribution.h> #include <__random/gamma_distribution.h> #include <__random/is_valid.h> diff --git a/libcxx/include/__random/normal_distribution.h b/libcxx/include/__random/normal_distribution.h --- a/libcxx/include/__random/normal_distribution.h +++ b/libcxx/include/__random/normal_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_NORMAL_DISTRIBUTION_H #define _LIBCPP___RANDOM_NORMAL_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/is_valid.h> #include <__random/uniform_real_distribution.h> #include diff --git a/libcxx/include/__random/piecewise_constant_distribution.h b/libcxx/include/__random/piecewise_constant_distribution.h --- a/libcxx/include/__random/piecewise_constant_distribution.h +++ b/libcxx/include/__random/piecewise_constant_distribution.h @@ -10,7 +10,7 @@ #define _LIBCPP___RANDOM_PIECEWISE_CONSTANT_DISTRIBUTION_H #include <__algorithm/upper_bound.h> -#include <__config> +#include <__config_dir/config.h> #include <__random/is_valid.h> #include <__random/uniform_real_distribution.h> #include diff --git a/libcxx/include/__random/piecewise_linear_distribution.h b/libcxx/include/__random/piecewise_linear_distribution.h --- a/libcxx/include/__random/piecewise_linear_distribution.h +++ b/libcxx/include/__random/piecewise_linear_distribution.h @@ -10,7 +10,7 @@ #define _LIBCPP___RANDOM_PIECEWISE_LINEAR_DISTRIBUTION_H #include <__algorithm/upper_bound.h> -#include <__config> +#include <__config_dir/config.h> #include <__random/is_valid.h> #include <__random/uniform_real_distribution.h> #include diff --git a/libcxx/include/__random/poisson_distribution.h b/libcxx/include/__random/poisson_distribution.h --- a/libcxx/include/__random/poisson_distribution.h +++ b/libcxx/include/__random/poisson_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_POISSON_DISTRIBUTION_H #define _LIBCPP___RANDOM_POISSON_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/clamp_to_integral.h> #include <__random/exponential_distribution.h> #include <__random/is_valid.h> diff --git a/libcxx/include/__random/random_device.h b/libcxx/include/__random/random_device.h --- a/libcxx/include/__random/random_device.h +++ b/libcxx/include/__random/random_device.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_RANDOM_DEVICE_H #define _LIBCPP___RANDOM_RANDOM_DEVICE_H -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__random/ranlux.h b/libcxx/include/__random/ranlux.h --- a/libcxx/include/__random/ranlux.h +++ b/libcxx/include/__random/ranlux.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_RANLUX_H #define _LIBCPP___RANDOM_RANLUX_H -#include <__config> +#include <__config_dir/config.h> #include <__random/discard_block_engine.h> #include <__random/subtract_with_carry_engine.h> #include diff --git a/libcxx/include/__random/seed_seq.h b/libcxx/include/__random/seed_seq.h --- a/libcxx/include/__random/seed_seq.h +++ b/libcxx/include/__random/seed_seq.h @@ -12,7 +12,7 @@ #include <__algorithm/copy.h> #include <__algorithm/fill.h> #include <__algorithm/max.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include #include diff --git a/libcxx/include/__random/shuffle_order_engine.h b/libcxx/include/__random/shuffle_order_engine.h --- a/libcxx/include/__random/shuffle_order_engine.h +++ b/libcxx/include/__random/shuffle_order_engine.h @@ -10,7 +10,7 @@ #define _LIBCPP___RANDOM_SHUFFLE_ORDER_ENGINE_H #include <__algorithm/equal.h> -#include <__config> +#include <__config_dir/config.h> #include <__random/is_seed_sequence.h> #include <__type_traits/enable_if.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__random/student_t_distribution.h b/libcxx/include/__random/student_t_distribution.h --- a/libcxx/include/__random/student_t_distribution.h +++ b/libcxx/include/__random/student_t_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_STUDENT_T_DISTRIBUTION_H #define _LIBCPP___RANDOM_STUDENT_T_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/gamma_distribution.h> #include <__random/is_valid.h> #include <__random/normal_distribution.h> diff --git a/libcxx/include/__random/subtract_with_carry_engine.h b/libcxx/include/__random/subtract_with_carry_engine.h --- a/libcxx/include/__random/subtract_with_carry_engine.h +++ b/libcxx/include/__random/subtract_with_carry_engine.h @@ -11,7 +11,7 @@ #include <__algorithm/equal.h> #include <__algorithm/min.h> -#include <__config> +#include <__config_dir/config.h> #include <__random/is_seed_sequence.h> #include <__random/linear_congruential_engine.h> #include diff --git a/libcxx/include/__random/uniform_int_distribution.h b/libcxx/include/__random/uniform_int_distribution.h --- a/libcxx/include/__random/uniform_int_distribution.h +++ b/libcxx/include/__random/uniform_int_distribution.h @@ -10,7 +10,7 @@ #define _LIBCPP___RANDOM_UNIFORM_INT_DISTRIBUTION_H #include <__bit/countl.h> -#include <__config> +#include <__config_dir/config.h> #include <__random/is_valid.h> #include <__random/log2.h> #include <__type_traits/conditional.h> diff --git a/libcxx/include/__random/uniform_random_bit_generator.h b/libcxx/include/__random/uniform_random_bit_generator.h --- a/libcxx/include/__random/uniform_random_bit_generator.h +++ b/libcxx/include/__random/uniform_random_bit_generator.h @@ -12,7 +12,7 @@ #include <__concepts/arithmetic.h> #include <__concepts/invocable.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__random/uniform_real_distribution.h b/libcxx/include/__random/uniform_real_distribution.h --- a/libcxx/include/__random/uniform_real_distribution.h +++ b/libcxx/include/__random/uniform_real_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_UNIFORM_REAL_DISTRIBUTION_H #define _LIBCPP___RANDOM_UNIFORM_REAL_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/generate_canonical.h> #include <__random/is_valid.h> #include diff --git a/libcxx/include/__random/weibull_distribution.h b/libcxx/include/__random/weibull_distribution.h --- a/libcxx/include/__random/weibull_distribution.h +++ b/libcxx/include/__random/weibull_distribution.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___RANDOM_WEIBULL_DISTRIBUTION_H #define _LIBCPP___RANDOM_WEIBULL_DISTRIBUTION_H -#include <__config> +#include <__config_dir/config.h> #include <__random/exponential_distribution.h> #include #include diff --git a/libcxx/include/__ranges/access.h b/libcxx/include/__ranges/access.h --- a/libcxx/include/__ranges/access.h +++ b/libcxx/include/__ranges/access.h @@ -11,7 +11,7 @@ #define _LIBCPP___RANGES_ACCESS_H #include <__concepts/class_or_enum.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/readable_traits.h> #include <__ranges/enable_borrowed_range.h> diff --git a/libcxx/include/__ranges/all.h b/libcxx/include/__ranges/all.h --- a/libcxx/include/__ranges/all.h +++ b/libcxx/include/__ranges/all.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___RANGES_ALL_H #define _LIBCPP___RANGES_ALL_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/iterator_traits.h> #include <__ranges/access.h> diff --git a/libcxx/include/__ranges/as_rvalue_view.h b/libcxx/include/__ranges/as_rvalue_view.h --- a/libcxx/include/__ranges/as_rvalue_view.h +++ b/libcxx/include/__ranges/as_rvalue_view.h @@ -11,7 +11,7 @@ #include <__concepts/constructible.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/move_iterator.h> #include <__iterator/move_sentinel.h> #include <__ranges/access.h> diff --git a/libcxx/include/__ranges/common_view.h b/libcxx/include/__ranges/common_view.h --- a/libcxx/include/__ranges/common_view.h +++ b/libcxx/include/__ranges/common_view.h @@ -12,7 +12,7 @@ #include <__concepts/constructible.h> #include <__concepts/copyable.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/common_iterator.h> #include <__iterator/iterator_traits.h> #include <__ranges/access.h> diff --git a/libcxx/include/__ranges/concepts.h b/libcxx/include/__ranges/concepts.h --- a/libcxx/include/__ranges/concepts.h +++ b/libcxx/include/__ranges/concepts.h @@ -13,7 +13,7 @@ #include <__concepts/constructible.h> #include <__concepts/movable.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> #include <__iterator/iter_move.h> diff --git a/libcxx/include/__ranges/container_compatible_range.h b/libcxx/include/__ranges/container_compatible_range.h --- a/libcxx/include/__ranges/container_compatible_range.h +++ b/libcxx/include/__ranges/container_compatible_range.h @@ -11,7 +11,7 @@ #define _LIBCPP___RANGES_CONTAINER_COMPATIBLE_RANGE_H #include <__concepts/convertible_to.h> -#include <__config> +#include <__config_dir/config.h> #include <__ranges/concepts.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__ranges/copyable_box.h b/libcxx/include/__ranges/copyable_box.h --- a/libcxx/include/__ranges/copyable_box.h +++ b/libcxx/include/__ranges/copyable_box.h @@ -13,7 +13,7 @@ #include <__concepts/constructible.h> #include <__concepts/copyable.h> #include <__concepts/movable.h> -#include <__config> +#include <__config_dir/config.h> #include <__memory/addressof.h> #include <__memory/construct_at.h> #include <__type_traits/is_nothrow_constructible.h> diff --git a/libcxx/include/__ranges/counted.h b/libcxx/include/__ranges/counted.h --- a/libcxx/include/__ranges/counted.h +++ b/libcxx/include/__ranges/counted.h @@ -11,7 +11,7 @@ #define _LIBCPP___RANGES_COUNTED_H #include <__concepts/convertible_to.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/counted_iterator.h> #include <__iterator/default_sentinel.h> diff --git a/libcxx/include/__ranges/dangling.h b/libcxx/include/__ranges/dangling.h --- a/libcxx/include/__ranges/dangling.h +++ b/libcxx/include/__ranges/dangling.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___RANGES_DANGLING_H #define _LIBCPP___RANGES_DANGLING_H -#include <__config> +#include <__config_dir/config.h> #include <__ranges/access.h> #include <__ranges/concepts.h> #include <__type_traits/conditional.h> diff --git a/libcxx/include/__ranges/data.h b/libcxx/include/__ranges/data.h --- a/libcxx/include/__ranges/data.h +++ b/libcxx/include/__ranges/data.h @@ -11,7 +11,7 @@ #define _LIBCPP___RANGES_DATA_H #include <__concepts/class_or_enum.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/iterator_traits.h> #include <__memory/pointer_traits.h> diff --git a/libcxx/include/__ranges/drop_view.h b/libcxx/include/__ranges/drop_view.h --- a/libcxx/include/__ranges/drop_view.h +++ b/libcxx/include/__ranges/drop_view.h @@ -14,7 +14,7 @@ #include <__assert> #include <__concepts/constructible.h> #include <__concepts/convertible_to.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/bind_back.h> #include <__fwd/span.h> #include <__fwd/string_view.h> diff --git a/libcxx/include/__ranges/drop_while_view.h b/libcxx/include/__ranges/drop_while_view.h --- a/libcxx/include/__ranges/drop_while_view.h +++ b/libcxx/include/__ranges/drop_while_view.h @@ -13,7 +13,7 @@ #include <__algorithm/ranges_find_if_not.h> #include <__assert> #include <__concepts/constructible.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/bind_back.h> #include <__functional/reference_wrapper.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__ranges/elements_view.h b/libcxx/include/__ranges/elements_view.h --- a/libcxx/include/__ranges/elements_view.h +++ b/libcxx/include/__ranges/elements_view.h @@ -15,7 +15,7 @@ #include <__concepts/convertible_to.h> #include <__concepts/derived_from.h> #include <__concepts/equality_comparable.h> -#include <__config> +#include <__config_dir/config.h> #include <__fwd/get.h> #include <__iterator/concepts.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__ranges/empty.h b/libcxx/include/__ranges/empty.h --- a/libcxx/include/__ranges/empty.h +++ b/libcxx/include/__ranges/empty.h @@ -11,7 +11,7 @@ #define _LIBCPP___RANGES_EMPTY_H #include <__concepts/class_or_enum.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__ranges/access.h> #include <__ranges/size.h> diff --git a/libcxx/include/__ranges/empty_view.h b/libcxx/include/__ranges/empty_view.h --- a/libcxx/include/__ranges/empty_view.h +++ b/libcxx/include/__ranges/empty_view.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___RANGES_EMPTY_VIEW_H #define _LIBCPP___RANGES_EMPTY_VIEW_H -#include <__config> +#include <__config_dir/config.h> #include <__ranges/enable_borrowed_range.h> #include <__ranges/view_interface.h> #include <__type_traits/is_object.h> diff --git a/libcxx/include/__ranges/enable_borrowed_range.h b/libcxx/include/__ranges/enable_borrowed_range.h --- a/libcxx/include/__ranges/enable_borrowed_range.h +++ b/libcxx/include/__ranges/enable_borrowed_range.h @@ -14,7 +14,7 @@ // separate header is used to avoid including the entire header in // and . -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__ranges/enable_view.h b/libcxx/include/__ranges/enable_view.h --- a/libcxx/include/__ranges/enable_view.h +++ b/libcxx/include/__ranges/enable_view.h @@ -12,7 +12,7 @@ #include <__concepts/derived_from.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_class.h> #include <__type_traits/is_convertible.h> #include <__type_traits/remove_cv.h> diff --git a/libcxx/include/__ranges/filter_view.h b/libcxx/include/__ranges/filter_view.h --- a/libcxx/include/__ranges/filter_view.h +++ b/libcxx/include/__ranges/filter_view.h @@ -15,8 +15,8 @@ #include <__concepts/copyable.h> #include <__concepts/derived_from.h> #include <__concepts/equality_comparable.h> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__functional/bind_back.h> #include <__functional/invoke.h> #include <__functional/reference_wrapper.h> diff --git a/libcxx/include/__ranges/from_range.h b/libcxx/include/__ranges/from_range.h --- a/libcxx/include/__ranges/from_range.h +++ b/libcxx/include/__ranges/from_range.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___RANGES_FROM_RANGE_H #define _LIBCPP___RANGES_FROM_RANGE_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__ranges/iota_view.h b/libcxx/include/__ranges/iota_view.h --- a/libcxx/include/__ranges/iota_view.h +++ b/libcxx/include/__ranges/iota_view.h @@ -21,7 +21,7 @@ #include <__concepts/same_as.h> #include <__concepts/semiregular.h> #include <__concepts/totally_ordered.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> diff --git a/libcxx/include/__ranges/istream_view.h b/libcxx/include/__ranges/istream_view.h --- a/libcxx/include/__ranges/istream_view.h +++ b/libcxx/include/__ranges/istream_view.h @@ -13,7 +13,7 @@ #include <__concepts/constructible.h> #include <__concepts/derived_from.h> #include <__concepts/movable.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/default_sentinel.h> #include <__iterator/iterator_traits.h> #include <__memory/addressof.h> diff --git a/libcxx/include/__ranges/join_view.h b/libcxx/include/__ranges/join_view.h --- a/libcxx/include/__ranges/join_view.h +++ b/libcxx/include/__ranges/join_view.h @@ -15,7 +15,7 @@ #include <__concepts/copyable.h> #include <__concepts/derived_from.h> #include <__concepts/equality_comparable.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/iter_move.h> #include <__iterator/iter_swap.h> diff --git a/libcxx/include/__ranges/lazy_split_view.h b/libcxx/include/__ranges/lazy_split_view.h --- a/libcxx/include/__ranges/lazy_split_view.h +++ b/libcxx/include/__ranges/lazy_split_view.h @@ -16,7 +16,7 @@ #include <__concepts/constructible.h> #include <__concepts/convertible_to.h> #include <__concepts/derived_from.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/bind_back.h> #include <__functional/ranges_operations.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__ranges/non_propagating_cache.h b/libcxx/include/__ranges/non_propagating_cache.h --- a/libcxx/include/__ranges/non_propagating_cache.h +++ b/libcxx/include/__ranges/non_propagating_cache.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___RANGES_NON_PROPAGATING_CACHE_H #define _LIBCPP___RANGES_NON_PROPAGATING_CACHE_H -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> // indirectly_readable #include <__iterator/iterator_traits.h> // iter_reference_t #include <__memory/addressof.h> diff --git a/libcxx/include/__ranges/owning_view.h b/libcxx/include/__ranges/owning_view.h --- a/libcxx/include/__ranges/owning_view.h +++ b/libcxx/include/__ranges/owning_view.h @@ -12,7 +12,7 @@ #include <__concepts/constructible.h> #include <__concepts/movable.h> -#include <__config> +#include <__config_dir/config.h> #include <__ranges/access.h> #include <__ranges/concepts.h> #include <__ranges/data.h> diff --git a/libcxx/include/__ranges/range_adaptor.h b/libcxx/include/__ranges/range_adaptor.h --- a/libcxx/include/__ranges/range_adaptor.h +++ b/libcxx/include/__ranges/range_adaptor.h @@ -14,7 +14,7 @@ #include <__concepts/derived_from.h> #include <__concepts/invocable.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/compose.h> #include <__functional/invoke.h> #include <__ranges/concepts.h> diff --git a/libcxx/include/__ranges/rbegin.h b/libcxx/include/__ranges/rbegin.h --- a/libcxx/include/__ranges/rbegin.h +++ b/libcxx/include/__ranges/rbegin.h @@ -12,7 +12,7 @@ #include <__concepts/class_or_enum.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/readable_traits.h> #include <__iterator/reverse_iterator.h> diff --git a/libcxx/include/__ranges/ref_view.h b/libcxx/include/__ranges/ref_view.h --- a/libcxx/include/__ranges/ref_view.h +++ b/libcxx/include/__ranges/ref_view.h @@ -12,7 +12,7 @@ #include <__concepts/convertible_to.h> #include <__concepts/different_from.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/incrementable_traits.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__ranges/rend.h b/libcxx/include/__ranges/rend.h --- a/libcxx/include/__ranges/rend.h +++ b/libcxx/include/__ranges/rend.h @@ -12,7 +12,7 @@ #include <__concepts/class_or_enum.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/readable_traits.h> #include <__iterator/reverse_iterator.h> diff --git a/libcxx/include/__ranges/reverse_view.h b/libcxx/include/__ranges/reverse_view.h --- a/libcxx/include/__ranges/reverse_view.h +++ b/libcxx/include/__ranges/reverse_view.h @@ -11,7 +11,7 @@ #define _LIBCPP___RANGES_REVERSE_VIEW_H #include <__concepts/constructible.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/next.h> #include <__iterator/reverse_iterator.h> diff --git a/libcxx/include/__ranges/single_view.h b/libcxx/include/__ranges/single_view.h --- a/libcxx/include/__ranges/single_view.h +++ b/libcxx/include/__ranges/single_view.h @@ -11,7 +11,7 @@ #define _LIBCPP___RANGES_SINGLE_VIEW_H #include <__concepts/constructible.h> -#include <__config> +#include <__config_dir/config.h> #include <__ranges/copyable_box.h> #include <__ranges/range_adaptor.h> #include <__ranges/view_interface.h> diff --git a/libcxx/include/__ranges/size.h b/libcxx/include/__ranges/size.h --- a/libcxx/include/__ranges/size.h +++ b/libcxx/include/__ranges/size.h @@ -12,7 +12,7 @@ #include <__concepts/arithmetic.h> #include <__concepts/class_or_enum.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/iterator_traits.h> #include <__ranges/access.h> diff --git a/libcxx/include/__ranges/split_view.h b/libcxx/include/__ranges/split_view.h --- a/libcxx/include/__ranges/split_view.h +++ b/libcxx/include/__ranges/split_view.h @@ -12,7 +12,7 @@ #include <__algorithm/ranges_search.h> #include <__concepts/constructible.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/bind_back.h> #include <__functional/ranges_operations.h> #include <__iterator/indirectly_comparable.h> diff --git a/libcxx/include/__ranges/subrange.h b/libcxx/include/__ranges/subrange.h --- a/libcxx/include/__ranges/subrange.h +++ b/libcxx/include/__ranges/subrange.h @@ -16,7 +16,7 @@ #include <__concepts/copyable.h> #include <__concepts/derived_from.h> #include <__concepts/different_from.h> -#include <__config> +#include <__config_dir/config.h> #include <__fwd/get.h> #include <__fwd/subrange.h> #include <__iterator/advance.h> diff --git a/libcxx/include/__ranges/take_view.h b/libcxx/include/__ranges/take_view.h --- a/libcxx/include/__ranges/take_view.h +++ b/libcxx/include/__ranges/take_view.h @@ -15,7 +15,7 @@ #include <__assert> #include <__concepts/constructible.h> #include <__concepts/convertible_to.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/bind_back.h> #include <__fwd/span.h> #include <__fwd/string_view.h> diff --git a/libcxx/include/__ranges/take_while_view.h b/libcxx/include/__ranges/take_while_view.h --- a/libcxx/include/__ranges/take_while_view.h +++ b/libcxx/include/__ranges/take_while_view.h @@ -12,7 +12,7 @@ #include <__concepts/constructible.h> #include <__concepts/convertible_to.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/bind_back.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__ranges/transform_view.h b/libcxx/include/__ranges/transform_view.h --- a/libcxx/include/__ranges/transform_view.h +++ b/libcxx/include/__ranges/transform_view.h @@ -17,7 +17,7 @@ #include <__concepts/derived_from.h> #include <__concepts/equality_comparable.h> #include <__concepts/invocable.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/bind_back.h> #include <__functional/invoke.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/__ranges/view_interface.h b/libcxx/include/__ranges/view_interface.h --- a/libcxx/include/__ranges/view_interface.h +++ b/libcxx/include/__ranges/view_interface.h @@ -13,7 +13,7 @@ #include <__assert> #include <__concepts/derived_from.h> #include <__concepts/same_as.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/concepts.h> #include <__iterator/iterator_traits.h> #include <__iterator/prev.h> diff --git a/libcxx/include/__ranges/views.h b/libcxx/include/__ranges/views.h --- a/libcxx/include/__ranges/views.h +++ b/libcxx/include/__ranges/views.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___RANGES_VIEWS #define _LIBCPP___RANGES_VIEWS -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__ranges/zip_view.h b/libcxx/include/__ranges/zip_view.h --- a/libcxx/include/__ranges/zip_view.h +++ b/libcxx/include/__ranges/zip_view.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___RANGES_ZIP_VIEW_H #define _LIBCPP___RANGES_ZIP_VIEW_H -#include <__config> +#include <__config_dir/config.h> #include <__algorithm/ranges_min.h> #include <__compare/three_way_comparable.h> diff --git a/libcxx/include/__split_buffer b/libcxx/include/__split_buffer --- a/libcxx/include/__split_buffer +++ b/libcxx/include/__split_buffer @@ -13,7 +13,7 @@ #include <__algorithm/max.h> #include <__algorithm/move.h> #include <__algorithm/move_backward.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/distance.h> #include <__iterator/iterator_traits.h> #include <__iterator/move_iterator.h> diff --git a/libcxx/include/__std_mbstate_t.h b/libcxx/include/__std_mbstate_t.h --- a/libcxx/include/__std_mbstate_t.h +++ b/libcxx/include/__std_mbstate_t.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___STD_MBSTATE_T_H #define _LIBCPP___STD_MBSTATE_T_H -#include <__config> +#include <__config_dir/config.h> #include <__mbstate_t.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__stop_token/atomic_unique_lock.h b/libcxx/include/__stop_token/atomic_unique_lock.h --- a/libcxx/include/__stop_token/atomic_unique_lock.h +++ b/libcxx/include/__stop_token/atomic_unique_lock.h @@ -11,7 +11,7 @@ #define _LIBCPP___STOP_TOKEN_ATOMIC_UNIQUE_GUARD_H #include <__bit/popcount.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__stop_token/intrusive_list_view.h b/libcxx/include/__stop_token/intrusive_list_view.h --- a/libcxx/include/__stop_token/intrusive_list_view.h +++ b/libcxx/include/__stop_token/intrusive_list_view.h @@ -11,7 +11,7 @@ #define _LIBCPP___STOP_TOKEN_INTRUSIVE_LIST_VIEW_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__stop_token/intrusive_shared_ptr.h b/libcxx/include/__stop_token/intrusive_shared_ptr.h --- a/libcxx/include/__stop_token/intrusive_shared_ptr.h +++ b/libcxx/include/__stop_token/intrusive_shared_ptr.h @@ -11,7 +11,7 @@ #define _LIBCPP___STOP_TOKEN_INTRUSIVE_SHARED_PTR_H #include <__atomic/memory_order.h> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_reference.h> #include <__utility/move.h> #include <__utility/swap.h> diff --git a/libcxx/include/__string/char_traits.h b/libcxx/include/__string/char_traits.h --- a/libcxx/include/__string/char_traits.h +++ b/libcxx/include/__string/char_traits.h @@ -15,7 +15,7 @@ #include <__algorithm/find_first_of.h> #include <__algorithm/min.h> #include <__compare/ordering.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/hash.h> #include <__iterator/iterator_traits.h> #include <__string/constexpr_c_functions.h> diff --git a/libcxx/include/__string/constexpr_c_functions.h b/libcxx/include/__string/constexpr_c_functions.h --- a/libcxx/include/__string/constexpr_c_functions.h +++ b/libcxx/include/__string/constexpr_c_functions.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___STRING_CONSTEXPR_C_FUNCTIONS_H #define _LIBCPP___STRING_CONSTEXPR_C_FUNCTIONS_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_constant_evaluated.h> #include <__type_traits/is_equality_comparable.h> #include <__type_traits/is_same.h> diff --git a/libcxx/include/__string/extern_template_lists.h b/libcxx/include/__string/extern_template_lists.h --- a/libcxx/include/__string/extern_template_lists.h +++ b/libcxx/include/__string/extern_template_lists.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___STRING_EXTERN_TEMPLATE_LISTS_H #define _LIBCPP___STRING_EXTERN_TEMPLATE_LISTS_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__support/win32/locale_win32.h b/libcxx/include/__support/win32/locale_win32.h --- a/libcxx/include/__support/win32/locale_win32.h +++ b/libcxx/include/__support/win32/locale_win32.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___SUPPORT_WIN32_LOCALE_WIN32_H #define _LIBCPP___SUPPORT_WIN32_LOCALE_WIN32_H -#include <__config> +#include <__config_dir/config.h> #include #include // _locale_t #include diff --git a/libcxx/include/__support/xlocale/__nop_locale_mgmt.h b/libcxx/include/__support/xlocale/__nop_locale_mgmt.h --- a/libcxx/include/__support/xlocale/__nop_locale_mgmt.h +++ b/libcxx/include/__support/xlocale/__nop_locale_mgmt.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H #define _LIBCPP___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H -#include <__config> +#include <__config_dir/config.h> #ifdef __cplusplus extern "C" { diff --git a/libcxx/include/__support/xlocale/__posix_l_fallback.h b/libcxx/include/__support/xlocale/__posix_l_fallback.h --- a/libcxx/include/__support/xlocale/__posix_l_fallback.h +++ b/libcxx/include/__support/xlocale/__posix_l_fallback.h @@ -15,7 +15,7 @@ #ifndef _LIBCPP___SUPPORT_XLOCALE_POSIX_L_FALLBACK_H #define _LIBCPP___SUPPORT_XLOCALE_POSIX_L_FALLBACK_H -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/__support/xlocale/__strtonum_fallback.h b/libcxx/include/__support/xlocale/__strtonum_fallback.h --- a/libcxx/include/__support/xlocale/__strtonum_fallback.h +++ b/libcxx/include/__support/xlocale/__strtonum_fallback.h @@ -15,7 +15,7 @@ #ifndef _LIBCPP___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H #define _LIBCPP___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H -#include <__config> +#include <__config_dir/config.h> #include #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS diff --git a/libcxx/include/__system_error/errc.h b/libcxx/include/__system_error/errc.h --- a/libcxx/include/__system_error/errc.h +++ b/libcxx/include/__system_error/errc.h @@ -100,7 +100,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__system_error/error_category.h b/libcxx/include/__system_error/error_category.h --- a/libcxx/include/__system_error/error_category.h +++ b/libcxx/include/__system_error/error_category.h @@ -11,7 +11,7 @@ #define _LIBCPP___SYSTEM_ERROR_ERROR_CATEGORY_H #include <__compare/ordering.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__system_error/error_code.h b/libcxx/include/__system_error/error_code.h --- a/libcxx/include/__system_error/error_code.h +++ b/libcxx/include/__system_error/error_code.h @@ -11,7 +11,7 @@ #define _LIBCPP___SYSTEM_ERROR_ERROR_CODE_H #include <__compare/ordering.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/hash.h> #include <__functional/unary_function.h> #include <__system_error/errc.h> diff --git a/libcxx/include/__system_error/error_condition.h b/libcxx/include/__system_error/error_condition.h --- a/libcxx/include/__system_error/error_condition.h +++ b/libcxx/include/__system_error/error_condition.h @@ -11,7 +11,7 @@ #define _LIBCPP___SYSTEM_ERROR_ERROR_CONDITION_H #include <__compare/ordering.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/unary_function.h> #include <__system_error/errc.h> #include <__system_error/error_category.h> diff --git a/libcxx/include/__system_error/system_error.h b/libcxx/include/__system_error/system_error.h --- a/libcxx/include/__system_error/system_error.h +++ b/libcxx/include/__system_error/system_error.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___SYSTEM_ERROR_SYSTEM_ERROR_H #define _LIBCPP___SYSTEM_ERROR_SYSTEM_ERROR_H -#include <__config> +#include <__config_dir/config.h> #include <__system_error/error_category.h> #include <__system_error/error_code.h> #include diff --git a/libcxx/include/__thread/poll_with_backoff.h b/libcxx/include/__thread/poll_with_backoff.h --- a/libcxx/include/__thread/poll_with_backoff.h +++ b/libcxx/include/__thread/poll_with_backoff.h @@ -10,10 +10,10 @@ #ifndef _LIBCPP___THREAD_POLL_WITH_BACKOFF_H #define _LIBCPP___THREAD_POLL_WITH_BACKOFF_H -#include <__availability> #include <__chrono/duration.h> #include <__chrono/high_resolution_clock.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__thread/timed_backoff_policy.h b/libcxx/include/__thread/timed_backoff_policy.h --- a/libcxx/include/__thread/timed_backoff_policy.h +++ b/libcxx/include/__thread/timed_backoff_policy.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___THREAD_TIMED_BACKOFF_POLICY_H #define _LIBCPP___THREAD_TIMED_BACKOFF_POLICY_H -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_THREADS diff --git a/libcxx/include/__threading_support b/libcxx/include/__threading_support --- a/libcxx/include/__threading_support +++ b/libcxx/include/__threading_support @@ -10,11 +10,11 @@ #ifndef _LIBCPP___THREADING_SUPPORT #define _LIBCPP___THREADING_SUPPORT -#include <__availability> #include <__chrono/convert_to_timespec.h> #include <__chrono/duration.h> #include <__compare/ordering.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__fwd/hash.h> #include <__thread/poll_with_backoff.h> #include diff --git a/libcxx/include/__tree b/libcxx/include/__tree --- a/libcxx/include/__tree +++ b/libcxx/include/__tree @@ -12,8 +12,8 @@ #include <__algorithm/min.h> #include <__assert> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__functional/invoke.h> #include <__iterator/distance.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/__tuple/make_tuple_types.h b/libcxx/include/__tuple/make_tuple_types.h --- a/libcxx/include/__tuple/make_tuple_types.h +++ b/libcxx/include/__tuple/make_tuple_types.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TUPLE_MAKE_TUPLE_TYPES_H #define _LIBCPP___TUPLE_MAKE_TUPLE_TYPES_H -#include <__config> +#include <__config_dir/config.h> #include <__fwd/array.h> #include <__fwd/tuple.h> #include <__tuple/tuple_element.h> diff --git a/libcxx/include/__tuple/pair_like.h b/libcxx/include/__tuple/pair_like.h --- a/libcxx/include/__tuple/pair_like.h +++ b/libcxx/include/__tuple/pair_like.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TUPLE_PAIR_LIKE_H #define _LIBCPP___TUPLE_PAIR_LIKE_H -#include <__config> +#include <__config_dir/config.h> #include <__tuple/tuple_like.h> #include <__tuple/tuple_size.h> #include <__type_traits/remove_cvref.h> diff --git a/libcxx/include/__tuple/sfinae_helpers.h b/libcxx/include/__tuple/sfinae_helpers.h --- a/libcxx/include/__tuple/sfinae_helpers.h +++ b/libcxx/include/__tuple/sfinae_helpers.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TUPLE_SFINAE_HELPERS_H #define _LIBCPP___TUPLE_SFINAE_HELPERS_H -#include <__config> +#include <__config_dir/config.h> #include <__fwd/tuple.h> #include <__tuple/make_tuple_types.h> #include <__tuple/tuple_element.h> diff --git a/libcxx/include/__tuple/tuple_element.h b/libcxx/include/__tuple/tuple_element.h --- a/libcxx/include/__tuple/tuple_element.h +++ b/libcxx/include/__tuple/tuple_element.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TUPLE_TUPLE_ELEMENT_H #define _LIBCPP___TUPLE_TUPLE_ELEMENT_H -#include <__config> +#include <__config_dir/config.h> #include <__tuple/tuple_indices.h> #include <__tuple/tuple_types.h> #include <__type_traits/add_const.h> diff --git a/libcxx/include/__tuple/tuple_indices.h b/libcxx/include/__tuple/tuple_indices.h --- a/libcxx/include/__tuple/tuple_indices.h +++ b/libcxx/include/__tuple/tuple_indices.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TUPLE_MAKE_TUPLE_INDICES_H #define _LIBCPP___TUPLE_MAKE_TUPLE_INDICES_H -#include <__config> +#include <__config_dir/config.h> #include <__utility/integer_sequence.h> #include diff --git a/libcxx/include/__tuple/tuple_like.h b/libcxx/include/__tuple/tuple_like.h --- a/libcxx/include/__tuple/tuple_like.h +++ b/libcxx/include/__tuple/tuple_like.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TUPLE_TUPLE_LIKE_H #define _LIBCPP___TUPLE_TUPLE_LIKE_H -#include <__config> +#include <__config_dir/config.h> #include <__fwd/array.h> #include <__fwd/pair.h> #include <__fwd/subrange.h> diff --git a/libcxx/include/__tuple/tuple_like_ext.h b/libcxx/include/__tuple/tuple_like_ext.h --- a/libcxx/include/__tuple/tuple_like_ext.h +++ b/libcxx/include/__tuple/tuple_like_ext.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TUPLE_TUPLE_LIKE_EXT_H #define _LIBCPP___TUPLE_TUPLE_LIKE_EXT_H -#include <__config> +#include <__config_dir/config.h> #include <__fwd/array.h> #include <__fwd/pair.h> #include <__fwd/tuple.h> diff --git a/libcxx/include/__tuple/tuple_size.h b/libcxx/include/__tuple/tuple_size.h --- a/libcxx/include/__tuple/tuple_size.h +++ b/libcxx/include/__tuple/tuple_size.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TUPLE_TUPLE_SIZE_H #define _LIBCPP___TUPLE_TUPLE_SIZE_H -#include <__config> +#include <__config_dir/config.h> #include <__fwd/tuple.h> #include <__tuple/tuple_types.h> #include <__type_traits/is_const.h> diff --git a/libcxx/include/__tuple/tuple_types.h b/libcxx/include/__tuple/tuple_types.h --- a/libcxx/include/__tuple/tuple_types.h +++ b/libcxx/include/__tuple/tuple_types.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TUPLE_TUPLE_TYPES_H #define _LIBCPP___TUPLE_TUPLE_TYPES_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/add_const.h b/libcxx/include/__type_traits/add_const.h --- a/libcxx/include/__type_traits/add_const.h +++ b/libcxx/include/__type_traits/add_const.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_ADD_CONST_H #define _LIBCPP___TYPE_TRAITS_ADD_CONST_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/add_cv.h b/libcxx/include/__type_traits/add_cv.h --- a/libcxx/include/__type_traits/add_cv.h +++ b/libcxx/include/__type_traits/add_cv.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_ADD_CV_H #define _LIBCPP___TYPE_TRAITS_ADD_CV_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/add_lvalue_reference.h b/libcxx/include/__type_traits/add_lvalue_reference.h --- a/libcxx/include/__type_traits/add_lvalue_reference.h +++ b/libcxx/include/__type_traits/add_lvalue_reference.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_ADD_LVALUE_REFERENCE_H #define _LIBCPP___TYPE_TRAITS_ADD_LVALUE_REFERENCE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_referenceable.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/add_pointer.h b/libcxx/include/__type_traits/add_pointer.h --- a/libcxx/include/__type_traits/add_pointer.h +++ b/libcxx/include/__type_traits/add_pointer.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_ADD_POINTER_H #define _LIBCPP___TYPE_TRAITS_ADD_POINTER_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_referenceable.h> #include <__type_traits/is_same.h> #include <__type_traits/is_void.h> diff --git a/libcxx/include/__type_traits/add_rvalue_reference.h b/libcxx/include/__type_traits/add_rvalue_reference.h --- a/libcxx/include/__type_traits/add_rvalue_reference.h +++ b/libcxx/include/__type_traits/add_rvalue_reference.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_ADD_RVALUE_REFERENCE_H #define _LIBCPP___TYPE_TRAITS_ADD_RVALUE_REFERENCE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_referenceable.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/add_volatile.h b/libcxx/include/__type_traits/add_volatile.h --- a/libcxx/include/__type_traits/add_volatile.h +++ b/libcxx/include/__type_traits/add_volatile.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_ADD_VOLATILE_H #define _LIBCPP___TYPE_TRAITS_ADD_VOLATILE_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/aligned_storage.h b/libcxx/include/__type_traits/aligned_storage.h --- a/libcxx/include/__type_traits/aligned_storage.h +++ b/libcxx/include/__type_traits/aligned_storage.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_ALIGNED_STORAGE_H #define _LIBCPP___TYPE_TRAITS_ALIGNED_STORAGE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conditional.h> #include <__type_traits/integral_constant.h> #include <__type_traits/nat.h> diff --git a/libcxx/include/__type_traits/aligned_union.h b/libcxx/include/__type_traits/aligned_union.h --- a/libcxx/include/__type_traits/aligned_union.h +++ b/libcxx/include/__type_traits/aligned_union.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_ALIGNED_UNION_H #define _LIBCPP___TYPE_TRAITS_ALIGNED_UNION_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/aligned_storage.h> #include <__type_traits/integral_constant.h> #include diff --git a/libcxx/include/__type_traits/alignment_of.h b/libcxx/include/__type_traits/alignment_of.h --- a/libcxx/include/__type_traits/alignment_of.h +++ b/libcxx/include/__type_traits/alignment_of.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_ALIGNMENT_OF_H #define _LIBCPP___TYPE_TRAITS_ALIGNMENT_OF_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include diff --git a/libcxx/include/__type_traits/apply_cv.h b/libcxx/include/__type_traits/apply_cv.h --- a/libcxx/include/__type_traits/apply_cv.h +++ b/libcxx/include/__type_traits/apply_cv.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_APPLY_CV_H #define _LIBCPP___TYPE_TRAITS_APPLY_CV_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_const.h> #include <__type_traits/is_volatile.h> #include <__type_traits/remove_reference.h> diff --git a/libcxx/include/__type_traits/can_extract_key.h b/libcxx/include/__type_traits/can_extract_key.h --- a/libcxx/include/__type_traits/can_extract_key.h +++ b/libcxx/include/__type_traits/can_extract_key.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_CAN_EXTRACT_KEY_H #define _LIBCPP___TYPE_TRAITS_CAN_EXTRACT_KEY_H -#include <__config> +#include <__config_dir/config.h> #include <__fwd/pair.h> #include <__type_traits/conditional.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__type_traits/common_reference.h b/libcxx/include/__type_traits/common_reference.h --- a/libcxx/include/__type_traits/common_reference.h +++ b/libcxx/include/__type_traits/common_reference.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_COMMON_REFERENCE_H #define _LIBCPP___TYPE_TRAITS_COMMON_REFERENCE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/common_type.h> #include <__type_traits/copy_cv.h> #include <__type_traits/copy_cvref.h> diff --git a/libcxx/include/__type_traits/common_type.h b/libcxx/include/__type_traits/common_type.h --- a/libcxx/include/__type_traits/common_type.h +++ b/libcxx/include/__type_traits/common_type.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_COMMON_TYPE_H #define _LIBCPP___TYPE_TRAITS_COMMON_TYPE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conditional.h> #include <__type_traits/decay.h> #include <__type_traits/is_same.h> diff --git a/libcxx/include/__type_traits/conditional.h b/libcxx/include/__type_traits/conditional.h --- a/libcxx/include/__type_traits/conditional.h +++ b/libcxx/include/__type_traits/conditional.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_CONDITIONAL_H #define _LIBCPP___TYPE_TRAITS_CONDITIONAL_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/conjunction.h b/libcxx/include/__type_traits/conjunction.h --- a/libcxx/include/__type_traits/conjunction.h +++ b/libcxx/include/__type_traits/conjunction.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_CONJUNCTION_H #define _LIBCPP___TYPE_TRAITS_CONJUNCTION_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conditional.h> #include <__type_traits/enable_if.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__type_traits/copy_cv.h b/libcxx/include/__type_traits/copy_cv.h --- a/libcxx/include/__type_traits/copy_cv.h +++ b/libcxx/include/__type_traits/copy_cv.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_COPY_CV_H #define _LIBCPP___TYPE_TRAITS_COPY_CV_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_const.h> #include <__type_traits/add_cv.h> #include <__type_traits/add_volatile.h> diff --git a/libcxx/include/__type_traits/copy_cvref.h b/libcxx/include/__type_traits/copy_cvref.h --- a/libcxx/include/__type_traits/copy_cvref.h +++ b/libcxx/include/__type_traits/copy_cvref.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_COPY_CVREF_H #define _LIBCPP___TYPE_TRAITS_COPY_CVREF_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_lvalue_reference.h> #include <__type_traits/add_rvalue_reference.h> #include <__type_traits/copy_cv.h> diff --git a/libcxx/include/__type_traits/decay.h b/libcxx/include/__type_traits/decay.h --- a/libcxx/include/__type_traits/decay.h +++ b/libcxx/include/__type_traits/decay.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_DECAY_H #define _LIBCPP___TYPE_TRAITS_DECAY_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_pointer.h> #include <__type_traits/conditional.h> #include <__type_traits/is_array.h> diff --git a/libcxx/include/__type_traits/dependent_type.h b/libcxx/include/__type_traits/dependent_type.h --- a/libcxx/include/__type_traits/dependent_type.h +++ b/libcxx/include/__type_traits/dependent_type.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_DEPENDENT_TYPE_H #define _LIBCPP___TYPE_TRAITS_DEPENDENT_TYPE_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/disjunction.h b/libcxx/include/__type_traits/disjunction.h --- a/libcxx/include/__type_traits/disjunction.h +++ b/libcxx/include/__type_traits/disjunction.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_DISJUNCTION_H #define _LIBCPP___TYPE_TRAITS_DISJUNCTION_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/enable_if.h b/libcxx/include/__type_traits/enable_if.h --- a/libcxx/include/__type_traits/enable_if.h +++ b/libcxx/include/__type_traits/enable_if.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_ENABLE_IF_H #define _LIBCPP___TYPE_TRAITS_ENABLE_IF_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/extent.h b/libcxx/include/__type_traits/extent.h --- a/libcxx/include/__type_traits/extent.h +++ b/libcxx/include/__type_traits/extent.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_EXTENT_H #define _LIBCPP___TYPE_TRAITS_EXTENT_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include diff --git a/libcxx/include/__type_traits/has_unique_object_representation.h b/libcxx/include/__type_traits/has_unique_object_representation.h --- a/libcxx/include/__type_traits/has_unique_object_representation.h +++ b/libcxx/include/__type_traits/has_unique_object_representation.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_HAS_UNIQUE_OBJECT_REPRESENTATION_H #define _LIBCPP___TYPE_TRAITS_HAS_UNIQUE_OBJECT_REPRESENTATION_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/remove_all_extents.h> #include <__type_traits/remove_cv.h> diff --git a/libcxx/include/__type_traits/has_virtual_destructor.h b/libcxx/include/__type_traits/has_virtual_destructor.h --- a/libcxx/include/__type_traits/has_virtual_destructor.h +++ b/libcxx/include/__type_traits/has_virtual_destructor.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_HAS_VIRTUAL_DESTRUCTOR_H #define _LIBCPP___TYPE_TRAITS_HAS_VIRTUAL_DESTRUCTOR_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/integral_constant.h b/libcxx/include/__type_traits/integral_constant.h --- a/libcxx/include/__type_traits/integral_constant.h +++ b/libcxx/include/__type_traits/integral_constant.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_INTEGRAL_CONSTANT_H #define _LIBCPP___TYPE_TRAITS_INTEGRAL_CONSTANT_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/invoke.h b/libcxx/include/__type_traits/invoke.h --- a/libcxx/include/__type_traits/invoke.h +++ b/libcxx/include/__type_traits/invoke.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_INVOKE_H #define _LIBCPP___TYPE_TRAITS_INVOKE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_lvalue_reference.h> #include <__type_traits/apply_cv.h> #include <__type_traits/conditional.h> diff --git a/libcxx/include/__type_traits/is_abstract.h b/libcxx/include/__type_traits/is_abstract.h --- a/libcxx/include/__type_traits/is_abstract.h +++ b/libcxx/include/__type_traits/is_abstract.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_ABSTRACT_H #define _LIBCPP___TYPE_TRAITS_IS_ABSTRACT_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_aggregate.h b/libcxx/include/__type_traits/is_aggregate.h --- a/libcxx/include/__type_traits/is_aggregate.h +++ b/libcxx/include/__type_traits/is_aggregate.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_AGGREGATE_H #define _LIBCPP___TYPE_TRAITS_IS_AGGREGATE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_allocator.h b/libcxx/include/__type_traits/is_allocator.h --- a/libcxx/include/__type_traits/is_allocator.h +++ b/libcxx/include/__type_traits/is_allocator.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_IS_ALLOCATOR_H #define _LIBCPP___TYPE_IS_ALLOCATOR_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/void_t.h> #include <__utility/declval.h> diff --git a/libcxx/include/__type_traits/is_always_bitcastable.h b/libcxx/include/__type_traits/is_always_bitcastable.h --- a/libcxx/include/__type_traits/is_always_bitcastable.h +++ b/libcxx/include/__type_traits/is_always_bitcastable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H #define _LIBCPP___TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_integral.h> #include <__type_traits/is_object.h> diff --git a/libcxx/include/__type_traits/is_arithmetic.h b/libcxx/include/__type_traits/is_arithmetic.h --- a/libcxx/include/__type_traits/is_arithmetic.h +++ b/libcxx/include/__type_traits/is_arithmetic.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_ARITHMETIC_H #define _LIBCPP___TYPE_TRAITS_IS_ARITHMETIC_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_floating_point.h> #include <__type_traits/is_integral.h> diff --git a/libcxx/include/__type_traits/is_array.h b/libcxx/include/__type_traits/is_array.h --- a/libcxx/include/__type_traits/is_array.h +++ b/libcxx/include/__type_traits/is_array.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_ARRAY_H #define _LIBCPP___TYPE_TRAITS_IS_ARRAY_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include diff --git a/libcxx/include/__type_traits/is_assignable.h b/libcxx/include/__type_traits/is_assignable.h --- a/libcxx/include/__type_traits/is_assignable.h +++ b/libcxx/include/__type_traits/is_assignable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_ASSIGNABLE_H #define _LIBCPP___TYPE_TRAITS_IS_ASSIGNABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_base_of.h b/libcxx/include/__type_traits/is_base_of.h --- a/libcxx/include/__type_traits/is_base_of.h +++ b/libcxx/include/__type_traits/is_base_of.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_BASE_OF_H #define _LIBCPP___TYPE_TRAITS_IS_BASE_OF_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_bounded_array.h b/libcxx/include/__type_traits/is_bounded_array.h --- a/libcxx/include/__type_traits/is_bounded_array.h +++ b/libcxx/include/__type_traits/is_bounded_array.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_BOUNDED_ARRAY_H #define _LIBCPP___TYPE_TRAITS_IS_BOUNDED_ARRAY_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include diff --git a/libcxx/include/__type_traits/is_callable.h b/libcxx/include/__type_traits/is_callable.h --- a/libcxx/include/__type_traits/is_callable.h +++ b/libcxx/include/__type_traits/is_callable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_CALLABLE_H #define _LIBCPP___TYPE_TRAITS_IS_CALLABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__utility/declval.h> diff --git a/libcxx/include/__type_traits/is_char_like_type.h b/libcxx/include/__type_traits/is_char_like_type.h --- a/libcxx/include/__type_traits/is_char_like_type.h +++ b/libcxx/include/__type_traits/is_char_like_type.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H #define _LIBCPP___TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conjunction.h> #include <__type_traits/is_standard_layout.h> #include <__type_traits/is_trivial.h> diff --git a/libcxx/include/__type_traits/is_class.h b/libcxx/include/__type_traits/is_class.h --- a/libcxx/include/__type_traits/is_class.h +++ b/libcxx/include/__type_traits/is_class.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_CLASS_H #define _LIBCPP___TYPE_TRAITS_IS_CLASS_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_compound.h b/libcxx/include/__type_traits/is_compound.h --- a/libcxx/include/__type_traits/is_compound.h +++ b/libcxx/include/__type_traits/is_compound.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_COMPOUND_H #define _LIBCPP___TYPE_TRAITS_IS_COMPOUND_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_fundamental.h> diff --git a/libcxx/include/__type_traits/is_const.h b/libcxx/include/__type_traits/is_const.h --- a/libcxx/include/__type_traits/is_const.h +++ b/libcxx/include/__type_traits/is_const.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_CONST_H #define _LIBCPP___TYPE_TRAITS_IS_CONST_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_constant_evaluated.h b/libcxx/include/__type_traits/is_constant_evaluated.h --- a/libcxx/include/__type_traits/is_constant_evaluated.h +++ b/libcxx/include/__type_traits/is_constant_evaluated.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_CONSTANT_EVALUATED_H #define _LIBCPP___TYPE_TRAITS_IS_CONSTANT_EVALUATED_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/is_constructible.h b/libcxx/include/__type_traits/is_constructible.h --- a/libcxx/include/__type_traits/is_constructible.h +++ b/libcxx/include/__type_traits/is_constructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_IS_CONSTRUCTIBLE_H #define _LIBCPP___TYPE_IS_CONSTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_convertible.h b/libcxx/include/__type_traits/is_convertible.h --- a/libcxx/include/__type_traits/is_convertible.h +++ b/libcxx/include/__type_traits/is_convertible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_CONVERTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_CONVERTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_array.h> #include <__type_traits/is_function.h> diff --git a/libcxx/include/__type_traits/is_copy_assignable.h b/libcxx/include/__type_traits/is_copy_assignable.h --- a/libcxx/include/__type_traits/is_copy_assignable.h +++ b/libcxx/include/__type_traits/is_copy_assignable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_COPY_ASSIGNABLE_H #define _LIBCPP___TYPE_TRAITS_IS_COPY_ASSIGNABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_const.h> #include <__type_traits/add_lvalue_reference.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__type_traits/is_copy_constructible.h b/libcxx/include/__type_traits/is_copy_constructible.h --- a/libcxx/include/__type_traits/is_copy_constructible.h +++ b/libcxx/include/__type_traits/is_copy_constructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_COPY_CONSTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_COPY_CONSTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_const.h> #include <__type_traits/add_lvalue_reference.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__type_traits/is_core_convertible.h b/libcxx/include/__type_traits/is_core_convertible.h --- a/libcxx/include/__type_traits/is_core_convertible.h +++ b/libcxx/include/__type_traits/is_core_convertible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_CORE_CONVERTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_CORE_CONVERTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_default_constructible.h b/libcxx/include/__type_traits/is_default_constructible.h --- a/libcxx/include/__type_traits/is_default_constructible.h +++ b/libcxx/include/__type_traits/is_default_constructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_DEFAULT_CONSTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_DEFAULT_CONSTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_destructible.h b/libcxx/include/__type_traits/is_destructible.h --- a/libcxx/include/__type_traits/is_destructible.h +++ b/libcxx/include/__type_traits/is_destructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_DESTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_DESTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_function.h> #include <__type_traits/is_reference.h> diff --git a/libcxx/include/__type_traits/is_empty.h b/libcxx/include/__type_traits/is_empty.h --- a/libcxx/include/__type_traits/is_empty.h +++ b/libcxx/include/__type_traits/is_empty.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_EMPTY_H #define _LIBCPP___TYPE_TRAITS_IS_EMPTY_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_enum.h b/libcxx/include/__type_traits/is_enum.h --- a/libcxx/include/__type_traits/is_enum.h +++ b/libcxx/include/__type_traits/is_enum.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_ENUM_H #define _LIBCPP___TYPE_TRAITS_IS_ENUM_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_equality_comparable.h b/libcxx/include/__type_traits/is_equality_comparable.h --- a/libcxx/include/__type_traits/is_equality_comparable.h +++ b/libcxx/include/__type_traits/is_equality_comparable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_EQUAILITY_COMPARABLE_H #define _LIBCPP___TYPE_TRAITS_IS_EQUAILITY_COMPARABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_integral.h> #include <__type_traits/is_same.h> diff --git a/libcxx/include/__type_traits/is_execution_policy.h b/libcxx/include/__type_traits/is_execution_policy.h --- a/libcxx/include/__type_traits/is_execution_policy.h +++ b/libcxx/include/__type_traits/is_execution_policy.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_EXECUTION_POLICY_H #define _LIBCPP___TYPE_TRAITS_IS_EXECUTION_POLICY_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/remove_cvref.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_final.h b/libcxx/include/__type_traits/is_final.h --- a/libcxx/include/__type_traits/is_final.h +++ b/libcxx/include/__type_traits/is_final.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_FINAL_H #define _LIBCPP___TYPE_TRAITS_IS_FINAL_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_floating_point.h b/libcxx/include/__type_traits/is_floating_point.h --- a/libcxx/include/__type_traits/is_floating_point.h +++ b/libcxx/include/__type_traits/is_floating_point.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_FLOATING_POINT_H #define _LIBCPP___TYPE_TRAITS_IS_FLOATING_POINT_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/remove_cv.h> diff --git a/libcxx/include/__type_traits/is_function.h b/libcxx/include/__type_traits/is_function.h --- a/libcxx/include/__type_traits/is_function.h +++ b/libcxx/include/__type_traits/is_function.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_FUNCTIONAL_H #define _LIBCPP___TYPE_TRAITS_IS_FUNCTIONAL_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_const.h> #include <__type_traits/is_reference.h> diff --git a/libcxx/include/__type_traits/is_fundamental.h b/libcxx/include/__type_traits/is_fundamental.h --- a/libcxx/include/__type_traits/is_fundamental.h +++ b/libcxx/include/__type_traits/is_fundamental.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_FUNDAMENTAL_H #define _LIBCPP___TYPE_TRAITS_IS_FUNDAMENTAL_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_null_pointer.h> #include <__type_traits/is_void.h> diff --git a/libcxx/include/__type_traits/is_implicitly_default_constructible.h b/libcxx/include/__type_traits/is_implicitly_default_constructible.h --- a/libcxx/include/__type_traits/is_implicitly_default_constructible.h +++ b/libcxx/include/__type_traits/is_implicitly_default_constructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_default_constructible.h> diff --git a/libcxx/include/__type_traits/is_integral.h b/libcxx/include/__type_traits/is_integral.h --- a/libcxx/include/__type_traits/is_integral.h +++ b/libcxx/include/__type_traits/is_integral.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_INTEGRAL_H #define _LIBCPP___TYPE_TRAITS_IS_INTEGRAL_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/remove_cv.h> diff --git a/libcxx/include/__type_traits/is_literal_type.h b/libcxx/include/__type_traits/is_literal_type.h --- a/libcxx/include/__type_traits/is_literal_type.h +++ b/libcxx/include/__type_traits/is_literal_type.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_LITERAL_TYPE #define _LIBCPP___TYPE_TRAITS_IS_LITERAL_TYPE -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_member_function_pointer.h b/libcxx/include/__type_traits/is_member_function_pointer.h --- a/libcxx/include/__type_traits/is_member_function_pointer.h +++ b/libcxx/include/__type_traits/is_member_function_pointer.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_MEMBER_FUNCTION_POINTER_H #define _LIBCPP___TYPE_TRAITS_IS_MEMBER_FUNCTION_POINTER_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_function.h> #include <__type_traits/remove_cv.h> diff --git a/libcxx/include/__type_traits/is_member_object_pointer.h b/libcxx/include/__type_traits/is_member_object_pointer.h --- a/libcxx/include/__type_traits/is_member_object_pointer.h +++ b/libcxx/include/__type_traits/is_member_object_pointer.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_MEMBER_OBJECT_POINTER_H #define _LIBCPP___TYPE_TRAITS_IS_MEMBER_OBJECT_POINTER_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_member_pointer.h b/libcxx/include/__type_traits/is_member_pointer.h --- a/libcxx/include/__type_traits/is_member_pointer.h +++ b/libcxx/include/__type_traits/is_member_pointer.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_MEMBER_POINTER_H #define _LIBCPP___TYPE_TRAITS_IS_MEMBER_POINTER_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_member_function_pointer.h> diff --git a/libcxx/include/__type_traits/is_move_assignable.h b/libcxx/include/__type_traits/is_move_assignable.h --- a/libcxx/include/__type_traits/is_move_assignable.h +++ b/libcxx/include/__type_traits/is_move_assignable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_MOVE_ASSIGNABLE_H #define _LIBCPP___TYPE_TRAITS_IS_MOVE_ASSIGNABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_lvalue_reference.h> #include <__type_traits/add_rvalue_reference.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__type_traits/is_move_constructible.h b/libcxx/include/__type_traits/is_move_constructible.h --- a/libcxx/include/__type_traits/is_move_constructible.h +++ b/libcxx/include/__type_traits/is_move_constructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_MOVE_CONSTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_MOVE_CONSTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_rvalue_reference.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__type_traits/is_nothrow_assignable.h b/libcxx/include/__type_traits/is_nothrow_assignable.h --- a/libcxx/include/__type_traits/is_nothrow_assignable.h +++ b/libcxx/include/__type_traits/is_nothrow_assignable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H #define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_nothrow_constructible.h b/libcxx/include/__type_traits/is_nothrow_constructible.h --- a/libcxx/include/__type_traits/is_nothrow_constructible.h +++ b/libcxx/include/__type_traits/is_nothrow_constructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_NOTHROW_CONSTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_CONSTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_constructible.h> #include <__type_traits/is_reference.h> diff --git a/libcxx/include/__type_traits/is_nothrow_convertible.h b/libcxx/include/__type_traits/is_nothrow_convertible.h --- a/libcxx/include/__type_traits/is_nothrow_convertible.h +++ b/libcxx/include/__type_traits/is_nothrow_convertible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_NOTHROW_CONVERTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_CONVERTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conjunction.h> #include <__type_traits/disjunction.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__type_traits/is_nothrow_copy_assignable.h b/libcxx/include/__type_traits/is_nothrow_copy_assignable.h --- a/libcxx/include/__type_traits/is_nothrow_copy_assignable.h +++ b/libcxx/include/__type_traits/is_nothrow_copy_assignable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_NOTHROW_COPY_ASSIGNABLE_H #define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_COPY_ASSIGNABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_const.h> #include <__type_traits/add_lvalue_reference.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__type_traits/is_nothrow_copy_constructible.h b/libcxx/include/__type_traits/is_nothrow_copy_constructible.h --- a/libcxx/include/__type_traits/is_nothrow_copy_constructible.h +++ b/libcxx/include/__type_traits/is_nothrow_copy_constructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_NOTHROW_COPY_CONSTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_COPY_CONSTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_const.h> #include <__type_traits/add_lvalue_reference.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__type_traits/is_nothrow_default_constructible.h b/libcxx/include/__type_traits/is_nothrow_default_constructible.h --- a/libcxx/include/__type_traits/is_nothrow_default_constructible.h +++ b/libcxx/include/__type_traits/is_nothrow_default_constructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_NOTHROW_DEFAULT_CONSTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_DEFAULT_CONSTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_nothrow_destructible.h b/libcxx/include/__type_traits/is_nothrow_destructible.h --- a/libcxx/include/__type_traits/is_nothrow_destructible.h +++ b/libcxx/include/__type_traits/is_nothrow_destructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_destructible.h> #include <__type_traits/is_reference.h> diff --git a/libcxx/include/__type_traits/is_nothrow_move_assignable.h b/libcxx/include/__type_traits/is_nothrow_move_assignable.h --- a/libcxx/include/__type_traits/is_nothrow_move_assignable.h +++ b/libcxx/include/__type_traits/is_nothrow_move_assignable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_NOTHROW_MOVE_ASSIGNABLE_H #define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_MOVE_ASSIGNABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_lvalue_reference.h> #include <__type_traits/add_rvalue_reference.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__type_traits/is_nothrow_move_constructible.h b/libcxx/include/__type_traits/is_nothrow_move_constructible.h --- a/libcxx/include/__type_traits/is_nothrow_move_constructible.h +++ b/libcxx/include/__type_traits/is_nothrow_move_constructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_NOTHROW_MOVE_CONSTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_MOVE_CONSTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_rvalue_reference.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_nothrow_constructible.h> diff --git a/libcxx/include/__type_traits/is_null_pointer.h b/libcxx/include/__type_traits/is_null_pointer.h --- a/libcxx/include/__type_traits/is_null_pointer.h +++ b/libcxx/include/__type_traits/is_null_pointer.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_NULL_POINTER_H #define _LIBCPP___TYPE_TRAITS_IS_NULL_POINTER_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/remove_cv.h> #include diff --git a/libcxx/include/__type_traits/is_object.h b/libcxx/include/__type_traits/is_object.h --- a/libcxx/include/__type_traits/is_object.h +++ b/libcxx/include/__type_traits/is_object.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_OBJECT_H #define _LIBCPP___TYPE_TRAITS_IS_OBJECT_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_array.h> #include <__type_traits/is_class.h> diff --git a/libcxx/include/__type_traits/is_pod.h b/libcxx/include/__type_traits/is_pod.h --- a/libcxx/include/__type_traits/is_pod.h +++ b/libcxx/include/__type_traits/is_pod.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_POD_H #define _LIBCPP___TYPE_TRAITS_IS_POD_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_pointer.h b/libcxx/include/__type_traits/is_pointer.h --- a/libcxx/include/__type_traits/is_pointer.h +++ b/libcxx/include/__type_traits/is_pointer.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_POINTER_H #define _LIBCPP___TYPE_TRAITS_IS_POINTER_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/remove_cv.h> diff --git a/libcxx/include/__type_traits/is_polymorphic.h b/libcxx/include/__type_traits/is_polymorphic.h --- a/libcxx/include/__type_traits/is_polymorphic.h +++ b/libcxx/include/__type_traits/is_polymorphic.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_POLYMORPHIC_H #define _LIBCPP___TYPE_TRAITS_IS_POLYMORPHIC_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_primary_template.h b/libcxx/include/__type_traits/is_primary_template.h --- a/libcxx/include/__type_traits/is_primary_template.h +++ b/libcxx/include/__type_traits/is_primary_template.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H #define _LIBCPP___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/enable_if.h> #include <__type_traits/is_same.h> #include <__type_traits/is_valid_expansion.h> diff --git a/libcxx/include/__type_traits/is_reference.h b/libcxx/include/__type_traits/is_reference.h --- a/libcxx/include/__type_traits/is_reference.h +++ b/libcxx/include/__type_traits/is_reference.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_REFERENCE_H #define _LIBCPP___TYPE_TRAITS_IS_REFERENCE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_reference_wrapper.h b/libcxx/include/__type_traits/is_reference_wrapper.h --- a/libcxx/include/__type_traits/is_reference_wrapper.h +++ b/libcxx/include/__type_traits/is_reference_wrapper.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_REFERENCE_WRAPPER_H #define _LIBCPP___TYPE_TRAITS_IS_REFERENCE_WRAPPER_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/remove_cv.h> diff --git a/libcxx/include/__type_traits/is_referenceable.h b/libcxx/include/__type_traits/is_referenceable.h --- a/libcxx/include/__type_traits/is_referenceable.h +++ b/libcxx/include/__type_traits/is_referenceable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_REFERENCEABLE_H #define _LIBCPP___TYPE_TRAITS_IS_REFERENCEABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_same.h> diff --git a/libcxx/include/__type_traits/is_same.h b/libcxx/include/__type_traits/is_same.h --- a/libcxx/include/__type_traits/is_same.h +++ b/libcxx/include/__type_traits/is_same.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_SAME_H #define _LIBCPP___TYPE_TRAITS_IS_SAME_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_scalar.h b/libcxx/include/__type_traits/is_scalar.h --- a/libcxx/include/__type_traits/is_scalar.h +++ b/libcxx/include/__type_traits/is_scalar.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_SCALAR_H #define _LIBCPP___TYPE_TRAITS_IS_SCALAR_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_arithmetic.h> #include <__type_traits/is_enum.h> diff --git a/libcxx/include/__type_traits/is_scoped_enum.h b/libcxx/include/__type_traits/is_scoped_enum.h --- a/libcxx/include/__type_traits/is_scoped_enum.h +++ b/libcxx/include/__type_traits/is_scoped_enum.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_SCOPED_ENUM_H #define _LIBCPP___TYPE_TRAITS_IS_SCOPED_ENUM_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_convertible.h> #include <__type_traits/is_enum.h> diff --git a/libcxx/include/__type_traits/is_signed.h b/libcxx/include/__type_traits/is_signed.h --- a/libcxx/include/__type_traits/is_signed.h +++ b/libcxx/include/__type_traits/is_signed.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_SIGNED_H #define _LIBCPP___TYPE_TRAITS_IS_SIGNED_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_arithmetic.h> #include <__type_traits/is_integral.h> diff --git a/libcxx/include/__type_traits/is_signed_integer.h b/libcxx/include/__type_traits/is_signed_integer.h --- a/libcxx/include/__type_traits/is_signed_integer.h +++ b/libcxx/include/__type_traits/is_signed_integer.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_SIGNED_INTEGER_H #define _LIBCPP___TYPE_TRAITS_IS_SIGNED_INTEGER_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_specialization.h b/libcxx/include/__type_traits/is_specialization.h --- a/libcxx/include/__type_traits/is_specialization.h +++ b/libcxx/include/__type_traits/is_specialization.h @@ -22,7 +22,7 @@ // // Note a cvref qualified _Tp is never considered a specialization. -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/is_standard_layout.h b/libcxx/include/__type_traits/is_standard_layout.h --- a/libcxx/include/__type_traits/is_standard_layout.h +++ b/libcxx/include/__type_traits/is_standard_layout.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_STANDARD_LAYOUT_H #define _LIBCPP___TYPE_TRAITS_IS_STANDARD_LAYOUT_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_swappable.h b/libcxx/include/__type_traits/is_swappable.h --- a/libcxx/include/__type_traits/is_swappable.h +++ b/libcxx/include/__type_traits/is_swappable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_SWAPPABLE_H #define _LIBCPP___TYPE_TRAITS_IS_SWAPPABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_lvalue_reference.h> #include <__type_traits/conditional.h> #include <__type_traits/enable_if.h> diff --git a/libcxx/include/__type_traits/is_trivial.h b/libcxx/include/__type_traits/is_trivial.h --- a/libcxx/include/__type_traits/is_trivial.h +++ b/libcxx/include/__type_traits/is_trivial.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIAL_H #define _LIBCPP___TYPE_TRAITS_IS_TRIVIAL_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_trivially_assignable.h b/libcxx/include/__type_traits/is_trivially_assignable.h --- a/libcxx/include/__type_traits/is_trivially_assignable.h +++ b/libcxx/include/__type_traits/is_trivially_assignable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_ASSIGNABLE_H #define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_ASSIGNABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_trivially_constructible.h b/libcxx/include/__type_traits/is_trivially_constructible.h --- a/libcxx/include/__type_traits/is_trivially_constructible.h +++ b/libcxx/include/__type_traits/is_trivially_constructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_trivially_copy_assignable.h b/libcxx/include/__type_traits/is_trivially_copy_assignable.h --- a/libcxx/include/__type_traits/is_trivially_copy_assignable.h +++ b/libcxx/include/__type_traits/is_trivially_copy_assignable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_COPY_ASSIGNABLE_H #define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_COPY_ASSIGNABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_const.h> #include <__type_traits/add_lvalue_reference.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__type_traits/is_trivially_copy_constructible.h b/libcxx/include/__type_traits/is_trivially_copy_constructible.h --- a/libcxx/include/__type_traits/is_trivially_copy_constructible.h +++ b/libcxx/include/__type_traits/is_trivially_copy_constructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_COPY_CONSTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_COPY_CONSTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_lvalue_reference.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__type_traits/is_trivially_copyable.h b/libcxx/include/__type_traits/is_trivially_copyable.h --- a/libcxx/include/__type_traits/is_trivially_copyable.h +++ b/libcxx/include/__type_traits/is_trivially_copyable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H #define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include diff --git a/libcxx/include/__type_traits/is_trivially_default_constructible.h b/libcxx/include/__type_traits/is_trivially_default_constructible.h --- a/libcxx/include/__type_traits/is_trivially_default_constructible.h +++ b/libcxx/include/__type_traits/is_trivially_default_constructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_DEFAULT_CONSTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_DEFAULT_CONSTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_trivially_destructible.h b/libcxx/include/__type_traits/is_trivially_destructible.h --- a/libcxx/include/__type_traits/is_trivially_destructible.h +++ b/libcxx/include/__type_traits/is_trivially_destructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_DESTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_DESTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_destructible.h> diff --git a/libcxx/include/__type_traits/is_trivially_lexicographically_comparable.h b/libcxx/include/__type_traits/is_trivially_lexicographically_comparable.h --- a/libcxx/include/__type_traits/is_trivially_lexicographically_comparable.h +++ b/libcxx/include/__type_traits/is_trivially_lexicographically_comparable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_LEXICOGRAPHICALLY_COMPARABLE_H #define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_LEXICOGRAPHICALLY_COMPARABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_same.h> #include <__type_traits/is_unsigned.h> diff --git a/libcxx/include/__type_traits/is_trivially_move_assignable.h b/libcxx/include/__type_traits/is_trivially_move_assignable.h --- a/libcxx/include/__type_traits/is_trivially_move_assignable.h +++ b/libcxx/include/__type_traits/is_trivially_move_assignable.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_MOVE_ASSIGNABLE_H #define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_MOVE_ASSIGNABLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_lvalue_reference.h> #include <__type_traits/add_rvalue_reference.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__type_traits/is_trivially_move_constructible.h b/libcxx/include/__type_traits/is_trivially_move_constructible.h --- a/libcxx/include/__type_traits/is_trivially_move_constructible.h +++ b/libcxx/include/__type_traits/is_trivially_move_constructible.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_MOVE_CONSTRUCTIBLE_H #define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_MOVE_CONSTRUCTIBLE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_rvalue_reference.h> #include <__type_traits/integral_constant.h> diff --git a/libcxx/include/__type_traits/is_unbounded_array.h b/libcxx/include/__type_traits/is_unbounded_array.h --- a/libcxx/include/__type_traits/is_unbounded_array.h +++ b/libcxx/include/__type_traits/is_unbounded_array.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H #define _LIBCPP___TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_union.h b/libcxx/include/__type_traits/is_union.h --- a/libcxx/include/__type_traits/is_union.h +++ b/libcxx/include/__type_traits/is_union.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_UNION_H #define _LIBCPP___TYPE_TRAITS_IS_UNION_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_unsigned.h b/libcxx/include/__type_traits/is_unsigned.h --- a/libcxx/include/__type_traits/is_unsigned.h +++ b/libcxx/include/__type_traits/is_unsigned.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_UNSIGNED_H #define _LIBCPP___TYPE_TRAITS_IS_UNSIGNED_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_arithmetic.h> #include <__type_traits/is_integral.h> diff --git a/libcxx/include/__type_traits/is_unsigned_integer.h b/libcxx/include/__type_traits/is_unsigned_integer.h --- a/libcxx/include/__type_traits/is_unsigned_integer.h +++ b/libcxx/include/__type_traits/is_unsigned_integer.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_UNSIGNED_INTEGER_H #define _LIBCPP___TYPE_TRAITS_IS_UNSIGNED_INTEGER_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_valid_expansion.h b/libcxx/include/__type_traits/is_valid_expansion.h --- a/libcxx/include/__type_traits/is_valid_expansion.h +++ b/libcxx/include/__type_traits/is_valid_expansion.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_VALID_EXPANSION_H #define _LIBCPP___TYPE_TRAITS_IS_VALID_EXPANSION_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/is_void.h b/libcxx/include/__type_traits/is_void.h --- a/libcxx/include/__type_traits/is_void.h +++ b/libcxx/include/__type_traits/is_void.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_VOID_H #define _LIBCPP___TYPE_TRAITS_IS_VOID_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_same.h> #include <__type_traits/remove_cv.h> diff --git a/libcxx/include/__type_traits/is_volatile.h b/libcxx/include/__type_traits/is_volatile.h --- a/libcxx/include/__type_traits/is_volatile.h +++ b/libcxx/include/__type_traits/is_volatile.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_IS_VOLATILE_H #define _LIBCPP___TYPE_TRAITS_IS_VOLATILE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/lazy.h b/libcxx/include/__type_traits/lazy.h --- a/libcxx/include/__type_traits/lazy.h +++ b/libcxx/include/__type_traits/lazy.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_LAZY_H #define _LIBCPP___TYPE_TRAITS_LAZY_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/make_32_64_or_128_bit.h b/libcxx/include/__type_traits/make_32_64_or_128_bit.h --- a/libcxx/include/__type_traits/make_32_64_or_128_bit.h +++ b/libcxx/include/__type_traits/make_32_64_or_128_bit.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_MAKE_32_64_OR_128_BIT_H #define _LIBCPP___TYPE_TRAITS_MAKE_32_64_OR_128_BIT_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conditional.h> #include <__type_traits/is_same.h> #include <__type_traits/is_signed.h> diff --git a/libcxx/include/__type_traits/make_const_lvalue_ref.h b/libcxx/include/__type_traits/make_const_lvalue_ref.h --- a/libcxx/include/__type_traits/make_const_lvalue_ref.h +++ b/libcxx/include/__type_traits/make_const_lvalue_ref.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H #define _LIBCPP___TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/remove_reference.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/make_signed.h b/libcxx/include/__type_traits/make_signed.h --- a/libcxx/include/__type_traits/make_signed.h +++ b/libcxx/include/__type_traits/make_signed.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_MAKE_SIGNED_H #define _LIBCPP___TYPE_TRAITS_MAKE_SIGNED_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/apply_cv.h> #include <__type_traits/is_enum.h> #include <__type_traits/is_integral.h> diff --git a/libcxx/include/__type_traits/make_unsigned.h b/libcxx/include/__type_traits/make_unsigned.h --- a/libcxx/include/__type_traits/make_unsigned.h +++ b/libcxx/include/__type_traits/make_unsigned.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_MAKE_UNSIGNED_H #define _LIBCPP___TYPE_TRAITS_MAKE_UNSIGNED_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/apply_cv.h> #include <__type_traits/conditional.h> #include <__type_traits/is_enum.h> diff --git a/libcxx/include/__type_traits/maybe_const.h b/libcxx/include/__type_traits/maybe_const.h --- a/libcxx/include/__type_traits/maybe_const.h +++ b/libcxx/include/__type_traits/maybe_const.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_MAYBE_CONST_H #define _LIBCPP___TYPE_TRAITS_MAYBE_CONST_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conditional.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/nat.h b/libcxx/include/__type_traits/nat.h --- a/libcxx/include/__type_traits/nat.h +++ b/libcxx/include/__type_traits/nat.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_NAT_H #define _LIBCPP___TYPE_TRAITS_NAT_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/negation.h b/libcxx/include/__type_traits/negation.h --- a/libcxx/include/__type_traits/negation.h +++ b/libcxx/include/__type_traits/negation.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_NEGATION_H #define _LIBCPP___TYPE_TRAITS_NEGATION_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/noexcept_move_assign_container.h b/libcxx/include/__type_traits/noexcept_move_assign_container.h --- a/libcxx/include/__type_traits/noexcept_move_assign_container.h +++ b/libcxx/include/__type_traits/noexcept_move_assign_container.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H #define _LIBCPP___TYPE_TRAITS_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H -#include <__config> +#include <__config_dir/config.h> #include <__memory/allocator_traits.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_nothrow_move_assignable.h> diff --git a/libcxx/include/__type_traits/operation_traits.h b/libcxx/include/__type_traits/operation_traits.h --- a/libcxx/include/__type_traits/operation_traits.h +++ b/libcxx/include/__type_traits/operation_traits.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_OPERATION_TRAITS_H #define _LIBCPP___TYPE_TRAITS_OPERATION_TRAITS_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/predicate_traits.h b/libcxx/include/__type_traits/predicate_traits.h --- a/libcxx/include/__type_traits/predicate_traits.h +++ b/libcxx/include/__type_traits/predicate_traits.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_PREDICATE_TRAITS #define _LIBCPP___TYPE_TRAITS_PREDICATE_TRAITS -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/promote.h b/libcxx/include/__type_traits/promote.h --- a/libcxx/include/__type_traits/promote.h +++ b/libcxx/include/__type_traits/promote.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_PROMOTE_H #define _LIBCPP___TYPE_TRAITS_PROMOTE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_same.h> #include <__utility/declval.h> diff --git a/libcxx/include/__type_traits/rank.h b/libcxx/include/__type_traits/rank.h --- a/libcxx/include/__type_traits/rank.h +++ b/libcxx/include/__type_traits/rank.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_RANK_H #define _LIBCPP___TYPE_TRAITS_RANK_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include diff --git a/libcxx/include/__type_traits/remove_all_extents.h b/libcxx/include/__type_traits/remove_all_extents.h --- a/libcxx/include/__type_traits/remove_all_extents.h +++ b/libcxx/include/__type_traits/remove_all_extents.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_REMOVE_ALL_EXTENTS_H #define _LIBCPP___TYPE_TRAITS_REMOVE_ALL_EXTENTS_H -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/remove_const.h b/libcxx/include/__type_traits/remove_const.h --- a/libcxx/include/__type_traits/remove_const.h +++ b/libcxx/include/__type_traits/remove_const.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_REMOVE_CONST_H #define _LIBCPP___TYPE_TRAITS_REMOVE_CONST_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/remove_const_ref.h b/libcxx/include/__type_traits/remove_const_ref.h --- a/libcxx/include/__type_traits/remove_const_ref.h +++ b/libcxx/include/__type_traits/remove_const_ref.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_REMOVE_CONST_REF_H #define _LIBCPP___TYPE_TRAITS_REMOVE_CONST_REF_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/remove_const.h> #include <__type_traits/remove_reference.h> diff --git a/libcxx/include/__type_traits/remove_cv.h b/libcxx/include/__type_traits/remove_cv.h --- a/libcxx/include/__type_traits/remove_cv.h +++ b/libcxx/include/__type_traits/remove_cv.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_REMOVE_CV_H #define _LIBCPP___TYPE_TRAITS_REMOVE_CV_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/remove_const.h> #include <__type_traits/remove_volatile.h> diff --git a/libcxx/include/__type_traits/remove_cvref.h b/libcxx/include/__type_traits/remove_cvref.h --- a/libcxx/include/__type_traits/remove_cvref.h +++ b/libcxx/include/__type_traits/remove_cvref.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_REMOVE_CVREF_H #define _LIBCPP___TYPE_TRAITS_REMOVE_CVREF_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_same.h> #include <__type_traits/remove_cv.h> #include <__type_traits/remove_reference.h> diff --git a/libcxx/include/__type_traits/remove_extent.h b/libcxx/include/__type_traits/remove_extent.h --- a/libcxx/include/__type_traits/remove_extent.h +++ b/libcxx/include/__type_traits/remove_extent.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_REMOVE_EXTENT_H #define _LIBCPP___TYPE_TRAITS_REMOVE_EXTENT_H -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/remove_pointer.h b/libcxx/include/__type_traits/remove_pointer.h --- a/libcxx/include/__type_traits/remove_pointer.h +++ b/libcxx/include/__type_traits/remove_pointer.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_REMOVE_POINTER_H #define _LIBCPP___TYPE_TRAITS_REMOVE_POINTER_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/remove_reference.h b/libcxx/include/__type_traits/remove_reference.h --- a/libcxx/include/__type_traits/remove_reference.h +++ b/libcxx/include/__type_traits/remove_reference.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_REMOVE_REFERENCE_H #define _LIBCPP___TYPE_TRAITS_REMOVE_REFERENCE_H -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/remove_volatile.h b/libcxx/include/__type_traits/remove_volatile.h --- a/libcxx/include/__type_traits/remove_volatile.h +++ b/libcxx/include/__type_traits/remove_volatile.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_REMOVE_VOLATILE_H #define _LIBCPP___TYPE_TRAITS_REMOVE_VOLATILE_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/result_of.h b/libcxx/include/__type_traits/result_of.h --- a/libcxx/include/__type_traits/result_of.h +++ b/libcxx/include/__type_traits/result_of.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_RESULT_OF_H #define _LIBCPP___TYPE_TRAITS_RESULT_OF_H -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/strip_signature.h b/libcxx/include/__type_traits/strip_signature.h --- a/libcxx/include/__type_traits/strip_signature.h +++ b/libcxx/include/__type_traits/strip_signature.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_STRIP_SIGNATURE_H #define _LIBCPP___TYPE_TRAITS_STRIP_SIGNATURE_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/type_identity.h b/libcxx/include/__type_traits/type_identity.h --- a/libcxx/include/__type_traits/type_identity.h +++ b/libcxx/include/__type_traits/type_identity.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_TYPE_IDENTITY_H #define _LIBCPP___TYPE_TRAITS_TYPE_IDENTITY_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__type_traits/type_list.h b/libcxx/include/__type_traits/type_list.h --- a/libcxx/include/__type_traits/type_list.h +++ b/libcxx/include/__type_traits/type_list.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_TYPE_LIST_H #define _LIBCPP___TYPE_TRAITS_TYPE_LIST_H -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/underlying_type.h b/libcxx/include/__type_traits/underlying_type.h --- a/libcxx/include/__type_traits/underlying_type.h +++ b/libcxx/include/__type_traits/underlying_type.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_UNDERLYING_TYPE_H #define _LIBCPP___TYPE_TRAITS_UNDERLYING_TYPE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_enum.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/unwrap_ref.h b/libcxx/include/__type_traits/unwrap_ref.h --- a/libcxx/include/__type_traits/unwrap_ref.h +++ b/libcxx/include/__type_traits/unwrap_ref.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_UNWRAP_REF_H #define _LIBCPP___TYPE_TRAITS_UNWRAP_REF_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/decay.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__type_traits/void_t.h b/libcxx/include/__type_traits/void_t.h --- a/libcxx/include/__type_traits/void_t.h +++ b/libcxx/include/__type_traits/void_t.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___TYPE_TRAITS_VOID_T_H #define _LIBCPP___TYPE_TRAITS_VOID_T_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__utility/as_const.h b/libcxx/include/__utility/as_const.h --- a/libcxx/include/__utility/as_const.h +++ b/libcxx/include/__utility/as_const.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___UTILITY_AS_CONST_H #define _LIBCPP___UTILITY_AS_CONST_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/add_const.h> #include <__utility/forward.h> #include <__utility/move.h> diff --git a/libcxx/include/__utility/auto_cast.h b/libcxx/include/__utility/auto_cast.h --- a/libcxx/include/__utility/auto_cast.h +++ b/libcxx/include/__utility/auto_cast.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___UTILITY_AUTO_CAST_H #define _LIBCPP___UTILITY_AUTO_CAST_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/decay.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__utility/cmp.h b/libcxx/include/__utility/cmp.h --- a/libcxx/include/__utility/cmp.h +++ b/libcxx/include/__utility/cmp.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___UTILITY_CMP_H #define _LIBCPP___UTILITY_CMP_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/disjunction.h> #include <__type_traits/is_integral.h> #include <__type_traits/is_same.h> diff --git a/libcxx/include/__utility/convert_to_integral.h b/libcxx/include/__utility/convert_to_integral.h --- a/libcxx/include/__utility/convert_to_integral.h +++ b/libcxx/include/__utility/convert_to_integral.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___UTILITY_CONVERT_TO_INTEGRAL_H #define _LIBCPP___UTILITY_CONVERT_TO_INTEGRAL_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/enable_if.h> #include <__type_traits/is_enum.h> #include <__type_traits/is_floating_point.h> diff --git a/libcxx/include/__utility/declval.h b/libcxx/include/__utility/declval.h --- a/libcxx/include/__utility/declval.h +++ b/libcxx/include/__utility/declval.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___UTILITY_DECLVAL_H #define _LIBCPP___UTILITY_DECLVAL_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__utility/exception_guard.h b/libcxx/include/__utility/exception_guard.h --- a/libcxx/include/__utility/exception_guard.h +++ b/libcxx/include/__utility/exception_guard.h @@ -10,7 +10,7 @@ #define _LIBCPP___UTILITY_TRANSACTION_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_nothrow_move_constructible.h> #include <__utility/exchange.h> #include <__utility/move.h> diff --git a/libcxx/include/__utility/exchange.h b/libcxx/include/__utility/exchange.h --- a/libcxx/include/__utility/exchange.h +++ b/libcxx/include/__utility/exchange.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___UTILITY_EXCHANGE_H #define _LIBCPP___UTILITY_EXCHANGE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_nothrow_assignable.h> #include <__type_traits/is_nothrow_move_constructible.h> #include <__utility/forward.h> diff --git a/libcxx/include/__utility/forward.h b/libcxx/include/__utility/forward.h --- a/libcxx/include/__utility/forward.h +++ b/libcxx/include/__utility/forward.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___UTILITY_FORWARD_H #define _LIBCPP___UTILITY_FORWARD_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_reference.h> #include <__type_traits/remove_reference.h> diff --git a/libcxx/include/__utility/forward_like.h b/libcxx/include/__utility/forward_like.h --- a/libcxx/include/__utility/forward_like.h +++ b/libcxx/include/__utility/forward_like.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___UTILITY_FORWARD_LIKE_H #define _LIBCPP___UTILITY_FORWARD_LIKE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conditional.h> #include <__type_traits/is_const.h> #include <__type_traits/is_reference.h> diff --git a/libcxx/include/__utility/in_place.h b/libcxx/include/__utility/in_place.h --- a/libcxx/include/__utility/in_place.h +++ b/libcxx/include/__utility/in_place.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___UTILITY_IN_PLACE_H #define _LIBCPP___UTILITY_IN_PLACE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/remove_cvref.h> #include diff --git a/libcxx/include/__utility/integer_sequence.h b/libcxx/include/__utility/integer_sequence.h --- a/libcxx/include/__utility/integer_sequence.h +++ b/libcxx/include/__utility/integer_sequence.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___UTILITY_INTEGER_SEQUENCE_H #define _LIBCPP___UTILITY_INTEGER_SEQUENCE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_integral.h> #include diff --git a/libcxx/include/__utility/move.h b/libcxx/include/__utility/move.h --- a/libcxx/include/__utility/move.h +++ b/libcxx/include/__utility/move.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___UTILITY_MOVE_H #define _LIBCPP___UTILITY_MOVE_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/conditional.h> #include <__type_traits/is_copy_constructible.h> #include <__type_traits/is_nothrow_move_constructible.h> diff --git a/libcxx/include/__utility/pair.h b/libcxx/include/__utility/pair.h --- a/libcxx/include/__utility/pair.h +++ b/libcxx/include/__utility/pair.h @@ -12,7 +12,7 @@ #include <__compare/common_comparison_category.h> #include <__compare/synth_three_way.h> #include <__concepts/different_from.h> -#include <__config> +#include <__config_dir/config.h> #include <__fwd/array.h> #include <__fwd/get.h> #include <__fwd/subrange.h> diff --git a/libcxx/include/__utility/piecewise_construct.h b/libcxx/include/__utility/piecewise_construct.h --- a/libcxx/include/__utility/piecewise_construct.h +++ b/libcxx/include/__utility/piecewise_construct.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___UTILITY_PIECEWISE_CONSTRUCT_H #define _LIBCPP___UTILITY_PIECEWISE_CONSTRUCT_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__utility/priority_tag.h b/libcxx/include/__utility/priority_tag.h --- a/libcxx/include/__utility/priority_tag.h +++ b/libcxx/include/__utility/priority_tag.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___UTILITY_PRIORITY_TAG_H #define _LIBCPP___UTILITY_PRIORITY_TAG_H -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__utility/rel_ops.h b/libcxx/include/__utility/rel_ops.h --- a/libcxx/include/__utility/rel_ops.h +++ b/libcxx/include/__utility/rel_ops.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___UTILITY_REL_OPS_H #define _LIBCPP___UTILITY_REL_OPS_H -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__utility/swap.h b/libcxx/include/__utility/swap.h --- a/libcxx/include/__utility/swap.h +++ b/libcxx/include/__utility/swap.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___UTILITY_SWAP_H #define _LIBCPP___UTILITY_SWAP_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_move_assignable.h> #include <__type_traits/is_move_constructible.h> #include <__type_traits/is_nothrow_move_assignable.h> diff --git a/libcxx/include/__utility/terminate_on_exception.h b/libcxx/include/__utility/terminate_on_exception.h --- a/libcxx/include/__utility/terminate_on_exception.h +++ b/libcxx/include/__utility/terminate_on_exception.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP___UTILITY_TERMINATE_ON_EXCEPTION_H #define _LIBCPP___UTILITY_TERMINATE_ON_EXCEPTION_H -#include <__config> +#include <__config_dir/config.h> #include <__exception/terminate.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__utility/to_underlying.h b/libcxx/include/__utility/to_underlying.h --- a/libcxx/include/__utility/to_underlying.h +++ b/libcxx/include/__utility/to_underlying.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP___UTILITY_TO_UNDERLYING_H #define _LIBCPP___UTILITY_TO_UNDERLYING_H -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/underlying_type.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__utility/unreachable.h b/libcxx/include/__utility/unreachable.h --- a/libcxx/include/__utility/unreachable.h +++ b/libcxx/include/__utility/unreachable.h @@ -10,7 +10,7 @@ #define _LIBCPP___UTILITY_UNREACHABLE_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/__variant/monostate.h b/libcxx/include/__variant/monostate.h --- a/libcxx/include/__variant/monostate.h +++ b/libcxx/include/__variant/monostate.h @@ -11,7 +11,7 @@ #define _LIBCPP___VARIANT_MONOSTATE_H #include <__compare/ordering.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/hash.h> #include diff --git a/libcxx/include/__verbose_abort b/libcxx/include/__verbose_abort --- a/libcxx/include/__verbose_abort +++ b/libcxx/include/__verbose_abort @@ -10,8 +10,8 @@ #ifndef _LIBCPP___VERBOSE_ABORT #define _LIBCPP___VERBOSE_ABORT -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -1728,8 +1728,8 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include #include diff --git a/libcxx/include/any b/libcxx/include/any --- a/libcxx/include/any +++ b/libcxx/include/any @@ -81,8 +81,8 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__memory/allocator.h> #include <__memory/allocator_destructor.h> #include <__memory/allocator_traits.h> diff --git a/libcxx/include/array b/libcxx/include/array --- a/libcxx/include/array +++ b/libcxx/include/array @@ -117,7 +117,7 @@ #include <__algorithm/lexicographical_compare_three_way.h> #include <__algorithm/swap_ranges.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__iterator/reverse_iterator.h> #include <__tuple/sfinae_helpers.h> #include <__type_traits/conditional.h> diff --git a/libcxx/include/atomic b/libcxx/include/atomic --- a/libcxx/include/atomic +++ b/libcxx/include/atomic @@ -533,7 +533,7 @@ #include <__atomic/is_always_lock_free.h> #include <__atomic/kill_dependency.h> #include <__atomic/memory_order.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/barrier b/libcxx/include/barrier --- a/libcxx/include/barrier +++ b/libcxx/include/barrier @@ -48,8 +48,8 @@ #include <__assert> // all public C++ headers provide the assertion handler #include <__atomic/atomic_base.h> #include <__atomic/memory_order.h> -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__memory/unique_ptr.h> #include <__thread/poll_with_backoff.h> #include <__thread/timed_backoff_policy.h> diff --git a/libcxx/include/bit b/libcxx/include/bit --- a/libcxx/include/bit +++ b/libcxx/include/bit @@ -75,7 +75,7 @@ #include <__bit/has_single_bit.h> #include <__bit/popcount.h> #include <__bit/rotate.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/bitset b/libcxx/include/bitset --- a/libcxx/include/bitset +++ b/libcxx/include/bitset @@ -115,7 +115,7 @@ #include <__algorithm/fill.h> #include <__assert> // all public C++ headers provide the assertion handler #include <__bit_reference> -#include <__config> +#include <__config_dir/config.h> #include <__functional/hash.h> #include <__functional/unary_function.h> #include <__type_traits/is_char_like_type.h> diff --git a/libcxx/include/cassert b/libcxx/include/cassert --- a/libcxx/include/cassert +++ b/libcxx/include/cassert @@ -17,7 +17,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> // is not provided by libc++ #if __has_include() diff --git a/libcxx/include/cctype b/libcxx/include/cctype --- a/libcxx/include/cctype +++ b/libcxx/include/cctype @@ -35,7 +35,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include diff --git a/libcxx/include/cerrno b/libcxx/include/cerrno --- a/libcxx/include/cerrno +++ b/libcxx/include/cerrno @@ -23,7 +23,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include diff --git a/libcxx/include/cfenv b/libcxx/include/cfenv --- a/libcxx/include/cfenv +++ b/libcxx/include/cfenv @@ -53,7 +53,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include diff --git a/libcxx/include/cfloat b/libcxx/include/cfloat --- a/libcxx/include/cfloat +++ b/libcxx/include/cfloat @@ -70,7 +70,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include diff --git a/libcxx/include/charconv b/libcxx/include/charconv --- a/libcxx/include/charconv +++ b/libcxx/include/charconv @@ -78,8 +78,8 @@ #include <__charconv/to_chars_integral.h> #include <__charconv/to_chars_result.h> #include <__charconv/traits.h> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__system_error/errc.h> #include // for log2f #include diff --git a/libcxx/include/chrono b/libcxx/include/chrono --- a/libcxx/include/chrono +++ b/libcxx/include/chrono @@ -793,7 +793,7 @@ #include <__chrono/year_month.h> #include <__chrono/year_month_day.h> #include <__chrono/year_month_weekday.h> -#include <__config> +#include <__config_dir/config.h> #include // standard-mandated includes diff --git a/libcxx/include/cinttypes b/libcxx/include/cinttypes --- a/libcxx/include/cinttypes +++ b/libcxx/include/cinttypes @@ -235,7 +235,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> // standard-mandated includes diff --git a/libcxx/include/ciso646 b/libcxx/include/ciso646 --- a/libcxx/include/ciso646 +++ b/libcxx/include/ciso646 @@ -16,7 +16,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/climits b/libcxx/include/climits --- a/libcxx/include/climits +++ b/libcxx/include/climits @@ -38,7 +38,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include diff --git a/libcxx/include/clocale b/libcxx/include/clocale --- a/libcxx/include/clocale +++ b/libcxx/include/clocale @@ -35,7 +35,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include diff --git a/libcxx/include/cmath b/libcxx/include/cmath --- a/libcxx/include/cmath +++ b/libcxx/include/cmath @@ -305,7 +305,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/enable_if.h> #include <__type_traits/is_arithmetic.h> #include <__type_traits/is_constant_evaluated.h> diff --git a/libcxx/include/codecvt b/libcxx/include/codecvt --- a/libcxx/include/codecvt +++ b/libcxx/include/codecvt @@ -55,7 +55,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__locale> #include diff --git a/libcxx/include/compare b/libcxx/include/compare --- a/libcxx/include/compare +++ b/libcxx/include/compare @@ -154,7 +154,7 @@ #include <__compare/synth_three_way.h> #include <__compare/three_way_comparable.h> #include <__compare/weak_order.h> -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/complex b/libcxx/include/complex --- a/libcxx/include/complex +++ b/libcxx/include/complex @@ -232,7 +232,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include #include #include diff --git a/libcxx/include/complex.h b/libcxx/include/complex.h --- a/libcxx/include/complex.h +++ b/libcxx/include/complex.h @@ -17,7 +17,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/concepts b/libcxx/include/concepts --- a/libcxx/include/concepts +++ b/libcxx/include/concepts @@ -152,7 +152,7 @@ #include <__concepts/semiregular.h> #include <__concepts/swappable.h> #include <__concepts/totally_ordered.h> -#include <__config> +#include <__config_dir/config.h> #include #if _LIBCPP_STD_VER <= 20 && !defined(_LIPCPP_REMOVE_TRANSITIVE_INCLUDES) diff --git a/libcxx/include/condition_variable b/libcxx/include/condition_variable --- a/libcxx/include/condition_variable +++ b/libcxx/include/condition_variable @@ -111,7 +111,7 @@ #include <__chrono/steady_clock.h> #include <__chrono/time_point.h> #include <__condition_variable/condition_variable.h> -#include <__config> +#include <__config_dir/config.h> #include <__memory/shared_ptr.h> #include <__memory/unique_ptr.h> #include <__mutex/lock_guard.h> diff --git a/libcxx/include/coroutine b/libcxx/include/coroutine --- a/libcxx/include/coroutine +++ b/libcxx/include/coroutine @@ -39,7 +39,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__coroutine/coroutine_handle.h> #include <__coroutine/coroutine_traits.h> #include <__coroutine/noop_coroutine_handle.h> diff --git a/libcxx/include/csetjmp b/libcxx/include/csetjmp --- a/libcxx/include/csetjmp +++ b/libcxx/include/csetjmp @@ -31,7 +31,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include diff --git a/libcxx/include/csignal b/libcxx/include/csignal --- a/libcxx/include/csignal +++ b/libcxx/include/csignal @@ -40,7 +40,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> // is not provided by libc++ #if __has_include() diff --git a/libcxx/include/cstdarg b/libcxx/include/cstdarg --- a/libcxx/include/cstdarg +++ b/libcxx/include/cstdarg @@ -32,7 +32,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> // is not provided by libc++ #if __has_include() diff --git a/libcxx/include/cstdbool b/libcxx/include/cstdbool --- a/libcxx/include/cstdbool +++ b/libcxx/include/cstdbool @@ -20,7 +20,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/cstddef b/libcxx/include/cstddef --- a/libcxx/include/cstddef +++ b/libcxx/include/cstddef @@ -34,7 +34,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/enable_if.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_integral.h> diff --git a/libcxx/include/cstdint b/libcxx/include/cstdint --- a/libcxx/include/cstdint +++ b/libcxx/include/cstdint @@ -141,7 +141,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include diff --git a/libcxx/include/cstdio b/libcxx/include/cstdio --- a/libcxx/include/cstdio +++ b/libcxx/include/cstdio @@ -96,7 +96,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include diff --git a/libcxx/include/cstdlib b/libcxx/include/cstdlib --- a/libcxx/include/cstdlib +++ b/libcxx/include/cstdlib @@ -82,7 +82,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include diff --git a/libcxx/include/cstring b/libcxx/include/cstring --- a/libcxx/include/cstring +++ b/libcxx/include/cstring @@ -57,7 +57,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_constant_evaluated.h> #include diff --git a/libcxx/include/ctime b/libcxx/include/ctime --- a/libcxx/include/ctime +++ b/libcxx/include/ctime @@ -46,7 +46,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> // is not provided by libc++ #if __has_include() diff --git a/libcxx/include/ctype.h b/libcxx/include/ctype.h --- a/libcxx/include/ctype.h +++ b/libcxx/include/ctype.h @@ -29,7 +29,7 @@ int toupper(int c); */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/cuchar b/libcxx/include/cuchar --- a/libcxx/include/cuchar +++ b/libcxx/include/cuchar @@ -37,7 +37,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include diff --git a/libcxx/include/cwchar b/libcxx/include/cwchar --- a/libcxx/include/cwchar +++ b/libcxx/include/cwchar @@ -103,7 +103,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/apply_cv.h> #include <__type_traits/is_constant_evaluated.h> #include <__type_traits/is_equality_comparable.h> diff --git a/libcxx/include/cwctype b/libcxx/include/cwctype --- a/libcxx/include/cwctype +++ b/libcxx/include/cwctype @@ -50,7 +50,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/deque b/libcxx/include/deque --- a/libcxx/include/deque +++ b/libcxx/include/deque @@ -189,7 +189,7 @@ #include <__algorithm/remove_if.h> #include <__algorithm/unwrap_iter.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__format/enable_insertable.h> #include <__iterator/distance.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/errno.h b/libcxx/include/errno.h --- a/libcxx/include/errno.h +++ b/libcxx/include/errno.h @@ -22,7 +22,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/exception b/libcxx/include/exception --- a/libcxx/include/exception +++ b/libcxx/include/exception @@ -77,7 +77,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__exception/exception.h> #include <__exception/exception_ptr.h> #include <__exception/nested_exception.h> diff --git a/libcxx/include/execution b/libcxx/include/execution --- a/libcxx/include/execution +++ b/libcxx/include/execution @@ -33,7 +33,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_execution_policy.h> #include <__type_traits/is_same.h> #include <__type_traits/remove_cvref.h> diff --git a/libcxx/include/expected b/libcxx/include/expected --- a/libcxx/include/expected +++ b/libcxx/include/expected @@ -39,7 +39,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__expected/bad_expected_access.h> #include <__expected/expected.h> #include <__expected/unexpect.h> diff --git a/libcxx/include/experimental/__config b/libcxx/include/experimental/__config --- a/libcxx/include/experimental/__config +++ b/libcxx/include/experimental/__config @@ -10,7 +10,7 @@ #ifndef _LIBCPP_EXPERIMENTAL_CONFIG #define _LIBCPP_EXPERIMENTAL_CONFIG -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/ext/__hash b/libcxx/include/ext/__hash --- a/libcxx/include/ext/__hash +++ b/libcxx/include/ext/__hash @@ -12,7 +12,7 @@ # pragma GCC system_header -#include <__config> +#include <__config_dir/config.h> #include #include #include diff --git a/libcxx/include/ext/hash_map b/libcxx/include/ext/hash_map --- a/libcxx/include/ext/hash_map +++ b/libcxx/include/ext/hash_map @@ -202,7 +202,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__hash_table> #include #include diff --git a/libcxx/include/ext/hash_set b/libcxx/include/ext/hash_set --- a/libcxx/include/ext/hash_set +++ b/libcxx/include/ext/hash_set @@ -193,7 +193,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__hash_table> #include #include diff --git a/libcxx/include/fenv.h b/libcxx/include/fenv.h --- a/libcxx/include/fenv.h +++ b/libcxx/include/fenv.h @@ -50,7 +50,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/filesystem b/libcxx/include/filesystem --- a/libcxx/include/filesystem +++ b/libcxx/include/filesystem @@ -433,7 +433,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__filesystem/copy_options.h> #include <__filesystem/directory_entry.h> #include <__filesystem/directory_iterator.h> diff --git a/libcxx/include/float.h b/libcxx/include/float.h --- a/libcxx/include/float.h +++ b/libcxx/include/float.h @@ -70,7 +70,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/format b/libcxx/include/format --- a/libcxx/include/format +++ b/libcxx/include/format @@ -170,7 +170,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__format/buffer.h> #include <__format/concepts.h> #include <__format/container_adaptor.h> diff --git a/libcxx/include/forward_list b/libcxx/include/forward_list --- a/libcxx/include/forward_list +++ b/libcxx/include/forward_list @@ -188,7 +188,7 @@ #include <__algorithm/lexicographical_compare_three_way.h> #include <__algorithm/min.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__iterator/distance.h> #include <__iterator/iterator_traits.h> #include <__iterator/move_iterator.h> diff --git a/libcxx/include/fstream b/libcxx/include/fstream --- a/libcxx/include/fstream +++ b/libcxx/include/fstream @@ -181,8 +181,8 @@ #include <__algorithm/max.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__fwd/fstream.h> #include <__locale> #include <__utility/move.h> diff --git a/libcxx/include/functional b/libcxx/include/functional --- a/libcxx/include/functional +++ b/libcxx/include/functional @@ -515,8 +515,8 @@ #include <__algorithm/search.h> #include <__assert> // all public C++ headers provide the assertion handler #include <__compare/compare_three_way.h> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__functional/binary_function.h> #include <__functional/binary_negate.h> #include <__functional/bind.h> diff --git a/libcxx/include/future b/libcxx/include/future --- a/libcxx/include/future +++ b/libcxx/include/future @@ -362,10 +362,10 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__availability> #include <__chrono/duration.h> #include <__chrono/time_point.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__exception/exception_ptr.h> #include <__memory/allocator.h> #include <__memory/allocator_arg_t.h> diff --git a/libcxx/include/initializer_list b/libcxx/include/initializer_list --- a/libcxx/include/initializer_list +++ b/libcxx/include/initializer_list @@ -43,7 +43,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/inttypes.h b/libcxx/include/inttypes.h --- a/libcxx/include/inttypes.h +++ b/libcxx/include/inttypes.h @@ -235,7 +235,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/iomanip b/libcxx/include/iomanip --- a/libcxx/include/iomanip +++ b/libcxx/include/iomanip @@ -43,7 +43,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/ios b/libcxx/include/ios --- a/libcxx/include/ios +++ b/libcxx/include/ios @@ -210,7 +210,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if defined(_LIBCPP_HAS_NO_LOCALIZATION) # error "The iostreams library is not supported since libc++ has been configured without support for localization." diff --git a/libcxx/include/iosfwd b/libcxx/include/iosfwd --- a/libcxx/include/iosfwd +++ b/libcxx/include/iosfwd @@ -95,7 +95,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__fwd/fstream.h> #include <__fwd/ios.h> #include <__fwd/istream.h> diff --git a/libcxx/include/iostream b/libcxx/include/iostream --- a/libcxx/include/iostream +++ b/libcxx/include/iostream @@ -34,7 +34,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include // standard-mandated includes diff --git a/libcxx/include/istream b/libcxx/include/istream --- a/libcxx/include/istream +++ b/libcxx/include/istream @@ -159,7 +159,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__fwd/istream.h> #include <__iterator/istreambuf_iterator.h> #include <__type_traits/conjunction.h> diff --git a/libcxx/include/iterator b/libcxx/include/iterator --- a/libcxx/include/iterator +++ b/libcxx/include/iterator @@ -675,8 +675,8 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__iterator/access.h> #include <__iterator/advance.h> #include <__iterator/back_insert_iterator.h> diff --git a/libcxx/include/latch b/libcxx/include/latch --- a/libcxx/include/latch +++ b/libcxx/include/latch @@ -44,8 +44,8 @@ #include <__atomic/atomic_base.h> #include <__atomic/atomic_sync.h> #include <__atomic/memory_order.h> -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include #include #include diff --git a/libcxx/include/libcxx.imp b/libcxx/include/libcxx.imp --- a/libcxx/include/libcxx.imp +++ b/libcxx/include/libcxx.imp @@ -22,6 +22,7 @@ { include: [ "@<__compare/.*>", "private", "", "public" ] }, { include: [ "@<__concepts/.*>", "private", "", "public" ] }, { include: [ "@<__condition_variable/.*>", "private", "", "public" ] }, + { include: [ "@<__config_dir/.*>", "private", "", "public" ] }, { include: [ "@<__coroutine/.*>", "private", "", "public" ] }, { include: [ "@<__debug_utils/.*>", "private", "", "public" ] }, { include: [ "@<__exception/.*>", "private", "", "public" ] }, diff --git a/libcxx/include/limits b/libcxx/include/limits --- a/libcxx/include/limits +++ b/libcxx/include/limits @@ -103,7 +103,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/is_arithmetic.h> #include <__type_traits/is_signed.h> #include <__type_traits/remove_cv.h> diff --git a/libcxx/include/limits.h b/libcxx/include/limits.h --- a/libcxx/include/limits.h +++ b/libcxx/include/limits.h @@ -37,7 +37,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/list b/libcxx/include/list --- a/libcxx/include/list +++ b/libcxx/include/list @@ -189,8 +189,8 @@ #include <__algorithm/lexicographical_compare_three_way.h> #include <__algorithm/min.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__format/enable_insertable.h> #include <__iterator/distance.h> #include <__iterator/iterator_traits.h> diff --git a/libcxx/include/locale b/libcxx/include/locale --- a/libcxx/include/locale +++ b/libcxx/include/locale @@ -194,8 +194,8 @@ #include <__algorithm/reverse.h> #include <__algorithm/unwrap_iter.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__iterator/access.h> #include <__iterator/back_insert_iterator.h> #include <__iterator/istreambuf_iterator.h> diff --git a/libcxx/include/locale.h b/libcxx/include/locale.h --- a/libcxx/include/locale.h +++ b/libcxx/include/locale.h @@ -33,7 +33,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if defined(_LIBCPP_HAS_NO_LOCALIZATION) # error " is not supported since libc++ has been configured without support for localization." diff --git a/libcxx/include/map b/libcxx/include/map --- a/libcxx/include/map +++ b/libcxx/include/map @@ -542,7 +542,7 @@ #include <__algorithm/lexicographical_compare.h> #include <__algorithm/lexicographical_compare_three_way.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__functional/binary_function.h> #include <__functional/is_transparent.h> #include <__functional/operations.h> diff --git a/libcxx/include/math.h b/libcxx/include/math.h --- a/libcxx/include/math.h +++ b/libcxx/include/math.h @@ -291,7 +291,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/mdspan b/libcxx/include/mdspan --- a/libcxx/include/mdspan +++ b/libcxx/include/mdspan @@ -59,7 +59,7 @@ #ifndef _LIBCPP_MDSPAN #define _LIBCPP_MDSPAN -#include <__config> +#include <__config_dir/config.h> #include <__mdspan/extents.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/memory b/libcxx/include/memory --- a/libcxx/include/memory +++ b/libcxx/include/memory @@ -878,7 +878,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__memory/addressof.h> #include <__memory/align.h> #include <__memory/allocate_at_least.h> diff --git a/libcxx/include/memory_resource b/libcxx/include/memory_resource --- a/libcxx/include/memory_resource +++ b/libcxx/include/memory_resource @@ -49,7 +49,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #include <__memory_resource/memory_resource.h> #include <__memory_resource/monotonic_buffer_resource.h> #include <__memory_resource/polymorphic_allocator.h> diff --git a/libcxx/include/module.modulemap.in b/libcxx/include/module.modulemap.in --- a/libcxx/include/module.modulemap.in +++ b/libcxx/include/module.modulemap.in @@ -2,7 +2,7 @@ // since __config may be included from C headers which may create an // include cycle. module std_config [system] [extern_c] { - textual header "__config" + textual header "__config_dir/config.h" export * } @@ -1781,11 +1781,11 @@ } // FIXME: These should be private. - module __assert { header "__assert" export * } - module __availability { private header "__availability" export * } - module __bit_reference { private header "__bit_reference" export * } - module __debug { header "__debug" export * } - module __hash_table { header "__hash_table" export * } + module __assert { header "__assert" export * } + module __availability { private header "__config_dir/availability.h" export * } + module __bit_reference { private header "__bit_reference" export * } + module __debug { header "__config_dir/debug.h" export * } + module __hash_table { header "__hash_table" export * } module __locale { @requires_LIBCXX_ENABLE_LOCALIZATION@ private header "__locale" export * diff --git a/libcxx/include/mutex b/libcxx/include/mutex --- a/libcxx/include/mutex +++ b/libcxx/include/mutex @@ -190,7 +190,7 @@ #include <__chrono/steady_clock.h> #include <__chrono/time_point.h> #include <__condition_variable/condition_variable.h> -#include <__config> +#include <__config_dir/config.h> #include <__memory/shared_ptr.h> #include <__mutex/lock_guard.h> #include <__mutex/mutex.h> diff --git a/libcxx/include/new b/libcxx/include/new --- a/libcxx/include/new +++ b/libcxx/include/new @@ -87,8 +87,8 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__exception/exception.h> #include <__type_traits/alignment_of.h> #include <__type_traits/is_function.h> diff --git a/libcxx/include/numbers b/libcxx/include/numbers --- a/libcxx/include/numbers +++ b/libcxx/include/numbers @@ -60,7 +60,7 @@ #include <__assert> // all public C++ headers provide the assertion handler #include <__concepts/arithmetic.h> -#include <__config> +#include <__config_dir/config.h> #include #if _LIBCPP_STD_VER >= 20 diff --git a/libcxx/include/numeric b/libcxx/include/numeric --- a/libcxx/include/numeric +++ b/libcxx/include/numeric @@ -145,7 +145,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include // for isnormal #include diff --git a/libcxx/include/optional b/libcxx/include/optional --- a/libcxx/include/optional +++ b/libcxx/include/optional @@ -178,11 +178,11 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__availability> #include <__compare/compare_three_way_result.h> #include <__compare/three_way_comparable.h> #include <__concepts/invocable.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__functional/hash.h> #include <__functional/invoke.h> #include <__functional/reference_wrapper.h> diff --git a/libcxx/include/ostream b/libcxx/include/ostream --- a/libcxx/include/ostream +++ b/libcxx/include/ostream @@ -164,7 +164,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__exception/operations.h> #include <__fwd/ostream.h> #include <__memory/shared_ptr.h> diff --git a/libcxx/include/queue b/libcxx/include/queue --- a/libcxx/include/queue +++ b/libcxx/include/queue @@ -221,7 +221,7 @@ #include <__algorithm/pop_heap.h> #include <__algorithm/push_heap.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__functional/operations.h> #include <__iterator/iterator_traits.h> #include <__memory/uses_allocator.h> diff --git a/libcxx/include/random b/libcxx/include/random --- a/libcxx/include/random +++ b/libcxx/include/random @@ -1678,7 +1678,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__random/bernoulli_distribution.h> #include <__random/binomial_distribution.h> #include <__random/cauchy_distribution.h> diff --git a/libcxx/include/ranges b/libcxx/include/ranges --- a/libcxx/include/ranges +++ b/libcxx/include/ranges @@ -346,7 +346,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__ranges/access.h> #include <__ranges/all.h> #include <__ranges/as_rvalue_view.h> diff --git a/libcxx/include/ratio b/libcxx/include/ratio --- a/libcxx/include/ratio +++ b/libcxx/include/ratio @@ -78,7 +78,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__type_traits/integral_constant.h> #include #include diff --git a/libcxx/include/regex b/libcxx/include/regex --- a/libcxx/include/regex +++ b/libcxx/include/regex @@ -788,7 +788,7 @@ #include <__algorithm/find.h> #include <__algorithm/search.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__iterator/back_insert_iterator.h> #include <__iterator/wrap_iter.h> #include <__locale> diff --git a/libcxx/include/scoped_allocator b/libcxx/include/scoped_allocator --- a/libcxx/include/scoped_allocator +++ b/libcxx/include/scoped_allocator @@ -110,7 +110,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__memory/allocator_traits.h> #include <__memory/uses_allocator_construction.h> #include <__type_traits/common_type.h> diff --git a/libcxx/include/semaphore b/libcxx/include/semaphore --- a/libcxx/include/semaphore +++ b/libcxx/include/semaphore @@ -49,9 +49,9 @@ #include <__atomic/atomic_base.h> #include <__atomic/atomic_sync.h> #include <__atomic/memory_order.h> -#include <__availability> #include <__chrono/time_point.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__thread/timed_backoff_policy.h> #include <__threading_support> #include diff --git a/libcxx/include/set b/libcxx/include/set --- a/libcxx/include/set +++ b/libcxx/include/set @@ -483,7 +483,7 @@ #include <__algorithm/lexicographical_compare.h> #include <__algorithm/lexicographical_compare_three_way.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__functional/is_transparent.h> #include <__functional/operations.h> #include <__iterator/erase_if_container.h> diff --git a/libcxx/include/setjmp.h b/libcxx/include/setjmp.h --- a/libcxx/include/setjmp.h +++ b/libcxx/include/setjmp.h @@ -25,7 +25,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/shared_mutex b/libcxx/include/shared_mutex --- a/libcxx/include/shared_mutex +++ b/libcxx/include/shared_mutex @@ -123,12 +123,12 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__availability> #include <__chrono/duration.h> #include <__chrono/steady_clock.h> #include <__chrono/time_point.h> #include <__condition_variable/condition_variable.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__memory/addressof.h> #include <__mutex/mutex.h> #include <__mutex/tag_types.h> diff --git a/libcxx/include/source_location b/libcxx/include/source_location --- a/libcxx/include/source_location +++ b/libcxx/include/source_location @@ -25,7 +25,7 @@ } */ -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/include/span b/libcxx/include/span --- a/libcxx/include/span +++ b/libcxx/include/span @@ -128,8 +128,8 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__fwd/span.h> #include <__iterator/bounded_iter.h> #include <__iterator/concepts.h> diff --git a/libcxx/include/sstream b/libcxx/include/sstream --- a/libcxx/include/sstream +++ b/libcxx/include/sstream @@ -190,7 +190,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__fwd/sstream.h> #include <__utility/swap.h> #include diff --git a/libcxx/include/stack b/libcxx/include/stack --- a/libcxx/include/stack +++ b/libcxx/include/stack @@ -99,7 +99,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__memory/uses_allocator.h> #include <__type_traits/is_same.h> diff --git a/libcxx/include/stdatomic.h b/libcxx/include/stdatomic.h --- a/libcxx/include/stdatomic.h +++ b/libcxx/include/stdatomic.h @@ -115,7 +115,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/stdbool.h b/libcxx/include/stdbool.h --- a/libcxx/include/stdbool.h +++ b/libcxx/include/stdbool.h @@ -19,7 +19,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/stddef.h b/libcxx/include/stddef.h --- a/libcxx/include/stddef.h +++ b/libcxx/include/stddef.h @@ -36,7 +36,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/stdexcept b/libcxx/include/stdexcept --- a/libcxx/include/stdexcept +++ b/libcxx/include/stdexcept @@ -42,7 +42,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__exception/exception.h> #include <__verbose_abort> #include // for string forward decl diff --git a/libcxx/include/stdint.h b/libcxx/include/stdint.h --- a/libcxx/include/stdint.h +++ b/libcxx/include/stdint.h @@ -103,7 +103,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/stdio.h b/libcxx/include/stdio.h --- a/libcxx/include/stdio.h +++ b/libcxx/include/stdio.h @@ -98,7 +98,7 @@ void perror(const char* s); */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/stdlib.h b/libcxx/include/stdlib.h --- a/libcxx/include/stdlib.h +++ b/libcxx/include/stdlib.h @@ -84,7 +84,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/streambuf b/libcxx/include/streambuf --- a/libcxx/include/streambuf +++ b/libcxx/include/streambuf @@ -108,7 +108,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__fwd/streambuf.h> #include #include diff --git a/libcxx/include/string b/libcxx/include/string --- a/libcxx/include/string +++ b/libcxx/include/string @@ -539,8 +539,8 @@ #include <__algorithm/remove.h> #include <__algorithm/remove_if.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__format/enable_insertable.h> #include <__functional/hash.h> #include <__functional/unary_function.h> diff --git a/libcxx/include/string.h b/libcxx/include/string.h --- a/libcxx/include/string.h +++ b/libcxx/include/string.h @@ -51,7 +51,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/string_view b/libcxx/include/string_view --- a/libcxx/include/string_view +++ b/libcxx/include/string_view @@ -204,7 +204,7 @@ #include <__algorithm/min.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__functional/hash.h> #include <__functional/unary_function.h> #include <__fwd/string_view.h> diff --git a/libcxx/include/strstream b/libcxx/include/strstream --- a/libcxx/include/strstream +++ b/libcxx/include/strstream @@ -130,7 +130,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include #include #include diff --git a/libcxx/include/system_error b/libcxx/include/system_error --- a/libcxx/include/system_error +++ b/libcxx/include/system_error @@ -145,7 +145,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__system_error/errc.h> #include <__system_error/error_category.h> #include <__system_error/error_code.h> diff --git a/libcxx/include/tgmath.h b/libcxx/include/tgmath.h --- a/libcxx/include/tgmath.h +++ b/libcxx/include/tgmath.h @@ -17,7 +17,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/thread b/libcxx/include/thread --- a/libcxx/include/thread +++ b/libcxx/include/thread @@ -87,12 +87,12 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__availability> #include <__chrono/steady_clock.h> #include <__chrono/time_point.h> #include <__concepts/arithmetic.h> #include <__condition_variable/condition_variable.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__exception/terminate.h> #include <__format/concepts.h> #include <__format/format_parse_context.h> diff --git a/libcxx/include/tuple b/libcxx/include/tuple --- a/libcxx/include/tuple +++ b/libcxx/include/tuple @@ -204,7 +204,7 @@ #include <__assert> // all public C++ headers provide the assertion handler #include <__compare/common_comparison_category.h> #include <__compare/synth_three_way.h> -#include <__config> +#include <__config_dir/config.h> #include <__functional/invoke.h> #include <__fwd/array.h> #include <__fwd/tuple.h> diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits --- a/libcxx/include/type_traits +++ b/libcxx/include/type_traits @@ -417,7 +417,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__fwd/hash.h> // This is https://llvm.org/PR56938 #include <__type_traits/add_const.h> #include <__type_traits/add_cv.h> diff --git a/libcxx/include/typeindex b/libcxx/include/typeindex --- a/libcxx/include/typeindex +++ b/libcxx/include/typeindex @@ -46,7 +46,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__functional/unary_function.h> #include #include diff --git a/libcxx/include/typeinfo b/libcxx/include/typeinfo --- a/libcxx/include/typeinfo +++ b/libcxx/include/typeinfo @@ -57,8 +57,8 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__availability> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__exception/exception.h> #include <__type_traits/is_constant_evaluated.h> #include <__verbose_abort> diff --git a/libcxx/include/uchar.h b/libcxx/include/uchar.h --- a/libcxx/include/uchar.h +++ b/libcxx/include/uchar.h @@ -32,7 +32,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/unordered_map b/libcxx/include/unordered_map --- a/libcxx/include/unordered_map +++ b/libcxx/include/unordered_map @@ -516,8 +516,8 @@ #include <__algorithm/is_permutation.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__functional/is_transparent.h> #include <__functional/operations.h> #include <__hash_table> diff --git a/libcxx/include/unordered_set b/libcxx/include/unordered_set --- a/libcxx/include/unordered_set +++ b/libcxx/include/unordered_set @@ -461,8 +461,8 @@ #include <__algorithm/is_permutation.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__functional/is_transparent.h> #include <__functional/operations.h> #include <__hash_table> diff --git a/libcxx/include/utility b/libcxx/include/utility --- a/libcxx/include/utility +++ b/libcxx/include/utility @@ -247,7 +247,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__utility/as_const.h> #include <__utility/auto_cast.h> #include <__utility/cmp.h> diff --git a/libcxx/include/valarray b/libcxx/include/valarray --- a/libcxx/include/valarray +++ b/libcxx/include/valarray @@ -349,7 +349,7 @@ #include <__algorithm/min_element.h> #include <__algorithm/unwrap_iter.h> #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #include <__functional/operations.h> #include <__memory/addressof.h> #include <__memory/allocator.h> diff --git a/libcxx/include/variant b/libcxx/include/variant --- a/libcxx/include/variant +++ b/libcxx/include/variant @@ -205,11 +205,11 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__availability> #include <__compare/common_comparison_category.h> #include <__compare/compare_three_way_result.h> #include <__compare/three_way_comparable.h> -#include <__config> +#include <__config_dir/config.h> +#include <__config_dir/availability.h> #include <__exception/exception.h> #include <__functional/hash.h> #include <__functional/invoke.h> diff --git a/libcxx/include/vector b/libcxx/include/vector --- a/libcxx/include/vector +++ b/libcxx/include/vector @@ -310,8 +310,8 @@ #include <__assert> // all public C++ headers provide the assertion handler #include <__bit_reference> #include <__concepts/same_as.h> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__format/enable_insertable.h> #include <__format/formatter.h> #include <__format/formatter_bool.h> diff --git a/libcxx/include/version b/libcxx/include/version --- a/libcxx/include/version +++ b/libcxx/include/version @@ -205,7 +205,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/include/wchar.h b/libcxx/include/wchar.h --- a/libcxx/include/wchar.h +++ b/libcxx/include/wchar.h @@ -105,7 +105,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #include #if defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) diff --git a/libcxx/include/wctype.h b/libcxx/include/wctype.h --- a/libcxx/include/wctype.h +++ b/libcxx/include/wctype.h @@ -44,7 +44,7 @@ */ -#include <__config> +#include <__config_dir/config.h> #if defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) # error "The header is not supported since libc++ has been configured with LIBCXX_ENABLE_WIDE_CHARACTERS disabled" diff --git a/libcxx/modules/std/clocale.cppm b/libcxx/modules/std/clocale.cppm --- a/libcxx/modules/std/clocale.cppm +++ b/libcxx/modules/std/clocale.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_LOCALIZATION # include #endif diff --git a/libcxx/modules/std/codecvt.cppm b/libcxx/modules/std/codecvt.cppm --- a/libcxx/modules/std/codecvt.cppm +++ b/libcxx/modules/std/codecvt.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_LOCALIZATION # include #endif diff --git a/libcxx/modules/std/cwchar.cppm b/libcxx/modules/std/cwchar.cppm --- a/libcxx/modules/std/cwchar.cppm +++ b/libcxx/modules/std/cwchar.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS # include #endif diff --git a/libcxx/modules/std/cwctype.cppm b/libcxx/modules/std/cwctype.cppm --- a/libcxx/modules/std/cwctype.cppm +++ b/libcxx/modules/std/cwctype.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS # include #endif diff --git a/libcxx/modules/std/fstream.cppm b/libcxx/modules/std/fstream.cppm --- a/libcxx/modules/std/fstream.cppm +++ b/libcxx/modules/std/fstream.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_LOCALIZATION # include #endif diff --git a/libcxx/modules/std/iomanip.cppm b/libcxx/modules/std/iomanip.cppm --- a/libcxx/modules/std/iomanip.cppm +++ b/libcxx/modules/std/iomanip.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_LOCALIZATION # include #endif diff --git a/libcxx/modules/std/ios.cppm b/libcxx/modules/std/ios.cppm --- a/libcxx/modules/std/ios.cppm +++ b/libcxx/modules/std/ios.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_LOCALIZATION # include #endif diff --git a/libcxx/modules/std/iostream.cppm b/libcxx/modules/std/iostream.cppm --- a/libcxx/modules/std/iostream.cppm +++ b/libcxx/modules/std/iostream.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_LOCALIZATION # include #endif diff --git a/libcxx/modules/std/istream.cppm b/libcxx/modules/std/istream.cppm --- a/libcxx/modules/std/istream.cppm +++ b/libcxx/modules/std/istream.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_LOCALIZATION # include #endif diff --git a/libcxx/modules/std/locale.cppm b/libcxx/modules/std/locale.cppm --- a/libcxx/modules/std/locale.cppm +++ b/libcxx/modules/std/locale.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_LOCALIZATION # include #endif diff --git a/libcxx/modules/std/ostream.cppm b/libcxx/modules/std/ostream.cppm --- a/libcxx/modules/std/ostream.cppm +++ b/libcxx/modules/std/ostream.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_LOCALIZATION # include #endif diff --git a/libcxx/modules/std/regex.cppm b/libcxx/modules/std/regex.cppm --- a/libcxx/modules/std/regex.cppm +++ b/libcxx/modules/std/regex.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_LOCALIZATION # include #endif diff --git a/libcxx/modules/std/sstream.cppm b/libcxx/modules/std/sstream.cppm --- a/libcxx/modules/std/sstream.cppm +++ b/libcxx/modules/std/sstream.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_LOCALIZATION # include #endif diff --git a/libcxx/modules/std/streambuf.cppm b/libcxx/modules/std/streambuf.cppm --- a/libcxx/modules/std/streambuf.cppm +++ b/libcxx/modules/std/streambuf.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_LOCALIZATION # include #endif diff --git a/libcxx/modules/std/strstream.cppm b/libcxx/modules/std/strstream.cppm --- a/libcxx/modules/std/strstream.cppm +++ b/libcxx/modules/std/strstream.cppm @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// module; -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_LOCALIZATION # include #endif diff --git a/libcxx/src/atomic.cpp b/libcxx/src/atomic.cpp --- a/libcxx/src/atomic.cpp +++ b/libcxx/src/atomic.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_THREADS #include diff --git a/libcxx/src/barrier.cpp b/libcxx/src/barrier.cpp --- a/libcxx/src/barrier.cpp +++ b/libcxx/src/barrier.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_THREADS diff --git a/libcxx/src/condition_variable.cpp b/libcxx/src/condition_variable.cpp --- a/libcxx/src/condition_variable.cpp +++ b/libcxx/src/condition_variable.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_THREADS diff --git a/libcxx/src/condition_variable_destructor.cpp b/libcxx/src/condition_variable_destructor.cpp --- a/libcxx/src/condition_variable_destructor.cpp +++ b/libcxx/src/condition_variable_destructor.cpp @@ -11,7 +11,7 @@ // On some platforms ~condition_variable has been made trivial and the // definition is only provided for ABI compatibility. -#include <__config> +#include <__config_dir/config.h> #include <__threading_support> #if !defined(_LIBCPP_HAS_NO_THREADS) diff --git a/libcxx/src/debug.cpp b/libcxx/src/debug.cpp --- a/libcxx/src/debug.cpp +++ b/libcxx/src/debug.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include <__assert> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__hash_table> #include #include diff --git a/libcxx/src/filesystem/directory_iterator.cpp b/libcxx/src/filesystem/directory_iterator.cpp --- a/libcxx/src/filesystem/directory_iterator.cpp +++ b/libcxx/src/filesystem/directory_iterator.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include #include #include diff --git a/libcxx/src/filesystem/filesystem_common.h b/libcxx/src/filesystem/filesystem_common.h --- a/libcxx/src/filesystem/filesystem_common.h +++ b/libcxx/src/filesystem/filesystem_common.h @@ -10,7 +10,7 @@ #define FILESYSTEM_COMMON_H #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include #include #include diff --git a/libcxx/src/filesystem/int128_builtins.cpp b/libcxx/src/filesystem/int128_builtins.cpp --- a/libcxx/src/filesystem/int128_builtins.cpp +++ b/libcxx/src/filesystem/int128_builtins.cpp @@ -13,7 +13,7 @@ * * ===----------------------------------------------------------------------=== */ -#include <__config> +#include <__config_dir/config.h> #include #if !defined(_LIBCPP_HAS_NO_INT128) diff --git a/libcxx/src/future.cpp b/libcxx/src/future.cpp --- a/libcxx/src/future.cpp +++ b/libcxx/src/future.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_THREADS diff --git a/libcxx/src/include/atomic_support.h b/libcxx/src/include/atomic_support.h --- a/libcxx/src/include/atomic_support.h +++ b/libcxx/src/include/atomic_support.h @@ -9,7 +9,7 @@ #ifndef ATOMIC_SUPPORT_H #define ATOMIC_SUPPORT_H -#include <__config> +#include <__config_dir/config.h> #include // for __libcpp_relaxed_load #if defined(__clang__) && __has_builtin(__atomic_load_n) \ diff --git a/libcxx/src/include/config_elast.h b/libcxx/src/include/config_elast.h --- a/libcxx/src/include/config_elast.h +++ b/libcxx/src/include/config_elast.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP_CONFIG_ELAST #define _LIBCPP_CONFIG_ELAST -#include <__config> +#include <__config_dir/config.h> #if defined(_LIBCPP_MSVCRT_LIKE) #include diff --git a/libcxx/src/include/refstring.h b/libcxx/src/include/refstring.h --- a/libcxx/src/include/refstring.h +++ b/libcxx/src/include/refstring.h @@ -9,7 +9,7 @@ #ifndef _LIBCPP_REFSTRING_H #define _LIBCPP_REFSTRING_H -#include <__config> +#include <__config_dir/config.h> #include #include #include diff --git a/libcxx/src/include/ryu/common.h b/libcxx/src/include/ryu/common.h --- a/libcxx/src/include/ryu/common.h +++ b/libcxx/src/include/ryu/common.h @@ -43,7 +43,7 @@ // clang-format off #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include _LIBCPP_BEGIN_NAMESPACE_STD diff --git a/libcxx/src/include/ryu/d2fixed.h b/libcxx/src/include/ryu/d2fixed.h --- a/libcxx/src/include/ryu/d2fixed.h +++ b/libcxx/src/include/ryu/d2fixed.h @@ -42,7 +42,7 @@ // Avoid formatting to keep the changes with the original code minimal. // clang-format off -#include <__config> +#include <__config_dir/config.h> #include _LIBCPP_BEGIN_NAMESPACE_STD diff --git a/libcxx/src/include/ryu/d2fixed_full_table.h b/libcxx/src/include/ryu/d2fixed_full_table.h --- a/libcxx/src/include/ryu/d2fixed_full_table.h +++ b/libcxx/src/include/ryu/d2fixed_full_table.h @@ -42,7 +42,7 @@ // Avoid formatting to keep the changes with the original code minimal. // clang-format off -#include <__config> +#include <__config_dir/config.h> _LIBCPP_BEGIN_NAMESPACE_STD diff --git a/libcxx/src/include/ryu/d2s.h b/libcxx/src/include/ryu/d2s.h --- a/libcxx/src/include/ryu/d2s.h +++ b/libcxx/src/include/ryu/d2s.h @@ -42,7 +42,7 @@ // Avoid formatting to keep the changes with the original code minimal. // clang-format off -#include <__config> +#include <__config_dir/config.h> _LIBCPP_BEGIN_NAMESPACE_STD diff --git a/libcxx/src/include/ryu/d2s_full_table.h b/libcxx/src/include/ryu/d2s_full_table.h --- a/libcxx/src/include/ryu/d2s_full_table.h +++ b/libcxx/src/include/ryu/d2s_full_table.h @@ -42,7 +42,7 @@ // Avoid formatting to keep the changes with the original code minimal. // clang-format off -#include <__config> +#include <__config_dir/config.h> _LIBCPP_BEGIN_NAMESPACE_STD diff --git a/libcxx/src/include/ryu/d2s_intrinsics.h b/libcxx/src/include/ryu/d2s_intrinsics.h --- a/libcxx/src/include/ryu/d2s_intrinsics.h +++ b/libcxx/src/include/ryu/d2s_intrinsics.h @@ -43,7 +43,7 @@ // clang-format off #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include "include/ryu/ryu.h" diff --git a/libcxx/src/include/ryu/digit_table.h b/libcxx/src/include/ryu/digit_table.h --- a/libcxx/src/include/ryu/digit_table.h +++ b/libcxx/src/include/ryu/digit_table.h @@ -40,7 +40,7 @@ #define _LIBCPP_SRC_INCLUDE_RYU_DIGIT_TABLE_H #include <__charconv/tables.h> -#include <__config> +#include <__config_dir/config.h> _LIBCPP_BEGIN_NAMESPACE_STD diff --git a/libcxx/src/include/ryu/f2s.h b/libcxx/src/include/ryu/f2s.h --- a/libcxx/src/include/ryu/f2s.h +++ b/libcxx/src/include/ryu/f2s.h @@ -42,7 +42,7 @@ // Avoid formatting to keep the changes with the original code minimal. // clang-format off -#include <__config> +#include <__config_dir/config.h> _LIBCPP_BEGIN_NAMESPACE_STD diff --git a/libcxx/src/include/ryu/ryu.h b/libcxx/src/include/ryu/ryu.h --- a/libcxx/src/include/ryu/ryu.h +++ b/libcxx/src/include/ryu/ryu.h @@ -46,8 +46,8 @@ #include <__charconv/chars_format.h> #include <__charconv/to_chars_result.h> -#include <__config> -#include <__debug> +#include <__config_dir/config.h> +#include <__config_dir/debug.h> #include <__system_error/errc.h> #include #include diff --git a/libcxx/src/include/sso_allocator.h b/libcxx/src/include/sso_allocator.h --- a/libcxx/src/include/sso_allocator.h +++ b/libcxx/src/include/sso_allocator.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP_SSO_ALLOCATOR_H #define _LIBCPP_SSO_ALLOCATOR_H -#include <__config> +#include <__config_dir/config.h> #include #include #include diff --git a/libcxx/src/include/to_chars_floating_point.h b/libcxx/src/include/to_chars_floating_point.h --- a/libcxx/src/include/to_chars_floating_point.h +++ b/libcxx/src/include/to_chars_floating_point.h @@ -22,7 +22,7 @@ #include <__algorithm/lower_bound.h> #include <__algorithm/min.h> #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include <__functional/operations.h> #include <__iterator/access.h> #include <__iterator/size.h> diff --git a/libcxx/src/ios.cpp b/libcxx/src/ios.cpp --- a/libcxx/src/ios.cpp +++ b/libcxx/src/ios.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__config> +#include <__config_dir/config.h> #include <__locale> #include #include diff --git a/libcxx/src/ios.instantiations.cpp b/libcxx/src/ios.instantiations.cpp --- a/libcxx/src/ios.instantiations.cpp +++ b/libcxx/src/ios.instantiations.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__config> +#include <__config_dir/config.h> #include #include #include diff --git a/libcxx/src/legacy_debug_handler.cpp b/libcxx/src/legacy_debug_handler.cpp --- a/libcxx/src/legacy_debug_handler.cpp +++ b/libcxx/src/legacy_debug_handler.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__config> +#include <__config_dir/config.h> #include #include #include diff --git a/libcxx/src/legacy_pointer_safety.cpp b/libcxx/src/legacy_pointer_safety.cpp --- a/libcxx/src/legacy_pointer_safety.cpp +++ b/libcxx/src/legacy_pointer_safety.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__config> +#include <__config_dir/config.h> #include // Support for garbage collection was removed in C++23 by https://wg21.link/P2186R2. Libc++ implements diff --git a/libcxx/src/memory.cpp b/libcxx/src/memory.cpp --- a/libcxx/src/memory.cpp +++ b/libcxx/src/memory.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__config> +#include <__config_dir/config.h> #ifdef _LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS # define _LIBCPP_SHARED_PTR_DEFINE_LEGACY_INLINE_FUNCTIONS #endif diff --git a/libcxx/src/mutex_destructor.cpp b/libcxx/src/mutex_destructor.cpp --- a/libcxx/src/mutex_destructor.cpp +++ b/libcxx/src/mutex_destructor.cpp @@ -16,7 +16,7 @@ // we re-declare the entire class in this file instead of using // _LIBCPP_BUILDING_LIBRARY to change the definition in the headers. -#include <__config> +#include <__config_dir/config.h> #include <__threading_support> #if !defined(_LIBCPP_HAS_NO_THREADS) diff --git a/libcxx/src/optional.cpp b/libcxx/src/optional.cpp --- a/libcxx/src/optional.cpp +++ b/libcxx/src/optional.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__availability> +#include <__config_dir/availability.h> #include namespace std diff --git a/libcxx/src/random.cpp b/libcxx/src/random.cpp --- a/libcxx/src/random.cpp +++ b/libcxx/src/random.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__config> +#include <__config_dir/config.h> #if defined(_LIBCPP_USING_WIN32_RANDOM) // Must be defined before including stdlib.h to enable rand_s(). diff --git a/libcxx/src/ryu/d2fixed.cpp b/libcxx/src/ryu/d2fixed.cpp --- a/libcxx/src/ryu/d2fixed.cpp +++ b/libcxx/src/ryu/d2fixed.cpp @@ -40,7 +40,7 @@ // clang-format off #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/src/ryu/d2s.cpp b/libcxx/src/ryu/d2s.cpp --- a/libcxx/src/ryu/d2s.cpp +++ b/libcxx/src/ryu/d2s.cpp @@ -40,7 +40,7 @@ // clang-format off #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include #include "include/ryu/common.h" diff --git a/libcxx/src/ryu/f2s.cpp b/libcxx/src/ryu/f2s.cpp --- a/libcxx/src/ryu/f2s.cpp +++ b/libcxx/src/ryu/f2s.cpp @@ -40,7 +40,7 @@ // clang-format off #include <__assert> -#include <__config> +#include <__config_dir/config.h> #include #include "include/ryu/common.h" diff --git a/libcxx/src/shared_mutex.cpp b/libcxx/src/shared_mutex.cpp --- a/libcxx/src/shared_mutex.cpp +++ b/libcxx/src/shared_mutex.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_THREADS diff --git a/libcxx/src/std_stream.h b/libcxx/src/std_stream.h --- a/libcxx/src/std_stream.h +++ b/libcxx/src/std_stream.h @@ -10,7 +10,7 @@ #ifndef _LIBCPP_STD_STREAM_H #define _LIBCPP_STD_STREAM_H -#include <__config> +#include <__config_dir/config.h> #include <__locale> #include #include diff --git a/libcxx/src/system_error.cpp b/libcxx/src/system_error.cpp --- a/libcxx/src/system_error.cpp +++ b/libcxx/src/system_error.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__config> +#include <__config_dir/config.h> #ifdef _LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS # define _LIBCPP_ERROR_CATEGORY_DEFINE_LEGACY_INLINE_FUNCTIONS #endif diff --git a/libcxx/src/thread.cpp b/libcxx/src/thread.cpp --- a/libcxx/src/thread.cpp +++ b/libcxx/src/thread.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__config> +#include <__config_dir/config.h> #ifndef _LIBCPP_HAS_NO_THREADS diff --git a/libcxx/src/verbose_abort.cpp b/libcxx/src/verbose_abort.cpp --- a/libcxx/src/verbose_abort.cpp +++ b/libcxx/src/verbose_abort.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include <__config> +#include <__config_dir/config.h> #include <__verbose_abort> #include #include diff --git a/libcxx/test/libcxx/algorithms/pstl.robust_against_customization_points_not_working.pass.cpp b/libcxx/test/libcxx/algorithms/pstl.robust_against_customization_points_not_working.pass.cpp --- a/libcxx/test/libcxx/algorithms/pstl.robust_against_customization_points_not_working.pass.cpp +++ b/libcxx/test/libcxx/algorithms/pstl.robust_against_customization_points_not_working.pass.cpp @@ -14,7 +14,7 @@ // Make sure that the customization points get called properly when overloaded -#include <__config> +#include <__config_dir/config.h> #include <__iterator/iterator_traits.h> #include <__iterator/readable_traits.h> #include diff --git a/libcxx/test/libcxx/assertions/headers_declare_verbose_abort.gen.py b/libcxx/test/libcxx/assertions/headers_declare_verbose_abort.gen.py --- a/libcxx/test/libcxx/assertions/headers_declare_verbose_abort.gen.py +++ b/libcxx/test/libcxx/assertions/headers_declare_verbose_abort.gen.py @@ -27,7 +27,7 @@ print(f"""\ //--- {header}.compile.pass.cpp // {XFAIL}: availability-verbose_abort-missing -#include <__config> +#include <__config_dir/config.h> {test_condition_begin} #include <{header}> using HandlerType = decltype(std::__libcpp_verbose_abort); diff --git a/libcxx/test/libcxx/depr/depr.c.headers/extern_c.pass.cpp b/libcxx/test/libcxx/depr/depr.c.headers/extern_c.pass.cpp --- a/libcxx/test/libcxx/depr/depr.c.headers/extern_c.pass.cpp +++ b/libcxx/test/libcxx/depr/depr.c.headers/extern_c.pass.cpp @@ -14,7 +14,7 @@ // is ill-formed (no diagnostic required), per [using.headers]p3, but we permit // it as an extension. -#include <__config> +#include <__config_dir/config.h> extern "C" { #include diff --git a/libcxx/test/libcxx/depr/enable_removed_cpp17_features.compile.pass.cpp b/libcxx/test/libcxx/depr/enable_removed_cpp17_features.compile.pass.cpp --- a/libcxx/test/libcxx/depr/enable_removed_cpp17_features.compile.pass.cpp +++ b/libcxx/test/libcxx/depr/enable_removed_cpp17_features.compile.pass.cpp @@ -11,7 +11,7 @@ // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES -#include <__config> +#include <__config_dir/config.h> #include "test_macros.h" diff --git a/libcxx/test/libcxx/diagnostics/nodiscard.pass.cpp b/libcxx/test/libcxx/diagnostics/nodiscard.pass.cpp --- a/libcxx/test/libcxx/diagnostics/nodiscard.pass.cpp +++ b/libcxx/test/libcxx/diagnostics/nodiscard.pass.cpp @@ -11,7 +11,7 @@ // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_NODISCARD_EXT -#include <__config> +#include <__config_dir/config.h> _LIBCPP_NODISCARD_EXT int foo() { return 42; } diff --git a/libcxx/test/libcxx/diagnostics/nodiscard_aftercxx17.verify.cpp b/libcxx/test/libcxx/diagnostics/nodiscard_aftercxx17.verify.cpp --- a/libcxx/test/libcxx/diagnostics/nodiscard_aftercxx17.verify.cpp +++ b/libcxx/test/libcxx/diagnostics/nodiscard_aftercxx17.verify.cpp @@ -12,7 +12,7 @@ // UNSUPPORTED: c++03 // UNSUPPORTED: (c++11 || c++14 || c++17) && !stdlib=libc++ -#include <__config> +#include <__config_dir/config.h> _LIBCPP_NODISCARD_AFTER_CXX17 int foo() { return 6; } diff --git a/libcxx/test/libcxx/include_as_c.sh.cpp b/libcxx/test/libcxx/include_as_c.sh.cpp --- a/libcxx/test/libcxx/include_as_c.sh.cpp +++ b/libcxx/test/libcxx/include_as_c.sh.cpp @@ -20,7 +20,7 @@ // RUN: %{cxx} -c -xc %s -fsyntax-only %{flags} %{compile_flags} -std=c99 -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/test/libcxx/libcpp_freestanding.sh.cpp b/libcxx/test/libcxx/libcpp_freestanding.sh.cpp --- a/libcxx/test/libcxx/libcpp_freestanding.sh.cpp +++ b/libcxx/test/libcxx/libcpp_freestanding.sh.cpp @@ -12,7 +12,7 @@ // RUN: %{cxx} %{flags} %{compile_flags} -fsyntax-only %s // RUN: %{cxx} %{flags} %{compile_flags} -fsyntax-only -ffreestanding -DFREESTANDING %s -#include <__config> +#include <__config_dir/config.h> #if defined(FREESTANDING) != defined(_LIBCPP_FREESTANDING) #error _LIBCPP_FREESTANDING should be defined in freestanding mode and not \ diff --git a/libcxx/test/libcxx/modules_include.sh.cpp b/libcxx/test/libcxx/modules_include.sh.cpp --- a/libcxx/test/libcxx/modules_include.sh.cpp +++ b/libcxx/test/libcxx/modules_include.sh.cpp @@ -20,7 +20,7 @@ // The Android headers don't appear to be compatible with modules yet // XFAIL: LIBCXX-ANDROID-FIXME -#include <__config> +#include <__config_dir/config.h> /* BEGIN-SCRIPT diff --git a/libcxx/test/libcxx/private_headers.verify.cpp b/libcxx/test/libcxx/private_headers.verify.cpp --- a/libcxx/test/libcxx/private_headers.verify.cpp +++ b/libcxx/test/libcxx/private_headers.verify.cpp @@ -264,7 +264,6 @@ #include <__atomic/is_always_lock_free.h> // expected-error@*:* {{use of private header from outside its module: '__atomic/is_always_lock_free.h'}} #include <__atomic/kill_dependency.h> // expected-error@*:* {{use of private header from outside its module: '__atomic/kill_dependency.h'}} #include <__atomic/memory_order.h> // expected-error@*:* {{use of private header from outside its module: '__atomic/memory_order.h'}} -#include <__availability> // expected-error@*:* {{use of private header from outside its module: '__availability'}} #include <__bit/bit_cast.h> // expected-error@*:* {{use of private header from outside its module: '__bit/bit_cast.h'}} #include <__bit/bit_ceil.h> // expected-error@*:* {{use of private header from outside its module: '__bit/bit_ceil.h'}} #include <__bit/bit_floor.h> // expected-error@*:* {{use of private header from outside its module: '__bit/bit_floor.h'}} @@ -350,6 +349,9 @@ #include <__concepts/swappable.h> // expected-error@*:* {{use of private header from outside its module: '__concepts/swappable.h'}} #include <__concepts/totally_ordered.h> // expected-error@*:* {{use of private header from outside its module: '__concepts/totally_ordered.h'}} #include <__condition_variable/condition_variable.h> // expected-error@*:* {{use of private header from outside its module: '__condition_variable/condition_variable.h'}} +#include <__config_dir/availability.h> // expected-error@*:* {{use of private header from outside its module: '__config_dir/availability.h'}} +#include <__config_dir/config.h> // expected-error@*:* {{use of private header from outside its module: '__config_dir/config.h'}} +#include <__config_dir/debug.h> // expected-error@*:* {{use of private header from outside its module: '__config_dir/debug.h'}} #include <__coroutine/coroutine_handle.h> // expected-error@*:* {{use of private header from outside its module: '__coroutine/coroutine_handle.h'}} #include <__coroutine/coroutine_traits.h> // expected-error@*:* {{use of private header from outside its module: '__coroutine/coroutine_traits.h'}} #include <__coroutine/noop_coroutine_handle.h> // expected-error@*:* {{use of private header from outside its module: '__coroutine/noop_coroutine_handle.h'}} diff --git a/libcxx/test/libcxx/selftest/test_macros.pass.cpp b/libcxx/test/libcxx/selftest/test_macros.pass.cpp --- a/libcxx/test/libcxx/selftest/test_macros.pass.cpp +++ b/libcxx/test/libcxx/selftest/test_macros.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // // Test the "test_macros.h" header. -#include <__config> +#include <__config_dir/config.h> #include "test_macros.h" #ifndef TEST_STD_VER diff --git a/libcxx/test/support/container_debug_tests.h b/libcxx/test/support/container_debug_tests.h --- a/libcxx/test/support/container_debug_tests.h +++ b/libcxx/test/support/container_debug_tests.h @@ -18,7 +18,7 @@ #error The library must be built with the debug mode enabled in order to use this header #endif -#include <__debug> +#include <__config_dir/debug.h> #include #include #include diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h --- a/libcxx/test/support/test_macros.h +++ b/libcxx/test/support/test_macros.h @@ -11,11 +11,11 @@ #define SUPPORT_TEST_MACROS_HPP // Attempt to get STL specific macros like _LIBCPP_VERSION using the most -// minimal header possible. If we're testing libc++, we should use `<__config>`. -// If <__config> isn't available, fall back to . +// minimal header possible. If we're testing libc++, we should use `<__config_dir/config.h>`. +// If <__config_dir/config.h> isn't available, fall back to . #ifdef __has_include -# if __has_include("<__config>") -# include <__config> +# if __has_include("<__config_dir/config.h>") +# include <__config_dir/config.h> # define TEST_IMP_INCLUDED_HEADER # endif #endif diff --git a/libcxx/utils/generate_escaped_output_table.py b/libcxx/utils/generate_escaped_output_table.py --- a/libcxx/utils/generate_escaped_output_table.py +++ b/libcxx/utils/generate_escaped_output_table.py @@ -218,7 +218,7 @@ #define _LIBCPP___FORMAT_ESCAPED_OUTPUT_TABLE_H #include <__algorithm/ranges_upper_bound.h> -#include <__config> +#include <__config_dir/config.h> #include #include diff --git a/libcxx/utils/generate_extended_grapheme_cluster_table.py b/libcxx/utils/generate_extended_grapheme_cluster_table.py --- a/libcxx/utils/generate_extended_grapheme_cluster_table.py +++ b/libcxx/utils/generate_extended_grapheme_cluster_table.py @@ -211,7 +211,7 @@ #define _LIBCPP___FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H #include <__algorithm/ranges_upper_bound.h> -#include <__config> +#include <__config_dir/config.h> #include <__iterator/access.h> #include #include diff --git a/libcxx/utils/generate_feature_test_macro_components.py b/libcxx/utils/generate_feature_test_macro_components.py --- a/libcxx/utils/generate_feature_test_macro_components.py +++ b/libcxx/utils/generate_feature_test_macro_components.py @@ -55,10 +55,10 @@ # test_suite_guard An optional string field. When this field is provided, # `libcxx_guard` must also be provided. This field is used # only to generate the unit tests for the feature-test macros. -# It can't depend on macros defined in <__config> because the -# `test/std/` parts of the test suite are intended to be -# portable to any C++ standard library implementation, not -# just libc++. It may depend on +# It can't depend on macros defined in <__config_dir/config.h> +# because the `test/std/` parts of the test suite are intended +# to be portable to any C++ standard library implementation, +# not just libc++. It may depend on # * macros defined by the compiler itself, or # * macros generated by CMake. # In some cases we add also depend on macros defined in <__availability>. @@ -66,7 +66,7 @@ # `test_suite_guard` must also be provided. This field is used # only to guard the feature-test macro in . It may # be the same as `test_suite_guard`, or it may depend on -# macros defined in <__config>. +# macros defined in <__config_dir/config.h>. # unimplemented An optional Boolean field with the value `True`. This field # is only used when a feature isn't fully implemented. Once # you've fully implemented the feature, you should remove @@ -1235,7 +1235,7 @@ */ #include <__assert> // all public C++ headers provide the assertion handler -#include <__config> +#include <__config_dir/config.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header diff --git a/libcxx/utils/generate_width_estimation_table.py b/libcxx/utils/generate_width_estimation_table.py --- a/libcxx/utils/generate_width_estimation_table.py +++ b/libcxx/utils/generate_width_estimation_table.py @@ -245,7 +245,7 @@ #define _LIBCPP___FORMAT_WIDTH_ESTIMATION_TABLE_H #include <__algorithm/ranges_upper_bound.h> -#include <__config> +#include <__config_dir/config.h> #include #include