From 05fcb731ade04653141c200f07b4d99f2272cc99 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Tue, 8 Apr 2025 12:20:13 -0400 Subject: [PATCH 1/2] [libc++] Fix misplaced _LIBCPP_POP_MACROS As a drive-by, also remove unnecessary includes from flat container tests. Closes #134681 --- libcxx/include/istream | 4 ++-- .../flat.map/flat.map.iterators/reverse_iterator.pass.cpp | 1 - .../flat.multimap.iterators/reverse_iterator.pass.cpp | 1 - .../flat.multiset.iterators/reverse_iterator.pass.cpp | 1 - .../flat.set/flat.set.iterators/reverse_iterator.pass.cpp | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libcxx/include/istream b/libcxx/include/istream index 4b177c41cc325..e28d99fd84e57 100644 --- a/libcxx/include/istream +++ b/libcxx/include/istream @@ -1373,6 +1373,8 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_iostream; _LIBCPP_END_NAMESPACE_STD +_LIBCPP_POP_MACROS + # endif // _LIBCPP_HAS_LOCALIZATION # if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 @@ -1382,8 +1384,6 @@ _LIBCPP_END_NAMESPACE_STD # include # endif -_LIBCPP_POP_MACROS - #endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS) #endif // _LIBCPP_ISTREAM diff --git a/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.iterators/reverse_iterator.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.iterators/reverse_iterator.pass.cpp index fc3949d70745f..7a111e228c115 100644 --- a/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.iterators/reverse_iterator.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.iterators/reverse_iterator.pass.cpp @@ -28,7 +28,6 @@ #include #include "test_macros.h" -#include int main(int, char**) { { diff --git a/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.iterators/reverse_iterator.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.iterators/reverse_iterator.pass.cpp index 8c1e5451f703f..35b2b9f8a9e7e 100644 --- a/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.iterators/reverse_iterator.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.iterators/reverse_iterator.pass.cpp @@ -30,7 +30,6 @@ #include #include "test_macros.h" -#include int main(int, char**) { { diff --git a/libcxx/test/std/containers/container.adaptors/flat.multiset/flat.multiset.iterators/reverse_iterator.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.multiset/flat.multiset.iterators/reverse_iterator.pass.cpp index 9d443ef8784e2..76bd49b4abd9e 100644 --- a/libcxx/test/std/containers/container.adaptors/flat.multiset/flat.multiset.iterators/reverse_iterator.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/flat.multiset/flat.multiset.iterators/reverse_iterator.pass.cpp @@ -28,7 +28,6 @@ #include #include "test_macros.h" -#include void test() { { diff --git a/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.iterators/reverse_iterator.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.iterators/reverse_iterator.pass.cpp index d1e4cef3de19e..a9ef87d483e6f 100644 --- a/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.iterators/reverse_iterator.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.iterators/reverse_iterator.pass.cpp @@ -28,7 +28,6 @@ #include #include "test_macros.h" -#include void test() { { From d18df88824ebc7fdf752291e56b183cdd8ae9b11 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Tue, 8 Apr 2025 13:43:15 -0400 Subject: [PATCH 2/2] Undo changes to flat containers' --- .../flat.map/flat.map.iterators/reverse_iterator.pass.cpp | 1 + .../flat.multimap.iterators/reverse_iterator.pass.cpp | 1 + .../flat.multiset.iterators/reverse_iterator.pass.cpp | 1 + .../flat.set/flat.set.iterators/reverse_iterator.pass.cpp | 1 + 4 files changed, 4 insertions(+) diff --git a/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.iterators/reverse_iterator.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.iterators/reverse_iterator.pass.cpp index 7a111e228c115..fc3949d70745f 100644 --- a/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.iterators/reverse_iterator.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.iterators/reverse_iterator.pass.cpp @@ -28,6 +28,7 @@ #include #include "test_macros.h" +#include int main(int, char**) { { diff --git a/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.iterators/reverse_iterator.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.iterators/reverse_iterator.pass.cpp index 35b2b9f8a9e7e..8c1e5451f703f 100644 --- a/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.iterators/reverse_iterator.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.iterators/reverse_iterator.pass.cpp @@ -30,6 +30,7 @@ #include #include "test_macros.h" +#include int main(int, char**) { { diff --git a/libcxx/test/std/containers/container.adaptors/flat.multiset/flat.multiset.iterators/reverse_iterator.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.multiset/flat.multiset.iterators/reverse_iterator.pass.cpp index 76bd49b4abd9e..9d443ef8784e2 100644 --- a/libcxx/test/std/containers/container.adaptors/flat.multiset/flat.multiset.iterators/reverse_iterator.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/flat.multiset/flat.multiset.iterators/reverse_iterator.pass.cpp @@ -28,6 +28,7 @@ #include #include "test_macros.h" +#include void test() { { diff --git a/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.iterators/reverse_iterator.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.iterators/reverse_iterator.pass.cpp index a9ef87d483e6f..d1e4cef3de19e 100644 --- a/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.iterators/reverse_iterator.pass.cpp +++ b/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.iterators/reverse_iterator.pass.cpp @@ -28,6 +28,7 @@ #include #include "test_macros.h" +#include void test() { {