maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

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

llvm-svn: 331818
This commit is contained in:
Volodymyr Sapsai 2018-05-08 22:50:35 +00:00
parent b5b7d6e19c
commit cdb50bc93b
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libcxx/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

28
libcxx/test/libcxx/atomics/c_compatibility.fail.cpp
View File

@ -1,28 +0,0 @@
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
// UNSUPPORTED: libcpp-has-no-threads
//
// <atomic>
// Test that including <atomic> fails to compile when we want to use C atomics
// in C++ and have corresponding macro defined.
// MODULES_DEFINES: __ALLOW_STDC_ATOMICS_IN_CXX__
#ifndef __ALLOW_STDC_ATOMICS_IN_CXX__
#define __ALLOW_STDC_ATOMICS_IN_CXX__
#endif
#include <atomic>
// expected-error@atomic:* {{<stdatomic.h> is incompatible with the C++ standard library}}
int main()
{
}