Problem: support of std::atomic is incomplete in VS <2015

Solution: use std::atomic only from VS 2015

Problem: support of std::atomic is incomplete in VS <2015
Solution: use std::atomic only from VS 2015
3b90ad8c · Simon Giesecke · 9aa957b4 · 3b90ad8c · 3b90ad8c
Commit 3b90ad8c authored Feb 13, 2018 by Simon Giesecke
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

atomic_counter.hpp src/atomic_counter.hpp +1 -1

atomic_ptr.hpp src/atomic_ptr.hpp +2 -2

No files found.
--- a/src/atomic_counter.hpp
+++ b/src/atomic_counter.hpp
@@ -37,7 +37,7 @@
 #elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
 #define ZMQ_ATOMIC_COUNTER_INTRINSIC
 #elif (defined __cplusplus && __cplusplus >= 201103L)                          \
-       || (defined _MSC_VER && _MSC_VER >= 1700)
+  || (defined _MSC_VER && _MSC_VER >= 1900)
 #define ZMQ_ATOMIC_COUNTER_CXX11
 #elif (defined __i386__ || defined __x86_64__) && defined __GNUC__
 #define ZMQ_ATOMIC_COUNTER_X86

--- a/src/atomic_ptr.hpp
+++ b/src/atomic_ptr.hpp
@@ -34,8 +34,8 @@
 #define ZMQ_ATOMIC_PTR_MUTEX
 #elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
 #define ZMQ_ATOMIC_PTR_INTRINSIC
-#elif ((defined __cplusplus && __cplusplus >= 201103L)                         \
-       || (defined _MSC_VER && _MSC_VER >= 1700))
+#elif (defined __cplusplus && __cplusplus >= 201103L)                          \
+  || (defined _MSC_VER && _MSC_VER >= 1900)
 #define ZMQ_ATOMIC_PTR_CXX11
 #elif (defined __i386__ || defined __x86_64__) && defined __GNUC__
 #define ZMQ_ATOMIC_PTR_X86