Run `make grand-replace'.

[lilypond.git] / lily / moment.cc

diff --git a/lily/moment.cc b/lily/moment.cc
index 90c3a2da2c47550f01f005a75c8285a3e1ebc6e1..30941e31d77cd59186191230eb2d43afbf95438f 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--2008 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;
@@ -60,10 +60,10 @@ SCM
 Moment::as_scheme () const
 {
   return scm_list_5 (ly_symbol2scm ("ly:make-moment"),
-                    scm_from_int (main_part_.num ()),
-                    scm_from_int (main_part_.den ()),
-                    scm_from_int (grace_part_.num ()),
-                    scm_from_int (grace_part_.den ()));
+                    scm_from_int64 (main_part_.num ()),
+                    scm_from_int64 (main_part_.den ()),
+                    scm_from_int64 (grace_part_.num ()),
+                    scm_from_int64 (grace_part_.den ()));
 }
 
 SCM
@@ -129,13 +129,14 @@ Moment::operator %= (Moment const &src)
   grace_part_ %= src.main_part_;
 }
 
-int
+I64
 Moment::den () const
 {
+  /* TODO: ensure MSB == 0 here */
   return main_part_.den ();
 }
 
-int
+I64
 Moment::num () const
 {
   return main_part_.num ();
@@ -153,10 +154,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;
@@ -172,8 +173,8 @@ Moment::operator - () const
 }
 
 #ifdef STREAM_SUPPORT
-std::ostream &
-operator << (std::ostream &os, Moment const &m)
+ostream &
+operator << (ostream &os, Moment const &m)
 {
   os << m.to_string ();
   return os;