Changeset 1005 for cpp/common/random.h

Timestamp:

07/14/20 15:54:43 (5 years ago)

Author:

Maciej Komosinski

Message:

Higher conformance with C++17, but gave up after missing M_PI, M_PI_2, strdup() and more; other cosmetic improvements

File:

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

cpp/common/random.h ¶

@@ -6 +6 @@
 
 #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
+#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
 
@@ -14 +14 @@
 #include <stdint.h> //uintptr_t
 #ifdef MULTITHREADED
- #include "threads.h"
+#include "threads.h"
 #endif
 #ifdef LINUX
- #include <unistd.h>
- #include <sys/stat.h>
- #include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #endif
 #ifdef _WIN32
- #define _WINSOCKAPI_ //http://stackoverflow.com/questions/1372480/c-redefinition-header-files
- #include <rpc.h> //UUID
- #pragma comment(lib, "Rpcrt4.lib")
+#define _WINSOCKAPI_ //http://stackoverflow.com/questions/1372480/c-redefinition-header-files
+#include <rpc.h> //UUID
+#pragma comment(lib, "Rpcrt4.lib")
 #endif
 
@@ -63 +63 @@
                 mt[0] = seed;
                 for (unsigned int i = 1; i < length; i++)
-                        mt[i] = (1812433253 * (mt[i - 1] ^ (mt[i - 1] >> 30)) + i)&bitMask_32;
+                        mt[i] = (1812433253 * (mt[i - 1] ^ (mt[i - 1] >> 30)) + i) & bitMask_32;
 #ifdef MULTITHREADED
                 pthread_mutex_unlock(&lock);
@@ -74 +74 @@
                 //for ms visual, could use http://msdn.microsoft.com/en-us/library/sxtz2fa8.aspx
 #ifdef LINUX
-                int fd=open("/dev/urandom",O_RDONLY);
-                if (fd>=0)
+                int fd = open("/dev/urandom", O_RDONLY);
+                if (fd >= 0)
                 {
-                        read(fd,&seed,sizeof(seed));
+                        read(fd, &seed, sizeof(seed));
                         close(fd);
                 }
@@ -84 +84 @@
                 {
                         counter++;
-                        seed = (unsigned int)time(NULL);                         //time (seconds); could use hi-res timer but then we would depend on common/timer.h
+                        seed = (unsigned int)time(NULL);           //time (seconds); could use hi-res timer but then we would depend on common/timer.h
                         seed ^= counter;                           //incremented value, possibly randomly initialized
                         seed ^= (unsigned int)(uintptr_t)&counter; //memory address
@@ -91 +91 @@
                 UUID uuid;
                 ::UuidCreate(&uuid);
-                seed ^= uuid.Data1^uuid.Data2^uuid.Data3^uuid.Data4[0];
+                seed ^= uuid.Data1 ^ uuid.Data2 ^ uuid.Data3 ^ uuid.Data4[0];
 #endif
                 setSeed(seed);
@@ -117 +117 @@
         //UniformRandomBitGenerator
         typedef unsigned int result_type;
-        static constexpr unsigned int min() {return 0;}
-        static constexpr unsigned int max() {return MAXVALUE;}
-        inline unsigned int operator()() {return getUint32();}
+        static constexpr unsigned int min() { return 0; }
+        static constexpr unsigned int max() { return MAXVALUE; }
+        inline unsigned int operator()() { return getUint32(); }
 
         inline double getDouble() // [0,1)