Problem: std::atomic not used on Visual C++ although it is available (#2930)

* Problem: std::atomic not used on Visual C++ although it is available Solution: change conditional compilation to recognize _MSC_VER

Problem: std::atomic not used on Visual C++ although it is available (#2930)
* Problem: std::atomic not used on Visual C++ although it is available Solution: change conditional compilation to recognize _MSC_VER
de0c6693 · Simon Giesecke · Luca Boccassi · 52d64e1d · de0c6693
Commit de0c6693 authored Feb 08, 2018 by Simon Giesecke Committed by Luca Boccassi Feb 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

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