Revert "Remove CDS_CXX11_ATOMIC_BEGIN_NAMESPACE/CDS_CXX11_ATOMIC_END_NAMESPACE defines"

This reverts commit 82812a228e5a628516102a9902cf1381370de4fe.
use -std=c++11 for gcc

diff --git a/build/Makefile b/build/Makefile
index ac3eda637e973c7c88988181bcf76a99610ed990..dd545cc3fdd7efa0b86e9d7713feea516290cd51 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -30,7 +30,7 @@ endif
 endif
 
 COMP_OPT = -c $(CFLAGS) $(BASE_OPT)
-CPP_COMP_OPT = -std=c++0x -c $(CXXFLAGS) $(BASE_OPT)
+CPP_COMP_OPT = -std=c++11 -c $(CXXFLAGS) $(BASE_OPT)
 
 COMPILER_ROOT = $(shell dirname `dirname \`which       $(CXX)\``)
 

diff --git a/cds/compiler/vc/defs.h b/cds/compiler/vc/defs.h
index e8d14ba3aafafaa06497640cda03359f265c8461..615d21042c3ea42cfae82dfb5579db2ce03aeb3b 100644 (file)
--- a/cds/compiler/vc/defs.h
+++ b/cds/compiler/vc/defs.h
@@ -88,7 +88,7 @@
 #define CDS_NOEXCEPT_SUPPORT_(expr)
 
 // Lambda (VC 10 +)
-//#define CDS_CXX11_LAMBDA_SUPPORT
+#define CDS_CXX11_LAMBDA_SUPPORT
 
 // RValue (VC 10+)
 #define CDS_RVALUE_SUPPORT

diff --git a/cds/cxx11_atomic.h b/cds/cxx11_atomic.h
index f7bcf81e2af6e3596f7fe5472412311bcb89c661..8508fd8d8fcbbf77ea1b0c6b0687e3a886b60f68 100644 (file)
--- a/cds/cxx11_atomic.h
+++ b/cds/cxx11_atomic.h
@@ -96,6 +96,8 @@ 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
@@ -103,10 +105,14 @@ 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 02d408642f0713ef6869892c30da3751b9de0a0b..b5cad061176abbb21a4eaede0f50a5065c21e2fd 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -644,6 +644,7 @@
     <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 0cad1a25278c6021b081799c447f8eac3e9a4846..7c055fa8bdca47a840142d33d686b906739a35e2 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj.filters
+++ b/projects/Win/vc12/cds.vcxproj.filters
@@ -830,6 +830,9 @@
     <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