diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -1911,6 +1911,8 @@ # include <__pstl_algorithm> #endif +#endif // _LIBCPP_ALGORITHM + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17 # include #endif @@ -1922,5 +1924,3 @@ # include # include #endif - -#endif // _LIBCPP_ALGORITHM diff --git a/libcxx/include/any b/libcxx/include/any --- a/libcxx/include/any +++ b/libcxx/include/any @@ -694,6 +694,8 @@ _LIBCPP_END_NAMESPACE_STD +#endif // _LIBCPP_ANY + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17 # include #endif @@ -703,5 +705,3 @@ # include # include #endif - -#endif // _LIBCPP_ANY diff --git a/libcxx/include/array b/libcxx/include/array --- a/libcxx/include/array +++ b/libcxx/include/array @@ -532,10 +532,10 @@ _LIBCPP_END_NAMESPACE_STD +#endif // _LIBCPP_ARRAY + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include # include #endif - -#endif // _LIBCPP_ARRAY diff --git a/libcxx/include/atomic b/libcxx/include/atomic --- a/libcxx/include/atomic +++ b/libcxx/include/atomic @@ -2655,6 +2655,8 @@ _LIBCPP_END_NAMESPACE_STD +#endif // _LIBCPP_ATOMIC + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17 # include #endif @@ -2663,5 +2665,3 @@ # include # include #endif - -#endif // _LIBCPP_ATOMIC diff --git a/libcxx/include/barrier b/libcxx/include/barrier --- a/libcxx/include/barrier +++ b/libcxx/include/barrier @@ -54,14 +54,6 @@ #include #include -#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 -# include -# include -# include -# include -# include -#endif - #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header #endif @@ -337,3 +329,11 @@ _LIBCPP_POP_MACROS #endif //_LIBCPP_BARRIER + +#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 +# include +# include +# include +# include +# include +#endif diff --git a/libcxx/include/bit b/libcxx/include/bit --- a/libcxx/include/bit +++ b/libcxx/include/bit @@ -248,8 +248,8 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_BIT + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include #endif - -#endif // _LIBCPP_BIT diff --git a/libcxx/include/charconv b/libcxx/include/charconv --- a/libcxx/include/charconv +++ b/libcxx/include/charconv @@ -814,8 +814,8 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_CHARCONV + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include #endif - -#endif // _LIBCPP_CHARCONV diff --git a/libcxx/include/coroutine b/libcxx/include/coroutine --- a/libcxx/include/coroutine +++ b/libcxx/include/coroutine @@ -55,8 +55,8 @@ # pragma GCC system_header #endif +#endif // _LIBCPP_COROUTINE + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include #endif - -#endif // _LIBCPP_COROUTINE diff --git a/libcxx/include/deque b/libcxx/include/deque --- a/libcxx/include/deque +++ b/libcxx/include/deque @@ -2930,10 +2930,10 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_DEQUE + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include # include #endif - -#endif // _LIBCPP_DEQUE diff --git a/libcxx/include/experimental/memory_resource b/libcxx/include/experimental/memory_resource --- a/libcxx/include/experimental/memory_resource +++ b/libcxx/include/experimental/memory_resource @@ -77,18 +77,6 @@ #include #include -#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 -# include -# include -# include -# include -# include -# include -# include -# include -# include -#endif - #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header #endif @@ -433,3 +421,15 @@ _LIBCPP_POP_MACROS #endif /* _LIBCPP_EXPERIMENTAL_MEMORY_RESOURCE */ + +#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 +# include +# include +# include +# include +# include +# include +# include +# include +# include +#endif diff --git a/libcxx/include/experimental/simd b/libcxx/include/experimental/simd --- a/libcxx/include/experimental/simd +++ b/libcxx/include/experimental/simd @@ -1576,9 +1576,9 @@ _LIBCPP_POP_MACROS +#endif /* _LIBCPP_EXPERIMENTAL_SIMD */ + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include #endif - -#endif /* _LIBCPP_EXPERIMENTAL_SIMD */ diff --git a/libcxx/include/experimental/unordered_map b/libcxx/include/experimental/unordered_map --- a/libcxx/include/experimental/unordered_map +++ b/libcxx/include/experimental/unordered_map @@ -67,6 +67,8 @@ _LIBCPP_END_NAMESPACE_LFTS_PMR +#endif /* _LIBCPP_EXPERIMENTAL_UNORDERED_MAP */ + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include @@ -74,5 +76,3 @@ # include # include #endif - -#endif /* _LIBCPP_EXPERIMENTAL_UNORDERED_MAP */ 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 @@ -983,8 +983,8 @@ } // namespace __gnu_cxx +#endif // _LIBCPP_HASH_MAP + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include #endif - -#endif // _LIBCPP_HASH_MAP 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 @@ -662,8 +662,8 @@ } // namespace __gnu_cxx +#endif // _LIBCPP_HASH_SET + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include #endif - -#endif // _LIBCPP_HASH_SET diff --git a/libcxx/include/forward_list b/libcxx/include/forward_list --- a/libcxx/include/forward_list +++ b/libcxx/include/forward_list @@ -1778,10 +1778,10 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_FORWARD_LIST + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include # include #endif - -#endif // _LIBCPP_FORWARD_LIST diff --git a/libcxx/include/functional b/libcxx/include/functional --- a/libcxx/include/functional +++ b/libcxx/include/functional @@ -542,9 +542,9 @@ # pragma GCC system_header #endif +#endif // _LIBCPP_FUNCTIONAL + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include #endif - -#endif // _LIBCPP_FUNCTIONAL diff --git a/libcxx/include/future b/libcxx/include/future --- a/libcxx/include/future +++ b/libcxx/include/future @@ -2432,8 +2432,8 @@ _LIBCPP_END_NAMESPACE_STD +#endif // _LIBCPP_FUTURE + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17 # include #endif - -#endif // _LIBCPP_FUTURE diff --git a/libcxx/include/iterator b/libcxx/include/iterator --- a/libcxx/include/iterator +++ b/libcxx/include/iterator @@ -732,11 +732,11 @@ # pragma GCC system_header #endif +#endif // _LIBCPP_ITERATOR + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include # include # include #endif - -#endif // _LIBCPP_ITERATOR diff --git a/libcxx/include/list b/libcxx/include/list --- a/libcxx/include/list +++ b/libcxx/include/list @@ -2359,10 +2359,10 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_LIST + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include # include #endif - -#endif // _LIBCPP_LIST diff --git a/libcxx/include/locale b/libcxx/include/locale --- a/libcxx/include/locale +++ b/libcxx/include/locale @@ -4352,9 +4352,9 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_LOCALE + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include #endif - -#endif // _LIBCPP_LOCALE diff --git a/libcxx/include/map b/libcxx/include/map --- a/libcxx/include/map +++ b/libcxx/include/map @@ -2332,10 +2332,10 @@ _LIBCPP_END_NAMESPACE_STD +#endif // _LIBCPP_MAP + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include # include #endif - -#endif // _LIBCPP_MAP diff --git a/libcxx/include/memory b/libcxx/include/memory --- a/libcxx/include/memory +++ b/libcxx/include/memory @@ -898,6 +898,8 @@ # include <__pstl_memory> #endif +#endif // _LIBCPP_MEMORY + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include @@ -911,5 +913,3 @@ # include # include #endif - -#endif // _LIBCPP_MEMORY diff --git a/libcxx/include/mutex b/libcxx/include/mutex --- a/libcxx/include/mutex +++ b/libcxx/include/mutex @@ -703,8 +703,8 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_MUTEX + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include #endif - -#endif // _LIBCPP_MUTEX diff --git a/libcxx/include/numeric b/libcxx/include/numeric --- a/libcxx/include/numeric +++ b/libcxx/include/numeric @@ -171,9 +171,9 @@ # include <__pstl_numeric> #endif +#endif // _LIBCPP_NUMERIC + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include #endif - -#endif // _LIBCPP_NUMERIC diff --git a/libcxx/include/optional b/libcxx/include/optional --- a/libcxx/include/optional +++ b/libcxx/include/optional @@ -1574,6 +1574,8 @@ #endif // _LIBCPP_STD_VER > 14 +#endif // _LIBCPP_OPTIONAL + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17 # include #endif @@ -1591,5 +1593,3 @@ # include # include #endif - -#endif // _LIBCPP_OPTIONAL diff --git a/libcxx/include/ostream b/libcxx/include/ostream --- a/libcxx/include/ostream +++ b/libcxx/include/ostream @@ -1187,8 +1187,8 @@ _LIBCPP_END_NAMESPACE_STD +#endif // _LIBCPP_OSTREAM + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include #endif - -#endif // _LIBCPP_OSTREAM diff --git a/libcxx/include/queue b/libcxx/include/queue --- a/libcxx/include/queue +++ b/libcxx/include/queue @@ -958,8 +958,8 @@ _LIBCPP_END_NAMESPACE_STD +#endif // _LIBCPP_QUEUE + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include #endif - -#endif // _LIBCPP_QUEUE diff --git a/libcxx/include/random b/libcxx/include/random --- a/libcxx/include/random +++ b/libcxx/include/random @@ -1727,6 +1727,8 @@ # pragma GCC system_header #endif +#endif // _LIBCPP_RANDOM + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include @@ -1739,5 +1741,3 @@ # include # include #endif - -#endif // _LIBCPP_RANDOM diff --git a/libcxx/include/regex b/libcxx/include/regex --- a/libcxx/include/regex +++ b/libcxx/include/regex @@ -6839,9 +6839,9 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_REGEX + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include #endif - -#endif // _LIBCPP_REGEX diff --git a/libcxx/include/scoped_allocator b/libcxx/include/scoped_allocator --- a/libcxx/include/scoped_allocator +++ b/libcxx/include/scoped_allocator @@ -124,19 +124,6 @@ #include #include -#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -#endif - #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header #endif @@ -715,3 +702,16 @@ _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP_SCOPED_ALLOCATOR + +#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +#endif diff --git a/libcxx/include/set b/libcxx/include/set --- a/libcxx/include/set +++ b/libcxx/include/set @@ -1575,9 +1575,9 @@ _LIBCPP_END_NAMESPACE_STD +#endif // _LIBCPP_SET + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include #endif - -#endif // _LIBCPP_SET diff --git a/libcxx/include/span b/libcxx/include/span --- a/libcxx/include/span +++ b/libcxx/include/span @@ -589,9 +589,9 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_SPAN + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include #endif - -#endif // _LIBCPP_SPAN diff --git a/libcxx/include/stack b/libcxx/include/stack --- a/libcxx/include/stack +++ b/libcxx/include/stack @@ -361,8 +361,8 @@ _LIBCPP_END_NAMESPACE_STD +#endif // _LIBCPP_STACK + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include #endif - -#endif // _LIBCPP_STACK diff --git a/libcxx/include/string b/libcxx/include/string --- a/libcxx/include/string +++ b/libcxx/include/string @@ -4671,6 +4671,8 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_STRING + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include @@ -4680,5 +4682,3 @@ # include # include #endif - -#endif // _LIBCPP_STRING diff --git a/libcxx/include/string_view b/libcxx/include/string_view --- a/libcxx/include/string_view +++ b/libcxx/include/string_view @@ -1029,10 +1029,10 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_STRING_VIEW + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include # include #endif - -#endif // _LIBCPP_STRING_VIEW diff --git a/libcxx/include/thread b/libcxx/include/thread --- a/libcxx/include/thread +++ b/libcxx/include/thread @@ -410,6 +410,8 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_THREAD + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17 # include #endif @@ -417,5 +419,3 @@ #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include #endif - -#endif // _LIBCPP_THREAD diff --git a/libcxx/include/tuple b/libcxx/include/tuple --- a/libcxx/include/tuple +++ b/libcxx/include/tuple @@ -1818,6 +1818,8 @@ _LIBCPP_END_NAMESPACE_STD +#endif // _LIBCPP_TUPLE + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include @@ -1825,5 +1827,3 @@ # include # include #endif - -#endif // _LIBCPP_TUPLE diff --git a/libcxx/include/typeindex b/libcxx/include/typeindex --- a/libcxx/include/typeindex +++ b/libcxx/include/typeindex @@ -117,10 +117,10 @@ _LIBCPP_END_NAMESPACE_STD +#endif // _LIBCPP_TYPEINDEX + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include # include #endif - -#endif // _LIBCPP_TYPEINDEX diff --git a/libcxx/include/unordered_map b/libcxx/include/unordered_map --- a/libcxx/include/unordered_map +++ b/libcxx/include/unordered_map @@ -2621,10 +2621,10 @@ _LIBCPP_END_NAMESPACE_STD +#endif // _LIBCPP_UNORDERED_MAP + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include # include #endif - -#endif // _LIBCPP_UNORDERED_MAP diff --git a/libcxx/include/unordered_set b/libcxx/include/unordered_set --- a/libcxx/include/unordered_set +++ b/libcxx/include/unordered_set @@ -1798,9 +1798,9 @@ _LIBCPP_END_NAMESPACE_STD +#endif // _LIBCPP_UNORDERED_SET + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include #endif - -#endif // _LIBCPP_UNORDERED_SET diff --git a/libcxx/include/utility b/libcxx/include/utility --- a/libcxx/include/utility +++ b/libcxx/include/utility @@ -274,8 +274,8 @@ # pragma GCC system_header #endif +#endif // _LIBCPP_UTILITY + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include #endif - -#endif // _LIBCPP_UTILITY diff --git a/libcxx/include/valarray b/libcxx/include/valarray --- a/libcxx/include/valarray +++ b/libcxx/include/valarray @@ -4929,9 +4929,9 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_VALARRAY + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include #endif - -#endif // _LIBCPP_VALARRAY diff --git a/libcxx/include/variant b/libcxx/include/variant --- a/libcxx/include/variant +++ b/libcxx/include/variant @@ -1814,9 +1814,9 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_VARIANT + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include #endif - -#endif // _LIBCPP_VARIANT diff --git a/libcxx/include/vector b/libcxx/include/vector --- a/libcxx/include/vector +++ b/libcxx/include/vector @@ -3265,10 +3265,10 @@ _LIBCPP_POP_MACROS +#endif // _LIBCPP_VECTOR + #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include # include # include #endif - -#endif // _LIBCPP_VECTOR