Remove old compiler specific files related to atomic implementation

diff --git a/cds/compiler/clang/cxx11_atomic_prepatches.h b/cds/compiler/clang/cxx11_atomic_prepatches.h
deleted file mode 100644 (file)
index fb86722..0000000
--- 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 <typename T>
-        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 <typename T>
-        static inline void __atomic_load(T *ptr, T *ret, int memmodel)
-        {
-            *ret = __atomic_load( ptr, memmodel );
-        }
-
-        template <typename T>
-        static inline  void __atomic_store(T *ptr, T *val, int memmodel)
-        {
-            __atomic_store( ptr, *val, memmodel );
-        }
-
-        template <typename T>
-        static inline  void __atomic_exchange(T *ptr, T *val, T *ret, int memmodel)
-        {
-            *ret =  __atomic_exchange( ptr, *val, memmodel );
-        }
-
-        template <typename T>
-        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 (file)
index 56db30c..0000000
--- 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 <cds/compiler/gcc/cxx11_atomic_patches.h>
-#elif CDS_COMPILER == CDS_COMPILER_INTEL && CDS_OS_INTERFACE == CDS_OSI_WINDOWS
-#   include <cds/compiler/icl/cxx11_atomic_patches_win.h>
-#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 (file)
index 3729a07..0000000
--- 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 <cds/compiler/clang/cxx11_atomic_prepatches.h>
-#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 (file)
index 62faf5d..0000000
--- 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 (file)
index 06249f3..0000000
--- 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 f54ec19ad789effb115ffb3fe5e1aafbacbe3989..8508fd8d8fcbbf77ea1b0c6b0687e3a886b60f68 100644 (file)
--- 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 <cds/compiler/cxx11_atomic_prepatches.h>
 #   include <atomic>
 #   define CDS_ATOMIC std
 #   define CDS_CXX11_ATOMIC_BEGIN_NAMESPACE namespace std {
 #   define CDS_CXX11_ATOMIC_END_NAMESPACE }
-#   include <cds/compiler/cxx11_atomic_patches.h>
-#else
 #endif
 //@endcond
 

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index cbe75f79d17eadb9d9181545c79f1051e64cb8bd..b5cad061176abbb21a4eaede0f50a5065c21e2fd 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -640,11 +640,8 @@
     <ClInclude Include="..\..\..\cds\algo\elimination_tls.h" />\r
     <ClInclude Include="..\..\..\cds\algo\flat_combining.h" />\r
     <ClInclude Include="..\..\..\cds\algo\int_algo.h" />\r
-    <ClInclude Include="..\..\..\cds\compiler\clang\cxx11_atomic_prepatches.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\clang\defs.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic.h" />\r
-    <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic_patches.h" />\r
-    <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic_prepatches.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\gcc\amd64\cxx11_atomic.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\gcc\compiler_macro.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\gcc\cxx11_atomic_patches.h" />\r
@@ -652,7 +649,6 @@
     <ClInclude Include="..\..\..\cds\compiler\gcc\sparc\cxx11_atomic.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\gcc\x86\cxx11_atomic.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\icl\compiler_barriers.h" />\r
-    <ClInclude Include="..\..\..\cds\compiler\icl\cxx11_atomic_patches_win.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\icl\defs.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\vc\amd64\cxx11_atomic.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\vc\x86\cxx11_atomic.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index bcc6dba91d1bd8c4a3680714a536cbc173ad8cb2..7c055fa8bdca47a840142d33d686b906739a35e2 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -830,9 +830,6 @@
     <ClInclude Include="..\..\..\cds\compiler\gcc\ia64\cxx11_atomic.h">\r
       <Filter>Header Files\cds\compiler\gcc\ia64</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic_patches.h">\r
-      <Filter>Header Files\cds\compiler</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\compiler\gcc\cxx11_atomic_patches.h">\r
       <Filter>Header Files\cds\compiler\gcc</Filter>\r
     </ClInclude>\r
@@ -866,12 +863,6 @@
     <ClInclude Include="..\..\..\cds\container\basket_queue.h">\r
       <Filter>Header Files\cds\container</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic_prepatches.h">\r
-      <Filter>Header Files\cds\compiler</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\compiler\clang\cxx11_atomic_prepatches.h">\r
-      <Filter>Header Files\cds\compiler\clang</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\intrusive\deque_stat.h">\r
       <Filter>Header Files\cds\intrusive</Filter>\r
     </ClInclude>\r
@@ -1223,9 +1214,6 @@
     <ClInclude Include="..\..\..\cds\compiler\icl\compiler_barriers.h">\r
       <Filter>Header Files\cds\compiler\icl</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\cds\compiler\icl\cxx11_atomic_patches_win.h">\r
-      <Filter>Header Files\cds\compiler\icl</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\compiler\icl\defs.h">\r
       <Filter>Header Files\cds\compiler\icl</Filter>\r
     </ClInclude>\r