X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmoment.cc;h=7516bf20e1a786eda78b6a4e3ce926e29b7df4e0;hb=dcbe4187b56ee3f420c3ad81bad54e8406c727e8;hp=f0d34b8bc1562b719fc37d6f132027125a8afa87;hpb=8a719f6eec1bd84269a55d1ec99adb3f17c04e64;p=lilypond.git diff --git a/lily/moment.cc b/lily/moment.cc index f0d34b8bc1..7516bf20e1 100644 --- a/lily/moment.cc +++ b/lily/moment.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2006 Han-Wen Nienhuys + (c) 1999--2007 Han-Wen Nienhuys */ #include "moment.hh" @@ -49,7 +49,7 @@ Moment::print_smob (SCM s, SCM port, scm_print_state *) Moment *r = (Moment *) SCM_CELL_WORD_1 (s); scm_puts ("#to_string (); + string str = r->to_string (); scm_puts ((char *)str.c_str (), port); scm_puts (">", port); @@ -153,10 +153,10 @@ Moment::set_infinite (int k) main_part_.set_infinite (k); } -String +string Moment::to_string () const { - String s = main_part_.to_string (); + string s = main_part_.to_string (); if (grace_part_) s += "G" + grace_part_.to_string (); return s;