use always 64-bit arithemtics

long is only 32-bit on 32-bit systems and on 64-bit Windows
ensure we have consistent behavior

Author: christoph-cullmann

src/CoinRational.cpp

@@ -20,7 +20,7 @@
 // Returns closest (or almost, anyway) rational to val with denominator less
 // than or equal to maxdnom.  Return value is true if within tolerance, false
 // otherwise.
-bool CoinRational::nearestRational_(double val, double maxdelta, long maxdnom)
+bool CoinRational::nearestRational_(double val, double maxdelta, int64_t maxdnom)
 {
   double intpart;
   if (floor(val)==val) {
@@ -31,7 +31,7 @@ bool CoinRational::nearestRational_(double val, double maxdelta, long maxdnom)
   double fracpart = fabs(modf(val, &intpart));
   // Consider using remainder() instead?
 
-  long a = 0, b = 1, c = 1, d = 1;
+  int64_t a = 0, b = 1, c = 1, d = 1;
 #define DEBUG_X 1
 #if DEBUG_X
   bool shouldBeOK = false;
@@ -83,7 +83,7 @@ bool CoinRational::nearestRational_(double val, double maxdelta, long maxdnom)
     numerator_ *= -1;
 #if DEBUG_X > 1
   if (shouldBeOK) {
-    printf("val %g is %ld/%ld to accuracy %g\n", val, numerator_, denominator_,
+    printf("val %g is %lld/%lld to accuracy %g\n", val, numerator_, denominator_,
       fabs(val - numerator_ / double(denominator_)));
   }
 #endif

src/CoinRational.hpp

@@ -14,18 +14,18 @@ class COINUTILSLIB_EXPORT CoinRational
 {
 
 public:
-  long getDenominator() { return denominator_; }
-  long getNumerator() { return numerator_; }
+  int64_t getDenominator() { return denominator_; }
+  int64_t getNumerator() { return numerator_; }
 
   CoinRational()
     : numerator_(0)
     , denominator_(1) {};
 
-  CoinRational(long n, long d)
+  CoinRational(int64_t n, int64_t d)
     : numerator_(n)
     , denominator_(d) {};
 
-  CoinRational(double val, double maxdelta, long maxdnom)
+  CoinRational(double val, double maxdelta, int64_t maxdnom)
   {
     if (!nearestRational_(val, maxdelta, maxdnom)) {
       numerator_ = 0;
@@ -34,10 +34,10 @@ class COINUTILSLIB_EXPORT CoinRational
   };
 
 private:
-  long numerator_;
-  long denominator_;
+  int64_t numerator_;
+  int64_t denominator_;
 
-  bool nearestRational_(double val, double maxdelta, long maxdnom);
+  bool nearestRational_(double val, double maxdelta, int64_t maxdnom);
 };
 
 #endif