diff options
| author | Volodymyr Sapsai <vsapsai@apple.com> | 2018-05-02 19:52:07 +0000 |
|---|---|---|
| committer | Volodymyr Sapsai <vsapsai@apple.com> | 2018-05-02 19:52:07 +0000 |
| commit | 2fccc9495dd0f280e1aee43d9f3cbdeae13a4fd9 (patch) | |
| tree | 054867fcc68ef201f5ff8fef334519750515b0b4 /test/Headers | |
| parent | 7960d1e27671e32f1477d891df719beda68fc7d4 (diff) | |
Revert "Emit an error when mixing <stdatomic.h> and <atomic>"
It reverts r331378 as it caused test failures
ThreadSanitizer-x86_64 :: Darwin/gcd-groups-destructor.mm
ThreadSanitizer-x86_64 :: Darwin/libcxx-shared-ptr-stress.mm
ThreadSanitizer-x86_64 :: Darwin/xpc-race.mm
Only clang part of the change is reverted, libc++ part remains as is because it
emits error less aggressively.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@331392 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Headers')
| -rw-r--r-- | test/Headers/stdatomic.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/test/Headers/stdatomic.cpp b/test/Headers/stdatomic.cpp deleted file mode 100644 index 322f26a2d6..0000000000 --- a/test/Headers/stdatomic.cpp +++ /dev/null @@ -1,10 +0,0 @@ -// RUN: %clang_cc1 %s -verify -// RUN: %clang_cc1 -D__ALLOW_STDC_ATOMICS_IN_CXX__ %s -verify - -#include <stdatomic.h> - -#ifndef __ALLOW_STDC_ATOMICS_IN_CXX__ -// expected-error@stdatomic.h:* {{<stdatomic.h> is incompatible with the C++ standard library}} -#else -// expected-no-diagnostics -#endif |