This revision was automatically updated to reflect the committed changes. Closed by commit rL332413: Emit an error when include <atomic> after <stdatomic.h> (authored by vsapsai, committed by ). Herald added a subscriber: llvm-commits.
Changed prior to commit: https://reviews.llvm.org/D45470?vs=145817&id=146946#toc Repository: rL LLVM https://reviews.llvm.org/D45470 Files: libcxx/trunk/include/atomic Index: libcxx/trunk/include/atomic =================================================================== --- libcxx/trunk/include/atomic +++ libcxx/trunk/include/atomic @@ -555,6 +555,9 @@ #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
Index: libcxx/trunk/include/atomic =================================================================== --- libcxx/trunk/include/atomic +++ libcxx/trunk/include/atomic @@ -555,6 +555,9 @@ #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
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
