release/20.x: [libc++] Fix misplaced _LIBCPP_POP_MACROS (#134874) #134895
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@mordante What do you think about merging this PR to the release branch? |
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: None (llvmbot) ChangesBackport 4ab86ed Requested by: @ldionne Full diff: https://github.com/llvm/llvm-project/pull/134895.diff 1 Files Affected:
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
|
github-project-automation
bot
moved this from Needs Triage
to Needs Merge
in LLVM Release Status
frederick-vs-ja
approved these changes
Apr 8, 2025
|
Are these test failures relevant? |
No there was an issue with the AIX-32 build bot last week. |
Fixes llvm#134681 (cherry picked from commit 4ab86ed)
github-project-automation
bot
moved this from Needs Merge
to Done
in LLVM Release Status
|
@ldionne (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport 4ab86ed
Requested by: @ldionne