From cae2f3059cd5a9fc4fdc12c5dec0646f076a1843 Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sat, 4 Mar 2017 15:28:52 +0800
Subject: [PATCH] Workaround thread_local not supported on OSX

Drop back to xcode7.3 on TravisCI
---
 .travis.yml               |  2 +-
 src/base/utils/random.cpp | 32 +++++++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 004021960..ddd981091 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ language: cpp
 os:
   - linux
   - osx
-osx_image: xcode8
+osx_image: xcode7.3
 
 env:
   matrix:
diff --git a/src/base/utils/random.cpp b/src/base/utils/random.cpp
index 7e56126b9..cb8e3e250 100644
--- a/src/base/utils/random.cpp
+++ b/src/base/utils/random.cpp
@@ -33,21 +33,43 @@
 #include <chrono>
 #include <random>
 
+#include <QtGlobal>
+
+#ifdef Q_OS_MAC
+#include <QThreadStorage>
+#endif
+
 // on some platform `std::random_device` may generate the same number sequence
 static bool hasTrueRandomDevice{ std::random_device{}() != std::random_device{}() };
-static thread_local std::mt19937 generator{
-    hasTrueRandomDevice
-    ? std::random_device{}()
-    : (std::random_device::result_type) std::chrono::system_clock::now().time_since_epoch().count()
-};
 
 uint32_t Utils::Random::rand(const uint32_t min, const uint32_t max)
 {
+#ifdef Q_OS_MAC  // workaround for Apple xcode: https://stackoverflow.com/a/29929949
+    static QThreadStorage<std::mt19937> generator;
+    if (!generator.hasLocalData())
+        generator.localData().seed(
+            hasTrueRandomDevice
+            ? std::random_device{}()
+            : (std::random_device::result_type) std::chrono::system_clock::now().time_since_epoch().count()
+        );
+#else
+    static thread_local std::mt19937 generator{
+        hasTrueRandomDevice
+        ? std::random_device{}()
+        : (std::random_device::result_type) std::chrono::system_clock::now().time_since_epoch().count()
+    };
+#endif
+
     // better replacement for `std::rand`, don't use this for real cryptography application
     // min <= returned_value <= max
     assert(min <= max);
 
     // new distribution is cheap: http://stackoverflow.com/a/19036349
     std::uniform_int_distribution<uint32_t> uniform(min, max);
+
+#ifdef Q_OS_MAC
+    return uniform(generator.localData());
+#else
     return uniform(generator);
+#endif
 }