From 4e552e918d20e3f7e853b83463a76585b603410d Mon Sep 17 00:00:00 2001 From: khizmax Date: Sat, 20 Sep 2014 20:04:22 +0400 Subject: [PATCH] Remove old compiler specific files related to atomic implementation --- cds/compiler/clang/cxx11_atomic_prepatches.h | 54 -------------------- cds/compiler/cxx11_atomic_patches.h | 13 ----- cds/compiler/cxx11_atomic_prepatches.h | 10 ---- cds/compiler/gcc/cxx11_atomic_patches.h | 6 --- cds/compiler/icl/cxx11_atomic_patches_win.h | 6 --- cds/cxx11_atomic.h | 3 -- projects/Win/vc12/cds.vcxproj | 4 -- projects/Win/vc12/cds.vcxproj.filters | 12 ----- 8 files changed, 108 deletions(-) delete mode 100644 cds/compiler/clang/cxx11_atomic_prepatches.h delete mode 100644 cds/compiler/cxx11_atomic_patches.h delete mode 100644 cds/compiler/cxx11_atomic_prepatches.h delete mode 100644 cds/compiler/gcc/cxx11_atomic_patches.h delete mode 100644 cds/compiler/icl/cxx11_atomic_patches_win.h diff --git a/cds/compiler/clang/cxx11_atomic_prepatches.h b/cds/compiler/clang/cxx11_atomic_prepatches.h deleted file mode 100644 index fb86722a..00000000 --- a/cds/compiler/clang/cxx11_atomic_prepatches.h +++ /dev/null @@ -1,54 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDS_COMPILER_CLANG_CXX11_ATOMIC_PREPATCHES_H -#define __CDS_COMPILER_CLANG_CXX11_ATOMIC_PREPATCHES_H - -#if CDS_CXX11_ATOMIC_SUPPORT == 1 -# if CDS_COMPILER_VERSION == 30100 - // Clang 3.1 workaround - // Clang 3.1 does not support __atomic_is_lock_free intrinsic function from GCC - template - static inline bool __atomic_is_lock_free( size_t, T* ) CDS_NOEXCEPT - { - return sizeof(T) <= 8; - } - - // clang does not implement GCC 4.7 low-level __atomic_xxx intrinsics - // See http://comments.gmane.org/gmane.comp.compilers.clang.devel/20093 - - // In Clang 3.1 the following workaround results in - // Assertion `Proto && "Functions without a prototype cannot be overloaded"' failed - // and clang crashed - // So, we cannot use Clang with GCC 4.7 atomics -/* - template - static inline void __atomic_load(T *ptr, T *ret, int memmodel) - { - *ret = __atomic_load( ptr, memmodel ); - } - - template - static inline void __atomic_store(T *ptr, T *val, int memmodel) - { - __atomic_store( ptr, *val, memmodel ); - } - - template - static inline void __atomic_exchange(T *ptr, T *val, T *ret, int memmodel) - { - *ret = __atomic_exchange( ptr, *val, memmodel ); - } - - template - static inline bool __atomic_compare_exchange(T *ptr, T *expected, T *desired, bool weak, int success_memmodel, int failure_memmodel) - { - if ( weak ) - return __atomic_compare_exchange_weak( ptr, expected, *desired, success_memmodel, failure_memmodel ); - else - return __atomic_compare_exchange_strong( ptr, expected, *desired, success_memmodel, failure_memmodel ); - } -*/ -# endif -#endif - -#endif // #ifndef __CDS_COMPILER_CLANG_CXX11_ATOMIC_PREPATCHES_H diff --git a/cds/compiler/cxx11_atomic_patches.h b/cds/compiler/cxx11_atomic_patches.h deleted file mode 100644 index 56db30cb..00000000 --- a/cds/compiler/cxx11_atomic_patches.h +++ /dev/null @@ -1,13 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDS_COMPILER_CXX11_ATOMIC_PATCHES_H -#define __CDS_COMPILER_CXX11_ATOMIC_PATCHES_H - -#if CDS_COMPILER == CDS_COMPILER_GCC -# include -#elif CDS_COMPILER == CDS_COMPILER_INTEL && CDS_OS_INTERFACE == CDS_OSI_WINDOWS -# include -#endif - - -#endif // #ifndef __CDS_COMPILER_CXX11_ATOMIC_PATCHES_H diff --git a/cds/compiler/cxx11_atomic_prepatches.h b/cds/compiler/cxx11_atomic_prepatches.h deleted file mode 100644 index 3729a079..00000000 --- a/cds/compiler/cxx11_atomic_prepatches.h +++ /dev/null @@ -1,10 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDS_COMPILER_CXX11_ATOMIC_PREPATCHES_H -#define __CDS_COMPILER_CXX11_ATOMIC_PREPATCHES_H - -#if CDS_COMPILER == CDS_COMPILER_CLANG -# include -#endif - -#endif // #ifndef __CDS_COMPILER_CXX11_ATOMIC_PREPATCHES_H diff --git a/cds/compiler/gcc/cxx11_atomic_patches.h b/cds/compiler/gcc/cxx11_atomic_patches.h deleted file mode 100644 index 62faf5df..00000000 --- a/cds/compiler/gcc/cxx11_atomic_patches.h +++ /dev/null @@ -1,6 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDS_COMPILER_GCC_CXX11_ATOMIC_PATCHES_H -#define __CDS_COMPILER_GCC_CXX11_ATOMIC_PATCHES_H - -#endif // #ifndef __CDS_COMPILER_GCC_CXX11_ATOMIC_PATCHES_H diff --git a/cds/compiler/icl/cxx11_atomic_patches_win.h b/cds/compiler/icl/cxx11_atomic_patches_win.h deleted file mode 100644 index 06249f37..00000000 --- a/cds/compiler/icl/cxx11_atomic_patches_win.h +++ /dev/null @@ -1,6 +0,0 @@ -//$$CDS-header$$ - -#ifndef __CDS_COMPILER_ICL_CXX11_ATOMIC_PATCHES_WIN_H -#define __CDS_COMPILER_ICL_CXX11_ATOMIC_PATCHES_WIN_H - -#endif // #ifndef __CDS_COMPILER_ICL_CXX11_ATOMIC_PATCHES_WIN_H diff --git a/cds/cxx11_atomic.h b/cds/cxx11_atomic.h index f54ec19a..8508fd8d 100644 --- a/cds/cxx11_atomic.h +++ b/cds/cxx11_atomic.h @@ -109,13 +109,10 @@ namespace cxx11_atomics { # define CDS_CXX11_ATOMIC_END_NAMESPACE }} #else // Compiler provided C++11 atomic -# include # include # define CDS_ATOMIC std # define CDS_CXX11_ATOMIC_BEGIN_NAMESPACE namespace std { # define CDS_CXX11_ATOMIC_END_NAMESPACE } -# include -#else #endif //@endcond diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj index cbe75f79..b5cad061 100644 --- a/projects/Win/vc12/cds.vcxproj +++ b/projects/Win/vc12/cds.vcxproj @@ -640,11 +640,8 @@ - - - @@ -652,7 +649,6 @@ - diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters index bcc6dba9..7c055fa8 100644 --- a/projects/Win/vc12/cds.vcxproj.filters +++ b/projects/Win/vc12/cds.vcxproj.filters @@ -830,9 +830,6 @@ Header Files\cds\compiler\gcc\ia64 - - Header Files\cds\compiler - Header Files\cds\compiler\gcc @@ -866,12 +863,6 @@ Header Files\cds\container - - Header Files\cds\compiler - - - Header Files\cds\compiler\clang - Header Files\cds\intrusive @@ -1223,9 +1214,6 @@ Header Files\cds\compiler\icl - - Header Files\cds\compiler\icl - Header Files\cds\compiler\icl -- 2.34.1