Merge pull request #2974 from bluca/static_init_gcc

Problem: mis-detection of threadsafe_static_init causes test failures

Merge pull request #2974 from bluca/static_init_gcc
Problem: mis-detection of threadsafe_static_init causes test failures
0c6c9357 · Constantin Rack · GitHub · 677efea2 · 9bd2d3f9 · 0c6c9357
Unverified Commit 0c6c9357 authored Mar 07, 2018 by Constantin Rack Committed by GitHub Mar 07, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

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

No files found.
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -92,9 +92,8 @@ uint32_t zmq::generate_random ()
 //    configurable via config.h

 //  TODO this should probably be done via config.h
-#if __cplusplus >= 201103L                                                     \
-  || (defined(__cpp_threadsafe_static_init)                                    \
-      && __cpp_threadsafe_static_init >= 200806)                               \
+#if (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