Skip to content

[libc++] Amend error message for _LIBCPP_HAS_THREAD_API_EXTERNAL #115774

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

Merged
merged 1 commit into from
Nov 11, 2024

Conversation

Caslyn
Copy link
Contributor

@Caslyn Caslyn commented Nov 11, 2024

Noticed this while debugging a few things following #112094. Amended error message to reflect conditional check.

Noticed this while debugging a few things following
llvm#112094. Amended error message
to reflect conditional check.
@Caslyn Caslyn requested a review from philnik777 November 11, 2024 21:56
@Caslyn Caslyn self-assigned this Nov 11, 2024
@Caslyn Caslyn requested a review from a team as a code owner November 11, 2024 21:56
@llvmbot llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Nov 11, 2024
@llvmbot
Copy link
Member

llvmbot commented Nov 11, 2024

@llvm/pr-subscribers-libcxx

Author: Caslyn Tonelli (Caslyn)

Changes

Noticed this while debugging a few things following #112094. Amended error message to reflect conditional check.


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

1 Files Affected:

  • (modified) libcxx/include/__config (+1-1)
diff --git a/libcxx/include/__config b/libcxx/include/__config
index a2a1aa2b2978df..9db00cd0c9fb93 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -858,7 +858,7 @@ typedef __char32_t char32_t;
 #  endif
 
 #  if !_LIBCPP_HAS_THREADS && _LIBCPP_HAS_THREAD_API_EXTERNAL
-#    error _LIBCPP_HAS_THREAD_API_EXTERNAL may not be true when _LIBCPP_HAS_THREADS is true.
+#    error _LIBCPP_HAS_THREAD_API_EXTERNAL may only be true when _LIBCPP_HAS_THREADS is true.
 #  endif
 
 #  if !_LIBCPP_HAS_MONOTONIC_CLOCK && _LIBCPP_HAS_THREADS

@philnik777 philnik777 merged commit bbf2ad0 into llvm:main Nov 11, 2024
11 of 14 checks passed
@Caslyn Caslyn deleted the fix-wording branch November 11, 2024 21:59
Groverkss pushed a commit to iree-org/llvm-project that referenced this pull request Nov 15, 2024
…m#115774)

Noticed this while debugging a few things following
llvm#112094. Amended error message
to reflect conditional check.
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants