From 1c6e5db1288f85022f3e4529cdc46bddbce02eea Mon Sep 17 00:00:00 2001 From: khizmax Date: Sun, 26 Feb 2017 15:31:51 +0300 Subject: [PATCH] [undo] Fixed CLang incompatibility --- test/unit/misc/cxx11_atomic_class.cpp | 8 +------- test/unit/misc/cxx11_atomic_func.cpp | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/test/unit/misc/cxx11_atomic_class.cpp b/test/unit/misc/cxx11_atomic_class.cpp index cb142621..72a557d0 100644 --- a/test/unit/misc/cxx11_atomic_class.cpp +++ b/test/unit/misc/cxx11_atomic_class.cpp @@ -32,13 +32,7 @@ #include #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 a381b37e..55e61ab6 100644 --- 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 { -- 2.34.1