diff --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes.rst index cfed0b0949f29..c838c2a54a807 100644 --- a/libcxx/docs/ReleaseNotes.rst +++ b/libcxx/docs/ReleaseNotes.rst @@ -95,10 +95,6 @@ Deprecations and Removals - ```` no longer includes ```` in any C++ version (it was previously included in C++17 and earlier). -- ```` no longer includes ```` in any C++ version (it was previously included in C++20 and earlier). - -- ```` no longer includes ```` or ```` in any C++ version (they were previously included in C++20 and earlier). - - ```` no longer includes ```` in any C++ version (it was previously included in C++20 and earlier). - ````, ````, and ```` no longer include ```` diff --git a/libcxx/include/limits b/libcxx/include/limits index cf6a23fe923f9..9f5949e63cff0 100644 --- a/libcxx/include/limits +++ b/libcxx/include/limits @@ -823,4 +823,8 @@ _LIBCPP_END_NAMESPACE_STD _LIBCPP_POP_MACROS +#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 +# include +#endif + #endif // _LIBCPP_LIMITS diff --git a/libcxx/include/new b/libcxx/include/new index a8eff3508b3c9..3064a0e2f0808 100644 --- a/libcxx/include/new +++ b/libcxx/include/new @@ -365,4 +365,9 @@ inline constexpr size_t hardware_constructive_interference_size = __GCC_CONSTRUC _LIBCPP_END_NAMESPACE_STD +#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 +# include +# include +#endif + #endif // _LIBCPP_NEW diff --git a/libcxx/test/libcxx/transitive_includes/cxx03.csv b/libcxx/test/libcxx/transitive_includes/cxx03.csv index 4183dd9f9361e..75df8fdf86462 100644 --- a/libcxx/test/libcxx/transitive_includes/cxx03.csv +++ b/libcxx/test/libcxx/transitive_includes/cxx03.csv @@ -458,6 +458,7 @@ latch limits latch ratio latch type_traits latch version +limits type_traits limits version list algorithm list atomic @@ -573,6 +574,8 @@ mutex typeinfo mutex version new cstddef new cstdlib +new exception +new type_traits new version numbers concepts numbers type_traits @@ -639,7 +642,6 @@ ostream version queue compare queue concepts queue cstddef -queue cstdint queue cstdlib queue deque queue functional @@ -776,7 +778,6 @@ sstream version stack compare stack concepts stack cstddef -stack cstdint stack deque stack functional stack initializer_list @@ -939,7 +940,6 @@ valarray algorithm valarray cmath valarray concepts valarray cstddef -valarray cstdint valarray cstdlib valarray cstring valarray functional diff --git a/libcxx/test/libcxx/transitive_includes/cxx11.csv b/libcxx/test/libcxx/transitive_includes/cxx11.csv index ded67478b7114..4bd5b1bde1fef 100644 --- a/libcxx/test/libcxx/transitive_includes/cxx11.csv +++ b/libcxx/test/libcxx/transitive_includes/cxx11.csv @@ -458,6 +458,7 @@ latch limits latch ratio latch type_traits latch version +limits type_traits limits version list algorithm list atomic @@ -574,6 +575,8 @@ mutex typeinfo mutex version new cstddef new cstdlib +new exception +new type_traits new version numbers concepts numbers type_traits @@ -640,7 +643,6 @@ ostream version queue compare queue concepts queue cstddef -queue cstdint queue cstdlib queue deque queue functional @@ -777,7 +779,6 @@ sstream version stack compare stack concepts stack cstddef -stack cstdint stack deque stack functional stack initializer_list @@ -940,7 +941,6 @@ valarray algorithm valarray cmath valarray concepts valarray cstddef -valarray cstdint valarray cstdlib valarray cstring valarray functional diff --git a/libcxx/test/libcxx/transitive_includes/cxx14.csv b/libcxx/test/libcxx/transitive_includes/cxx14.csv index 4ef59730bbb85..010b208f68efa 100644 --- a/libcxx/test/libcxx/transitive_includes/cxx14.csv +++ b/libcxx/test/libcxx/transitive_includes/cxx14.csv @@ -460,6 +460,7 @@ latch limits latch ratio latch type_traits latch version +limits type_traits limits version list algorithm list atomic @@ -576,6 +577,8 @@ mutex typeinfo mutex version new cstddef new cstdlib +new exception +new type_traits new version numbers concepts numbers type_traits @@ -642,7 +645,6 @@ ostream version queue compare queue concepts queue cstddef -queue cstdint queue cstdlib queue deque queue functional @@ -779,7 +781,6 @@ sstream version stack compare stack concepts stack cstddef -stack cstdint stack deque stack functional stack initializer_list @@ -942,7 +943,6 @@ valarray algorithm valarray cmath valarray concepts valarray cstddef -valarray cstdint valarray cstdlib valarray cstring valarray functional diff --git a/libcxx/test/libcxx/transitive_includes/cxx17.csv b/libcxx/test/libcxx/transitive_includes/cxx17.csv index 4ef59730bbb85..010b208f68efa 100644 --- a/libcxx/test/libcxx/transitive_includes/cxx17.csv +++ b/libcxx/test/libcxx/transitive_includes/cxx17.csv @@ -460,6 +460,7 @@ latch limits latch ratio latch type_traits latch version +limits type_traits limits version list algorithm list atomic @@ -576,6 +577,8 @@ mutex typeinfo mutex version new cstddef new cstdlib +new exception +new type_traits new version numbers concepts numbers type_traits @@ -642,7 +645,6 @@ ostream version queue compare queue concepts queue cstddef -queue cstdint queue cstdlib queue deque queue functional @@ -779,7 +781,6 @@ sstream version stack compare stack concepts stack cstddef -stack cstdint stack deque stack functional stack initializer_list @@ -942,7 +943,6 @@ valarray algorithm valarray cmath valarray concepts valarray cstddef -valarray cstdint valarray cstdlib valarray cstring valarray functional diff --git a/libcxx/test/libcxx/transitive_includes/cxx20.csv b/libcxx/test/libcxx/transitive_includes/cxx20.csv index a081de77c5e91..9ef5cb4548d42 100644 --- a/libcxx/test/libcxx/transitive_includes/cxx20.csv +++ b/libcxx/test/libcxx/transitive_includes/cxx20.csv @@ -466,6 +466,7 @@ latch limits latch ratio latch type_traits latch version +limits type_traits limits version list algorithm list atomic @@ -582,6 +583,8 @@ mutex typeinfo mutex version new cstddef new cstdlib +new exception +new type_traits new version numbers concepts numbers type_traits @@ -648,7 +651,6 @@ ostream version queue compare queue concepts queue cstddef -queue cstdint queue cstdlib queue deque queue functional @@ -785,7 +787,6 @@ sstream version stack compare stack concepts stack cstddef -stack cstdint stack deque stack functional stack initializer_list @@ -947,7 +948,6 @@ valarray algorithm valarray cmath valarray concepts valarray cstddef -valarray cstdint valarray cstdlib valarray cstring valarray functional