[llvm-branch-commits] [libcxx] d55c3c2 - [libc++] Fix misplaced _LIBCPP_POP_MACROS (#134874)

[Tom Stellard via llvm-branch-commits]

Author: Louis Dionne
Date: 2025-04-15T17:20:58-07:00
New Revision: d55c3c20520a72049d725a08cfb36dbafc743886

URL: https://github.com/llvm/llvm-project/commit/d55c3c20520a72049d725a08cfb36dbafc743886
DIFF: https://github.com/llvm/llvm-project/commit/d55c3c20520a72049d725a08cfb36dbafc743886.diff

LOG: [libc++] Fix misplaced _LIBCPP_POP_MACROS (#134874)

Fixes #134681

(cherry picked from commit 4ab86edb560a2e1152e22700b0cb386759286c37)

Added: 
    

Modified: 
    libcxx/include/istream

Removed: 
    


################################################################################
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<char>;
 
 _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 <type_traits>
 #  endif
 
-_LIBCPP_POP_MACROS
-
 #endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
 
 #endif // _LIBCPP_ISTREAM