From 82812a228e5a628516102a9902cf1381370de4fe Mon Sep 17 00:00:00 2001 From: khizmax Date: Sat, 20 Sep 2014 20:07:21 +0400 Subject: [PATCH] Remove CDS_CXX11_ATOMIC_BEGIN_NAMESPACE/CDS_CXX11_ATOMIC_END_NAMESPACE defines --- cds/cxx11_atomic.h | 6 ------ projects/Win/vc12/cds.vcxproj | 1 - projects/Win/vc12/cds.vcxproj.filters | 3 --- 3 files changed, 10 deletions(-) diff --git a/cds/cxx11_atomic.h b/cds/cxx11_atomic.h index 8508fd8d..f7bcf81e 100644 --- a/cds/cxx11_atomic.h +++ b/cds/cxx11_atomic.h @@ -96,8 +96,6 @@ namespace cxx11_atomics { # if BOOST_VERSION >= 105400 # include # 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 # 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 # 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 b5cad061..02d40864 100644 --- a/projects/Win/vc12/cds.vcxproj +++ b/projects/Win/vc12/cds.vcxproj @@ -644,7 +644,6 @@ - diff --git a/projects/Win/vc12/cds.vcxproj.filters b/projects/Win/vc12/cds.vcxproj.filters index 7c055fa8..0cad1a25 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\gcc - Header Files\cds\details -- 2.34.1