diff options
| author | Volodymyr Sapsai <vsapsai@apple.com> | 2018-05-15 22:38:31 +0000 |
|---|---|---|
| committer | Volodymyr Sapsai <vsapsai@apple.com> | 2018-05-15 22:38:31 +0000 |
| commit | 85d3a702da8f937ab1a818411a2c3ba7df294279 (patch) | |
| tree | 32f71dcb8b70388d62497ffb7c00c0be3d8edacf | |
| parent | cfeb646f809461177a89480bfadbc59a00c0018f (diff) | |
| download | bcm5719-llvm-85d3a702da8f937ab1a818411a2c3ba7df294279.tar.gz bcm5719-llvm-85d3a702da8f937ab1a818411a2c3ba7df294279.zip | |
Emit an error when include <atomic> after <stdatomic.h>
C11 defines `kill_dependency` as a macro in <stdatomic.h>. When you
include <atomic> after <stdatomic.h>, the macro clashes with
`std::kill_dependency` and causes multiple errors. Explicit error should
help in diagnosing those errors.
No change for working code that includes <atomic> before <stdatomic.h>.
rdar://problem/27435938
Reviewers: rsmith, EricWF, mclow.lists, jfb
Reviewed By: jfb
Subscribers: jfb, jkorous-apple, christof, bumblebritches57, JonChesterfield, smeenai, cfe-commits
Differential Revision: https://reviews.llvm.org/D45470
llvm-svn: 332413
| -rw-r--r-- | libcxx/include/atomic | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libcxx/include/atomic b/libcxx/include/atomic index 34a2a58b20c..dfca76b1626 100644 --- a/libcxx/include/atomic +++ b/libcxx/include/atomic @@ -555,6 +555,9 @@ void atomic_signal_fence(memory_order m) noexcept; #if !defined(_LIBCPP_HAS_C_ATOMIC_IMP) && !defined(_LIBCPP_HAS_GCC_ATOMIC_IMP) #error <atomic> is not implemented #endif +#ifdef kill_dependency +#error C++ standard library is incompatible with <stdatomic.h> +#endif #if _LIBCPP_STD_VER > 14 # define __cpp_lib_atomic_is_always_lock_free 201603L |
