[libc++][test] Get rid of warning on macOS about undefined macro #156785
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
`TEST_CLANG_VER` is not defined for Apple Clang, so it's better to detect whether the macro is defined to get rid of warnings due to `-Wundef`. This also corresponds to the guard in `<mutex>`.
|
@llvm/pr-subscribers-libcxx Author: A. Jiang (frederick-vs-ja) Changes
Full diff: https://github.com/llvm/llvm-project/pull/156785.diff 1 Files Affected:
diff --git a/libcxx/test/extensions/clang/thread/thread.mutex/lock.verify.cpp b/libcxx/test/extensions/clang/thread/thread.mutex/lock.verify.cpp
index c83a87d4901c3..51ffa6962ac83 100644
--- a/libcxx/test/extensions/clang/thread/thread.mutex/lock.verify.cpp
+++ b/libcxx/test/extensions/clang/thread/thread.mutex/lock.verify.cpp
@@ -31,7 +31,7 @@ void f1() {
} // expected-warning {{mutex 'm0' is still held at the end of function}} \
expected-warning {{mutex 'm1' is still held at the end of function}}
-#if TEST_STD_VER >= 11 && TEST_CLANG_VER >= 2101
+#if TEST_STD_VER >= 11 && defined(TEST_CLANG_VER) && TEST_CLANG_VER >= 2101
void f2() {
std::lock(m0, m1, m2);
} // expected-warning {{mutex 'm0' is still held at the end of function}} \
|
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.
TEST_CLANG_VERis not defined for Apple Clang, so it's better to detect whether the macro is defined to get rid of warnings due to-Wundef. This also corresponds to the guard in<mutex>.