X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Frational.hh;h=f829e531eccb6ef2d431d9ffe290b0f745c3731d;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=57bd23593b2475b265b320dcdde20d8e87edbd38;hpb=9e338fb9a890089a44a3c36ae3c95653027718d5;p=lilypond.git diff --git a/flower/include/rational.hh b/flower/include/rational.hh index 57bd23593b..f829e531ec 100644 --- a/flower/include/rational.hh +++ b/flower/include/rational.hh @@ -1,14 +1,26 @@ /* - rational.hh -- declare rational helpers + This file is part of LilyPond, the GNU music typesetter. - source file of the Flower Library + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--2007 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #ifndef RATIONAL_HH #define RATIONAL_HH +#include "compare.hh" #include "flower-proto.hh" #include "std-string.hh" #include @@ -57,12 +69,14 @@ public: Rational (); Rational (int); Rational (I64); + Rational (U64); explicit Rational (I64, I64); explicit Rational (double); Rational (Rational const &r) { copy (r);} Rational &operator = (Rational const &r) { - copy (r); return *this; + copy (r); + return *this; } Rational &operator *= (Rational); @@ -77,11 +91,11 @@ public: #include "arithmetic-operator.hh" -IMPLEMENT_ARITHMETIC_OPERATOR (Rational, /); +IMPLEMENT_ARITHMETIC_OPERATOR (Rational, / ); IMPLEMENT_ARITHMETIC_OPERATOR (Rational, +); IMPLEMENT_ARITHMETIC_OPERATOR (Rational, *); IMPLEMENT_ARITHMETIC_OPERATOR (Rational, -); -IMPLEMENT_ARITHMETIC_OPERATOR (Rational, %); +IMPLEMENT_ARITHMETIC_OPERATOR (Rational, % ); INSTANTIATE_COMPARE (Rational const &, Rational::compare); @@ -101,6 +115,6 @@ ostream & operator << (ostream &, Rational); #endif -const Rational infinity_rat (LLONG_MAX); +const Rational infinity_rat (U64_MAX); #endif // RATIONAL_HH