* lily/paper-column-engraver.cc (stop_translation_timestep): also

[lilypond.git] / lily / duration.cc

diff --git a/lily/duration.cc b/lily/duration.cc
index 78c9275a4e971bb0b2cd4443c8bd985e859fcba9..413ac889ec497e7447b5e443c8e783b3704513dd 100644 (file)
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -3,8 +3,8 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "duration.hh"
@@ -60,10 +60,10 @@ Duration::get_length () const
   return mom * factor_;
 }
 
-String
+string
 Duration::to_string () const
 {
-  String s;
+  string s;
 
   if (durlog_ < 0)
     s = "log = " + ::to_string (durlog_);
@@ -91,7 +91,7 @@ Duration::print_smob (SCM s, SCM port, scm_print_state *)
   Duration *r = (Duration *) SCM_CELL_WORD_1 (s);
 
   scm_puts ("#<Duration ", port);
-  scm_display (scm_makfrom0str (r->to_string ().to_str0 ()), port);
+  scm_display (scm_makfrom0str (r->to_string ().c_str ()), port);
   scm_puts (" >", port);
 
   return 1;