X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Frational.hh;h=0129cea773dd22da6a64fdfc357549d44cf5f46e;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=bc64465cfe5db4c5758a4aa6c4bcc3de6609b449;hpb=03ce3667568361ee7433032988a4089c64de2ec7;p=lilypond.git

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index bc64465cfe..0129cea773 100644
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -3,15 +3,15 @@
 
   source file of the Flower Library
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef RATIONAL_HH
 #define RATIONAL_HH
 
+#include "flower-proto.hh"
 #include "std-string.hh"
-
-#include "std-string.hh"
+#include <limits.h>
 
 /**
    Rational numbers.  Included is support for + and - infinity.
@@ -27,7 +27,7 @@ class Rational
      0 if *this is zero.
   */
   int sign_;
-  unsigned int num_, den_;
+  U64 num_, den_;
   void normalize ();
   void copy (Rational const &);
 
@@ -35,10 +35,10 @@ public:
   void set_infinite (int sign);
   bool is_infinity () const;
   void invert ();
-  int numerator () const { return sign_ * num_; }
-  int denominator () const { return den_; }
-  int num () const { return numerator (); }
-  int den () const { return denominator (); }
+  I64 numerator () const { return sign_ * num_; }
+  I64 denominator () const { return den_; }
+  I64 num () const { return numerator (); }
+  I64 den () const { return denominator (); }
 
   Rational trunc_rat () const;
   Rational div_rat (Rational) const;
@@ -47,15 +47,19 @@ public:
   void negate ();
   int to_int () const;
 
-  operator double () const;
+  operator double () const { return to_double (); }
+  double to_double () const;
 
   Rational operator - () const;
   /**
      Initialize to 0.
   */
   Rational ();
-  Rational (int, int);
-  Rational (double);
+  Rational (int);
+  Rational (I64);
+  Rational (U64);
+  explicit Rational (I64, I64);
+  explicit Rational (double);
   Rational (Rational const &r) { copy (r);}
   Rational &operator = (Rational const &r)
   {
@@ -98,6 +102,6 @@ ostream &
 operator << (ostream &, Rational);
 #endif
 
-const Rational infinity_rat = INT_MAX;
+const Rational infinity_rat (U64_MAX);
 
 #endif // RATIONAL_HH