diff options
| author | Jose <jose@zeroc.com> | 2015-12-01 17:36:19 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-01 17:36:19 +0100 |
| commit | 2029ff368e49fae489b8ec8fc12f7d126b182dfb (patch) | |
| tree | 6075d652b7851831c39e6f22004d8720864f1a60 /cpp/include/IceUtil/Atomic.h | |
| parent | The default LMDB map size for IceGrid and IceStorm is now 10MB (Windows) (diff) | |
| download | ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.tar.bz2 ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.tar.xz ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.zip | |
C++11 mapping initial commit
Diffstat (limited to 'cpp/include/IceUtil/Atomic.h')
| -rw-r--r-- | cpp/include/IceUtil/Atomic.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/include/IceUtil/Atomic.h b/cpp/include/IceUtil/Atomic.h index dcf705bb612..2ed19c2bc7d 100644 --- a/cpp/include/IceUtil/Atomic.h +++ b/cpp/include/IceUtil/Atomic.h @@ -10,12 +10,12 @@ #ifndef ICE_UTIL_ATOMIC_H #define ICE_UTIL_ATOMIC_H -#if ((defined(ICE_CPP11) && defined(_MSC_VER) && (_MSC_VER > 1600)) || \ - (defined(ICE_CPP11) && !defined(_MSC_VER))) -# define ICE_CPP11_HAS_ATOMIC +#if ((defined(ICE_CPP11_COMPILER) && defined(_MSC_VER) && (_MSC_VER > 1600)) || \ + (defined(ICE_CPP11_COMPILER) && !defined(_MSC_VER))) +# define ICE_CPP11_COMPILER_HAS_ATOMIC #endif -#if defined(ICE_CPP11_HAS_ATOMIC) +#if defined(ICE_CPP11_COMPILER_HAS_ATOMIC) # include <atomic> #elif defined(ICE_USE_MUTEX_SHARED) @@ -45,7 +45,7 @@ namespace IceUtilInternal { -#ifdef ICE_CPP11_HAS_ATOMIC +#ifdef ICE_CPP11_COMPILER_HAS_ATOMIC typedef std::atomic<int> Atomic; #else |