[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeutils/kcalc/knumber
From:       Pascal Létourneau <pascal.letourneau () gmail ! com>
Date:       2007-11-26 20:04:07
Message-ID: 1196107447.167935.9280.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 741947 by pletourn:

Fix an infinite loop on 64bit arch


 M  +5 -5      knumber.cpp  
 M  +10 -10    knumber_priv.cpp  
 M  +10 -10    knumber_priv.h  


--- trunk/KDE/kdeutils/kcalc/knumber/knumber.cpp #741946:741947
@@ -660,22 +660,22 @@
 
 KNumber::operator qint32(void) const
 {
-  return static_cast<qint32>(*_num);
+  return static_cast<long int>(*_num);
 }
 
 KNumber::operator quint32(void) const
 {
-  return static_cast<quint32>(*_num);
+  return static_cast<unsigned long int>(*_num);
 }
 
 KNumber::operator quint64(void) const
 {
 #if SIZEOF_UNSIGNED_LONG == 8
-  return static_cast<quint64>(*this);
+  return static_cast<unsigned long int>(*_num);
 #elif SIZEOF_UNSIGNED_LONG == 4
   KNumber tmp_num1 = this->abs().integerPart();
-  quint64 tmp_num2 =  static_cast<quint32>(tmp_num1) +
-    (static_cast<quint64>(static_cast<quint32>(tmp_num1 >> KNumber("32"))) << 32) ;
+  quint64 tmp_num2 =  static_cast<unsigned long int>(tmp_num1) +
+    (static_cast<quint64>(static_cast<unsigned long int>(tmp_num1 >> KNumber("32"))) << 32) ;
   
 #ifdef __GNUC__
 #warning "the cast operator from KNumber to quint64 is probably buggy, when a sign is involved"
--- trunk/KDE/kdeutils/kcalc/knumber/knumber_priv.cpp #741946:741947
@@ -939,7 +939,7 @@
 
 
 
-_knumerror::operator qint32 (void) const
+_knumerror::operator long int (void) const
 {
   // what would be the correct return values here?
   if (_error == Infinity)
@@ -950,7 +950,7 @@
     return 0;
 }
 
-_knumerror::operator quint32 (void) const
+_knumerror::operator unsigned long int (void) const
 {
   // what would be the correct return values here?
   if (_error == Infinity)
@@ -962,32 +962,32 @@
 }
 
 
-_knuminteger::operator qint32 (void) const
+_knuminteger::operator long int (void) const
 {
   return mpz_get_si(_mpz);
 }
 
-_knumfraction::operator qint32 (void) const
+_knumfraction::operator long int (void) const
 {
-  return static_cast<qint32>(mpq_get_d(_mpq));
+  return static_cast<long int>(mpq_get_d(_mpq));
 }
 
-_knumfloat::operator qint32 (void) const
+_knumfloat::operator long int (void) const
 {
   return mpf_get_si(_mpf);
 }
 
-_knuminteger::operator quint32 (void) const
+_knuminteger::operator unsigned long int (void) const
 {
   return mpz_get_ui(_mpz);
 }
 
-_knumfraction::operator quint32 (void) const
+_knumfraction::operator unsigned long int (void) const
 {
-  return static_cast<quint32>(mpq_get_d(_mpq));
+  return static_cast<unsigned long int>(mpq_get_d(_mpq));
 }
 
-_knumfloat::operator quint32 (void) const
+_knumfloat::operator unsigned long int (void) const
 {
   return mpf_get_ui(_mpf);
 }
--- trunk/KDE/kdeutils/kcalc/knumber/knumber_priv.h #741946:741947
@@ -63,8 +63,8 @@
 
   virtual int compare(_knumber const &arg2) const = 0;
 
-  virtual operator qint32(void) const = 0;
-  virtual operator quint32(void) const = 0;
+  virtual operator long int(void) const = 0;
+  virtual operator unsigned long int(void) const = 0;
   virtual operator double (void) const = 0;
 };
 
@@ -107,8 +107,8 @@
 
   virtual int compare(_knumber const &arg2) const;
 
-  virtual operator qint32(void) const;
-  virtual operator quint32(void) const;
+  virtual operator long int(void) const;
+  virtual operator unsigned long int(void) const;
   virtual operator double (void) const;
 
  private:
@@ -171,8 +171,8 @@
 
   virtual _knumber * power(_knumber const & exponent) const;
 
-  virtual operator qint32 (void) const;
-  virtual operator quint32 (void) const;
+  virtual operator long int (void) const;
+  virtual operator unsigned long int (void) const;
   virtual operator double (void) const;
 
   _knuminteger * intAnd(_knuminteger const &arg2) const;
@@ -234,8 +234,8 @@
   
   virtual int compare(_knumber const &arg2) const;
 
-  virtual operator qint32 (void) const;
-  virtual operator quint32 (void) const;
+  virtual operator long int (void) const;
+  virtual operator unsigned long int (void) const;
   virtual operator double (void) const;
 
  private:
@@ -287,8 +287,8 @@
 
   virtual int compare(_knumber const &arg2) const;
 
-  virtual operator qint32 (void) const;
-  virtual operator quint32 (void) const;
+  virtual operator long int (void) const;
+  virtual operator unsigned long int (void) const;
   virtual operator double (void) const;
 
  private:
[prev in list] [next in list] [prev in thread] [next in thread]