LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Emit an error when mixing <stdatomic.h> and <atomic>"

Browse Source 
It reverts commit r331379 because turned out `__ALLOW_STDC_ATOMICS_IN_CXX__`
doesn't work well in practice.


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@331818 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Volodymyr Sapsai
2018-05-08 22:50:35 +00:00
parent 5d2e458b6f
commit a382216407
2 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/atomic
View File

@@ -555,9 +555,6 @@ 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 __ALLOW_STDC_ATOMICS_IN_CXX__
#error <stdatomic.h> is incompatible with the C++ standard library
#endif
#if _LIBCPP_STD_VER > 14
# define __cpp_lib_atomic_is_always_lock_free 201603L