[undo] Fixed CLang incompatibility

diff --git a/test/unit/misc/cxx11_atomic_class.cpp b/test/unit/misc/cxx11_atomic_class.cpp
index cb142621ea18c56a9c49cabef07b3c9aa8eb01a1..72a557d0de39c09133b552a88b9a252a70912da0 100644 (file)
--- a/test/unit/misc/cxx11_atomic_class.cpp
+++ b/test/unit/misc/cxx11_atomic_class.cpp
@@ -32,13 +32,7 @@
 #include <cds/algo/atomic.h>
 #include "cxx11_convert_memory_order.h"
 
-#if CDS_COMPILER == CDS_COMPILER_CLANG && !defined( _LIBCPP_VERSION )
-    // CLang (at least 3.6) without libc++ has no gcc-specific __atomic_is_lock_free function
-#   define EXPECT_ATOMIC_IS_LOCK_FREE( x )
-#else
-#   define EXPECT_ATOMIC_IS_LOCK_FREE( x ) EXPECT_TRUE( x.is_lock_free() )
-#endif
-
+#define EXPECT_ATOMIC_IS_LOCK_FREE( x ) EXPECT_TRUE( x.is_lock_free() )
 
 namespace {
     class cxx11_atomic_class: public ::testing::Test

diff --git a/test/unit/misc/cxx11_atomic_func.cpp b/test/unit/misc/cxx11_atomic_func.cpp
index a381b37e1b5d11629a3cddddbc563d7b40a0ed34..55e61ab62a48788d515ad2ef79d9a57073171a76 100644 (file)
--- a/test/unit/misc/cxx11_atomic_func.cpp
+++ b/test/unit/misc/cxx11_atomic_func.cpp
@@ -37,13 +37,7 @@
 
 #include "cxx11_convert_memory_order.h"
 
-#if CDS_COMPILER == CDS_COMPILER_CLANG && !defined( _LIBCPP_VERSION )
-    // CLang (at least 3.6) without libc++ has no gcc-specific __atomic_is_lock_free function
-#   define EXPECT_ATOMIC_IS_LOCK_FREE( x )
-#else
-#   define EXPECT_ATOMIC_IS_LOCK_FREE( x ) EXPECT_TRUE( atomics::atomic_is_lock_free( &x ));
-#endif
-
+#define EXPECT_ATOMIC_IS_LOCK_FREE( x ) EXPECT_TRUE( atomics::atomic_is_lock_free( &x ));
 
 namespace misc {