nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed wiRandom initialization order (#344)

Browse Source 
On some compilers, wiRandom would initialize later than other modules that depend on it for initialization, resuling in undefined behaviour (infinite loop in my case).

Co-authored-by: Amer Koleci <amerkoleci@gmail.com>
This commit is contained in:
Matteo De Carlo
2021-11-06 19:59:44 +01:00
committed by GitHub
parent 82c38509b8
commit 28be2ddd7f
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/wiRandom.cpp
+8 -5
View File
@@ -3,13 +3,16 @@
namespace wiRandom
{
std::random_device rand_dev;
std::mt19937 generator(rand_dev());
std::mt19937 &generator() {
static std::random_device rand_dev;
static std::mt19937 generator(rand_dev());
return generator;
}
int getRandom(int minValue, int maxValue)
{
std::uniform_int_distribution<int> distr(minValue, maxValue);
return distr(generator);
return distr(generator());
}
int getRandom(int maxValue)
{
@@ -19,7 +22,7 @@ namespace wiRandom
uint32_t getRandom(uint32_t minValue, uint32_t maxValue)
{
std::uniform_int_distribution<uint32_t> distr(minValue, maxValue);
return distr(generator);
return distr(generator());
}
uint32_t getRandom(uint32_t maxValue)
{
@@ -29,7 +32,7 @@ namespace wiRandom
uint64_t getRandom(uint64_t minValue, uint64_t maxValue)
{
std::uniform_int_distribution<uint64_t> distr(minValue, maxValue);
return distr(generator);
return distr(generator());
}
uint64_t getRandom(uint64_t maxValue)
{