Merge branch 'master' into nested-bookparts

[lilypond.git] / flower / include / rational.hh

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index fdc3b68fabd2a8847c23f0aa436d067019d7d4b6..969d0121470db512f58f342046fd5293c735ad29 100644 (file)
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -9,7 +9,6 @@
 #ifndef RATIONAL_HH
 #define RATIONAL_HH
 
-#include "flower-proto.hh"
 #include "std-string.hh"
 #include <limits.h>
 
@@ -27,7 +26,7 @@ class Rational
      0 if *this is zero.
   */
   int sign_;
-  U64 num_, den_;
+  unsigned int num_, den_;
   void normalize ();
   void copy (Rational const &);
 
@@ -35,10 +34,10 @@ public:
   void set_infinite (int sign);
   bool is_infinity () const;
   void invert ();
-  I64 numerator () const { return sign_ * num_; }
-  I64 denominator () const { return den_; }
-  I64 num () const { return numerator (); }
-  I64 den () const { return denominator (); }
+  int numerator () const { return sign_ * num_; }
+  int denominator () const { return den_; }
+  int num () const { return numerator (); }
+  int den () const { return denominator (); }
 
   Rational trunc_rat () const;
   Rational div_rat (Rational) const;
@@ -56,9 +55,7 @@ public:
   */
   Rational ();
   Rational (int);
-  Rational (I64);
-  Rational (U64);
-  explicit Rational (I64, I64);
+  explicit Rational (int, int);
   explicit Rational (double);
   Rational (Rational const &r) { copy (r);}
   Rational &operator = (Rational const &r)
@@ -102,6 +99,6 @@ ostream &
 operator << (ostream &, Rational);
 #endif
 
-const Rational infinity_rat (U64_MAX);
+const Rational infinity_rat (INT_MAX);
 
 #endif // RATIONAL_HH