[llvm-branch-commits] [libcxx] release/20.x: [libc++] Fix misplaced _LIBCPP_POP_MACROS (#134874) (PR #134895)

[via llvm-branch-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-libcxx

Author: None (llvmbot)

<details>
<summary>Changes</summary>

Backport 4ab86edb560a2e1152e22700b0cb386759286c37

Requested by: @<!-- -->ldionne

---
Full diff: https://github.com/llvm/llvm-project/pull/134895.diff


1 Files Affected:

- (modified) libcxx/include/istream (+2-2) 


``````````diff
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

``````````

</details>


https://github.com/llvm/llvm-project/pull/134895