X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=flower%2Fscalar.cc;h=f28e7699ed0a5718d70289f78ffa726f8a73e2e1;hb=56d6d541266c300b10a6e1b6c026a7682ad12b61;hp=9d7ef229570c1076470645444e05224af8cdc226;hpb=5e47fbe9f5a8e10458a9d737d1c35cff2eae6791;p=lilypond.git diff --git a/flower/scalar.cc b/flower/scalar.cc index 9d7ef22957..f28e7699ed 100644 --- a/flower/scalar.cc +++ b/flower/scalar.cc @@ -22,7 +22,7 @@ Scalar::operator Rational () if (p == -1) return int (*this); - String s2 = right_str (len()-p-1); + String s2 = right_str (length_i ()-p-1); String s1 = left_str (p); return Rational (s1.value_i (), s2.value_i ()); @@ -32,12 +32,12 @@ bool Scalar::isnum_b () const { int conv = false; - if (len ()) + if (length_i ()) { long l =0; conv = sscanf (strh_.ch_C (), "%ld", &l); } - return len() && conv; + return length_i () && conv; } Scalar::operator Real() @@ -58,7 +58,7 @@ Scalar::operator int() Scalar::operator bool () const { - if (!len ()) + if (!length_i ()) return false; if (*this == "0") return false;