Revert "Problem: mis-detection of threadsafe_static_init causes test failures"

cef9cfa0 · Simon Giesecke · GitHub · 0c6c9357 · cef9cfa0
Unverified Commit cef9cfa0 authored Mar 07, 2018 by Simon Giesecke Committed by GitHub Mar 07, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

random.cpp src/random.cpp +3 -2

No files found.
--- 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)                                     \
+#if __cplusplus >= 201103L                                                     \
-     && __cpp_threadsafe_static_init >= 200806)                                \
+  || (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