Remove CDS_CXX11_ATOMIC_BEGIN_NAMESPACE/CDS_CXX11_ATOMIC_END_NAMESPACE defines

diff --git a/cds/cxx11_atomic.h b/cds/cxx11_atomic.h
index 8508fd8d8fcbbf77ea1b0c6b0687e3a886b60f68..f7bcf81e2af6e3596f7fe5472412311bcb89c661 100644 (file)
--- a/cds/cxx11_atomic.h
+++ b/cds/cxx11_atomic.h
@@ -96,8 +96,6 @@ namespace cxx11_atomics {
 #   if BOOST_VERSION >= 105400
 #       include <boost/atomic.hpp>
 #       define CDS_ATOMIC boost
-#       define CDS_CXX11_ATOMIC_BEGIN_NAMESPACE namespace boost {
-#       define CDS_CXX11_ATOMIC_END_NAMESPACE }
 #   else
 #       error "Boost version 1.54 or above is needed for boost.atomic"
 #   endif
@@ -105,14 +103,10 @@ namespace cxx11_atomics {
     // libcds atomic
 #   include <cds/compiler/cxx11_atomic.h>
 #   define CDS_ATOMIC cds::cxx11_atomics
-#   define CDS_CXX11_ATOMIC_BEGIN_NAMESPACE namespace cds { namespace cxx11_atomics {
-#   define CDS_CXX11_ATOMIC_END_NAMESPACE }}
 #else
     // Compiler provided C++11 atomic
 #   include <atomic>
 #   define CDS_ATOMIC std
-#   define CDS_CXX11_ATOMIC_BEGIN_NAMESPACE namespace std {
-#   define CDS_CXX11_ATOMIC_END_NAMESPACE }
 #endif
 //@endcond
 

diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index b5cad061176abbb21a4eaede0f50a5065c21e2fd..02d408642f0713ef6869892c30da3751b9de0a0b 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -644,7 +644,6 @@
     <ClInclude Include="..\..\..\cds\compiler\cxx11_atomic.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
     <ClInclude Include="..\..\..\cds\compiler\gcc\ia64\cxx11_atomic.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\gcc\sparc\cxx11_atomic.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\gcc\x86\cxx11_atomic.h" />\r

diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters
index 7c055fa8bdca47a840142d33d686b906739a35e2..0cad1a25278c6021b081799c447f8eac3e9a4846 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\gcc\cxx11_atomic_patches.h">\r
-      <Filter>Header Files\cds\compiler\gcc</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\..\cds\details\bounded_container.h">\r
       <Filter>Header Files\cds\details</Filter>\r
     </ClInclude>\r