Merge pull request #6461 from Chocobo1/rand_fix

Workaround thread_local on osx

.travis.yml

@@ -3,7 +3,7 @@ language: cpp
 os:
   - linux
   - osx
-osx_image: xcode8
+osx_image: xcode7.3
 
 env:
   matrix:

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{
+
+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
 
-uint32_t Utils::Random::rand(const uint32_t min, const uint32_t max)
-{
     // 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
 }