Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / moment.cc

diff --git a/lily/moment.cc b/lily/moment.cc
index d561aa7607b0509648bcc9335be5b6c3de3b666a..7516bf20e1a786eda78b6a4e3ce926e29b7df4e0 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "moment.hh"
@@ -49,8 +49,8 @@ Moment::print_smob (SCM s, SCM port, scm_print_state *)
   Moment *r = (Moment *) SCM_CELL_WORD_1 (s);
 
   scm_puts ("#<Mom ", port);
-  String str = r->to_string ();
-  scm_puts ((char *)str.to_str0 (), port);
+  string str = r->to_string ();
+  scm_puts ((char *)str.c_str (), port);
   scm_puts (">", port);
 
   return 1;
@@ -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;