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
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

No files found.
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -92,7 +92,8 @@ 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                                                     \
+  || (defined(__cpp_threadsafe_static_init)                                    \
      && __cpp_threadsafe_static_init >= 200806)                               \
  || (defined(_MSC_VER) && _MSC_VER >= 1900)
 #define ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT 1