Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Guard an include of <ostream> in <chrono> with availability macro #108429

Merged
merged 1 commit into from
Sep 13, 2024

Conversation

var-const
Copy link
Member

This fixes a regression introduced in
#96035.

@var-const var-const requested a review from a team as a code owner September 12, 2024 17:25
@llvmbot llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Sep 12, 2024
@llvmbot
Copy link
Collaborator

llvmbot commented Sep 12, 2024

@llvm/pr-subscribers-libcxx

Author: Konstantin Varlamov (var-const)

Changes

This fixes a regression introduced in
#96035.


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

1 Files Affected:

  • (modified) libcxx/include/chrono (+1-1)
diff --git a/libcxx/include/chrono b/libcxx/include/chrono
index 990c415ec2e972..7bec5e5a26ef4a 100644
--- a/libcxx/include/chrono
+++ b/libcxx/include/chrono
@@ -1015,8 +1015,8 @@ constexpr chrono::year                                  operator ""y(unsigned lo
 #  include <charconv>
 #  if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
 #    include <locale>
+#    include <ostream>
 #  endif
-#  include <ostream>
 #endif
 
 #endif // _LIBCPP_CHRONO

@var-const var-const added the locale issues related to localization label Sep 12, 2024
@var-const var-const added this to the LLVM 19.X Release milestone Sep 12, 2024
Copy link
Member

@ldionne ldionne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@var-const var-const self-assigned this Sep 12, 2024
@var-const var-const merged commit 127c349 into llvm:main Sep 13, 2024
65 checks passed
@var-const
Copy link
Member Author

/cherry-pick 127c349

llvmbot pushed a commit to llvmbot/llvm-project that referenced this pull request Sep 13, 2024
…llvm#108429)

This fixes a regression introduced in
llvm#96035.

(cherry picked from commit 127c349)
@llvmbot
Copy link
Collaborator

llvmbot commented Sep 13, 2024

/pull-request #108515

tru pushed a commit to llvmbot/llvm-project that referenced this pull request Sep 16, 2024
…llvm#108429)

This fixes a regression introduced in
llvm#96035.

(cherry picked from commit 127c349)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. locale issues related to localization
Projects
Development

Successfully merging this pull request may close these issues.

3 participants