rational cleanups: suppress some automatic conversions.

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

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 290d02b9601b9918938b33ba47447527ab3a0094..bc64465cfe5db4c5758a4aa6c4bcc3de6609b449 100644 (file)
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -28,7 +28,7 @@ class Rational
   */
   int sign_;
   unsigned int num_, den_;
-  void normalise ();
+  void normalize ();
   void copy (Rational const &);
 
 public:
@@ -43,9 +43,10 @@ public:
   Rational trunc_rat () const;
   Rational div_rat (Rational) const;
   Rational mod_rat (Rational) const;
+  Rational abs () const;
   void negate ();
   int to_int () const;
-  operator bool () const;
+
   operator double () const;
 
   Rational operator - () const;
@@ -53,7 +54,6 @@ public:
      Initialize to 0.
   */
   Rational ();
-  Rational (int);
   Rational (int, int);
   Rational (double);
   Rational (Rational const &r) { copy (r);}
@@ -73,6 +73,7 @@ public:
 };
 
 #include "arithmetic-operator.hh"
+
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, /);
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, +);
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, *);