-
Notifications
You must be signed in to change notification settings - Fork 13.2k
[libc++][modules] Fix disabling Unicode #81294
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
Conversation
-DLIBCXX_ENABLE_UNICODE=ON or -D_LIBCPP_HAS_NO_UNICODE doesn't build without this change.
@llvm/pr-subscribers-libcxx Author: Po-yao Chang (poyaoc97) Changes-DLIBCXX_ENABLE_UNICODE=ON or -D_LIBCPP_HAS_NO_UNICODE doesn't build without this change. Full diff: https://github.com/llvm/llvm-project/pull/81294.diff 1 Files Affected:
diff --git a/libcxx/modules/std/ostream.inc b/libcxx/modules/std/ostream.inc
index 8fcbfb4bdc1828..0e0e2d54fe6bae 100644
--- a/libcxx/modules/std/ostream.inc
+++ b/libcxx/modules/std/ostream.inc
@@ -33,8 +33,10 @@ export namespace std {
using std::println;
using std::vprint_nonunicode;
+# ifndef _LIBCPP_HAS_NO_UNICODE
using std::vprint_unicode;
-# endif // _LIBCPP_STD_VER >= 23
+# endif // _LIBCPP_HAS_NO_UNICODE
+# endif // _LIBCPP_STD_VER >= 23
#endif // _LIBCPP_HAS_NO_LOCALIZATION
} // namespace std
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the patch! I'll directly land this since I'd like to backport this to the release branch.
/cherry-pick |
/cherry-pick |
/cherry-pick 30cd183 |
Failed to create pull request for issue81294 https://github.com/llvm/llvm-project/actions/runs/7855866026 |
/cherry-pick 30cd183 |
-DLIBCXX_ENABLE_UNICODE=OFF or -D_LIBCPP_HAS_NO_UNICODE doesn't build without this change. (cherry picked from commit 30cd183)
/pull-request #81361 |
-DLIBCXX_ENABLE_UNICODE=OFF or -D_LIBCPP_HAS_NO_UNICODE doesn't build without this change. (cherry picked from commit 30cd183)
-DLIBCXX_ENABLE_UNICODE=OFF or -D_LIBCPP_HAS_NO_UNICODE doesn't build without this change. (cherry picked from commit 30cd183)
-DLIBCXX_ENABLE_UNICODE=OFF or -D_LIBCPP_HAS_NO_UNICODE doesn't build without this change. (cherry picked from commit 30cd183)
-DLIBCXX_ENABLE_UNICODE=OFF or -D_LIBCPP_HAS_NO_UNICODE doesn't build without this change.