Changeset 843 for cpp/common

Timestamp:

12/08/18 05:35:57 (6 years ago)

Author:

Maciej Komosinski

Message:

Our random number generator class becomes compatible with std::UniformRandomBitGenerator?

File:

• cpp/common/random.h (modified) (2 diffs)

cpp/common/random.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
+
+#ifdef _MSC_VER
+ #define NOMINMAX //we don't want Windows headers (minwindef.h) to define min() and max() as macros
+ #undef min //for some reason, NOMINMAX did not work so we have to #undef anyway
+ #undef max
+#endif
 
 #include "nonstd.h" //LONGLONG
@@ -108 +114 @@
         }
 
+        //UniformRandomBitGenerator
+        typedef unsigned int result_type;
+        static unsigned int min() {return 0;}
+        static unsigned int max() {return MAXVALUE;}
+        inline unsigned int operator()() {return getUint32();}
+
         inline double getDouble() // [0,1)
         {