From cef9cfa0917f029826843cfe85657714ccec67ee Mon Sep 17 00:00:00 2001 From: Simon Giesecke Date: Wed, 7 Mar 2018 15:03:07 +0100 Subject: [PATCH] Revert "Problem: mis-detection of threadsafe_static_init causes test failures" --- src/random.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/random.cpp b/src/random.cpp index 4e72870c..91f654ea 100644 --- a/src/random.cpp +++ b/src/random.cpp @@ -92,8 +92,9 @@ uint32_t zmq::generate_random () // configurable via config.h // TODO this should probably be done via config.h -#if (defined(__cpp_threadsafe_static_init) \ - && __cpp_threadsafe_static_init >= 200806) \ +#if __cplusplus >= 201103L \ + || (defined(__cpp_threadsafe_static_init) \ + && __cpp_threadsafe_static_init >= 200806) \ || (defined(_MSC_VER) && _MSC_VER >= 1900) #define ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT 1 // TODO this might probably also be set if a sufficiently recent gcc is used