diff options
| author | Yi Kong <yikong@google.com> | 2019-08-22 18:35:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-08-22 18:35:54 +0000 |
| commit | 436af3d55b26d1204812b4e45fea7bd9feb983e7 (patch) | |
| tree | 345b1d7d2bcbf4f744f471937aaca39977926267 /tests/stdatomic_test.cpp | |
| parent | 74e56438bb63e75b71d927ba797632bd778862ac (diff) | |
| parent | e39a51bfd4ffb2108f1e98f00bb6c26d0c3f035f (diff) | |
Merge changes from topic "clang-r365631-switch-over"
* changes:
Fix segment gap test
stdatomic_test: always use bits/stdatomic.h
Adapt tests due to the new Clang fortify-source warning
Diffstat (limited to 'tests/stdatomic_test.cpp')
| -rw-r--r-- | tests/stdatomic_test.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/stdatomic_test.cpp b/tests/stdatomic_test.cpp index a9665d18e..9911d642e 100644 --- a/tests/stdatomic_test.cpp +++ b/tests/stdatomic_test.cpp @@ -16,12 +16,9 @@ #include <gtest/gtest.h> -#if defined(__ANDROID__) +// The real <stdatomic.h> checks for the availability of C++'s atomics and uses them if present. Since +// we want to test the libc versions, we instead include <bits/stdatomic.h> where they're actually defined. #include <bits/stdatomic.h> -#else -#undef _USING_LIBCXX //TODO(b/137876753): Remove this -#include <stdatomic.h> -#endif #include <pthread.h> #include <stdint.h> |