Changeset 886

Timestamp:

07/22/19 01:13:09 (5 years ago)

Author:

Maciej Komosinski

Message:

LONGLONG no longer needed as long as int64_t became standard

Location:

cpp/common

Files:

• nonstd.h (modified) (3 diffs)
• random.h (modified) (3 diffs)

cpp/common/nonstd.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-2019  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -21 +21 @@
 
 
-/////////////////////////////////////////////////////// 64-bit int type and other macros
+/////////////////////////////////////////////////////// path separators and other macros
 #ifdef _WIN32
-        typedef __int64 LONGLONG;
         #define PATH_SEPARATOR_CHAR '\\'
         #define PATH_SEPARATOR_STRING "\\"
         #define FPU_THROWS_EXCEPTIONS
 #else
-        #define LONGLONG long long int
         #define PATH_SEPARATOR_CHAR '/'
         #define PATH_SEPARATOR_STRING "/"
@@ -75 +73 @@
 
 #endif
-

cpp/common/random.h

@@ -9 +9 @@
 #endif
 
-#include "nonstd.h" //LONGLONG
 #include <time.h> //time()
 #include <stdint.h> //uintptr_t
@@ -83 +82 @@
                 {
                         counter++;
-                        seed = 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
@@ -122 +121 @@
         inline double getDouble() // [0,1)
         {
-                return double(getUint32()) / ((LONGLONG)(MAXVALUE)+1);
+                return double(getUint32()) / ((int64_t)(MAXVALUE)+1);
         }