From 3b90ad8c63e72b51a6764374d9b4609ae90c24d8 Mon Sep 17 00:00:00 2001 From: Simon Giesecke Date: Tue, 13 Feb 2018 15:50:57 +0100 Subject: [PATCH] Problem: support of std::atomic is incomplete in VS <2015 Solution: use std::atomic only from VS 2015 --- src/atomic_counter.hpp | 2 +- src/atomic_ptr.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/atomic_counter.hpp b/src/atomic_counter.hpp index 9adb5474..ca74ac10 100644 --- 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 diff --git a/src/atomic_ptr.hpp b/src/atomic_ptr.hpp index df1537f2..a4912bb3 100644 --- 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