Changeset 835

Timestamp:

12/05/18 21:02:00 (6 years ago)

Author:

Maciej Komosinski

Message:

ISO C++17 compliance including NULL, nullptr, templates and pointer conversions

Location:

cpp

Files:

• PrintFloat/Dragon4.h (modified) (1 diff)
• common/nonstd_math.cpp (modified) (1 diff)
• common/nonstd_math.h (modified) (3 diffs)
• frams/genetics/fH/fH_general.cpp (modified) (2 diffs)

cpp/PrintFloat/Dragon4.h

@@ -56 +56 @@
 tU32 Dragon4
 (
-    tU64        mantissa,           // value significand
-    tS32        exponent,           // value exponent in base 2
-    tU32        mantissaHighBitIdx, // index of the highest set mantissa bit
-    tB          hasUnequalMargins,  // is the high margin twice as large as the low margin
-    tCutoffMode cutoffMode,         // how to determine output length
+        const tU64        mantissa,           // value significand
+        const tS32        exponent,           // value exponent in base 2
+        const tU32        mantissaHighBitIdx, // index of the highest set mantissa bit
+        const tB          hasUnequalMargins,  // is the high margin twice as large as the low margin
+    const tCutoffMode cutoffMode,         // how to determine output length
     tU32        cutoffNumber,       // parameter to the selected cutoffMode
     tC8 *       pOutBuffer,         // buffer to output into

cpp/common/nonstd_math.cpp

@@ -13 +13 @@
 
 
-
-#if (defined __BORLANDC__ || (_MSC_VER <= 1700)) & (!defined EMSCRIPTEN)
-double round(double val) //http://stackoverflow.com/questions/2170385/c-math-functions
-{    
-    return floor(val + 0.5);
-}
-#endif
 
 

cpp/common/nonstd_math.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.
 
@@ -17 +17 @@
 #endif
 
-#if (defined __BORLANDC__ || (_MSC_VER <= 1700)) & (!defined EMSCRIPTEN)
-  double round(double val);  //http://stackoverflow.com/questions/2170385/c-math-functions
-#endif
 
 
@@ -70 +67 @@
 
 #endif
+

cpp/frams/genetics/fH/fH_general.cpp

@@ -417 +417 @@
         if (sticks.size() == 1)
         {
-                stickconnections.push_back(pair<fH_StickHandle *, fH_StickHandle *>(NULL, sticks[0]));
+                stickconnections.push_back(pair<fH_StickHandle *, fH_StickHandle *>(nullptr, sticks[0]));
                 sticksorder.push_back(0);
                 return;
@@ -457 +457 @@
 
         // two found handles are the beginning of creature body
-        stickconnections.push_back(pair<fH_StickHandle *, fH_StickHandle *>(NULL, left));
+        stickconnections.push_back(pair<fH_StickHandle *, fH_StickHandle *>(nullptr, left));
         stickconnections.push_back(pair<fH_StickHandle *, fH_StickHandle *>(left, right));