*** empty log message ***

[lilypond.git] / lily / moment.cc

diff --git a/lily/moment.cc b/lily/moment.cc
index f0d34b8bc1562b719fc37d6f132027125a8afa87..1bab8f8fc57c25a197122cf9976865e702933379 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -49,7 +49,7 @@ 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 ();
+  std::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
+std::string
 Moment::to_string () const
 {
-  String s = main_part_.to_string ();
+  std::string s = main_part_.to_string ();
   if (grace_part_)
     s += "G" + grace_part_.to_string ();
   return s;