Changeset 834

Timestamp:

12/05/18 20:59:34 (6 years ago)

Author:

Maciej Komosinski

Message:

Renamed Math.h to MathDragon4.h because the <math.h> name clash is unfortunate (and caused problems with C++Builder and filename case-insensitive Windows)

Location:

cpp/PrintFloat

Files:

• Dragon4.cpp (modified) (3 diffs)
• Math.cpp (modified) (1 diff)
• MathDragon4.h (moved) (moved from cpp/PrintFloat/Math.h)
• PrintFloat.cpp (modified) (1 diff)

cpp/PrintFloat/Dragon4.cpp

@@ -24 +24 @@
 
 #include "Dragon4.h"
-#include "Math.h"
+#include "MathDragon4.h"
 #include <math.h>
 
@@ -866 +866 @@
     //  floor( log10(v) ) < ceil( (mantissaHighBitIdx + exponent) * log10(2) ) <= floor( log10(v) ) + 1
     const tF64 log10_2 = 0.30102999566398119521373889472449;
-    tS32 digitExponent = (tS32)(ceil(tF64((tS32)mantissaHighBitIdx + exponent) * log10_2 - 0.69));
+        tS32 digitExponent = (tS32)(ceil(tF64((tS32)mantissaHighBitIdx + exponent) * log10_2 - 0.69));
  
     // if the digit exponent is smaller than the smallest desired digit for fractional cutoff,
@@ -970 +970 @@
         // This is safe because (2^28 - 1) = 268435455 which is less than 429496729. This means
         // that all values with a highest bit at index 27 are within range.         
-        tU32 hiBlockLog2 = LogBase2(hiBlock);
+                tU32 hiBlockLog2 = LogBase2(hiBlock);
         RJ_ASSERT(hiBlockLog2 < 3 || hiBlockLog2 > 27);
         tU32 shift = (32 + 27 - hiBlockLog2) % 32;

cpp/PrintFloat/Math.cpp

@@ -23 +23 @@
 ******************************************************************************/
 
-#include "Math.h"
+#include "MathDragon4.h"
 
 //******************************************************************************

cpp/PrintFloat/PrintFloat.cpp

@@ -31 +31 @@
 #include "PrintFloat.h"
 #include "Dragon4.h"
-#include "Math.h"
+#include "MathDragon4.h"
 
 #include <string.h>