Run `make grand-replace'.

[lilypond.git] / lily / include / moment.hh

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index ba8164f0319550c0997553d1eb93cb446a81a3e3..ed7c7b0741d34da984936e12f8c568708ce88ebf 100644 (file)
--- a/lily/include/moment.hh
+++ b/lily/include/moment.hh
@@ -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>
 */
 
 #ifndef MOMENT_HH
@@ -18,7 +18,7 @@
 */
 class Moment
 {
-  DECLARE_SIMPLE_SMOBS (Moment,);
+  DECLARE_SIMPLE_SMOBS (Moment);
 public:
   Moment ();
   Moment (int m);
@@ -41,15 +41,16 @@ public:
   void set_infinite (int k);
 
   bool to_bool () const;
-  int den () const;
-  int num () const;
+  I64 den () const;
+  I64 num () const;
   /*
     Deliver a copy of THIS as a smobified SCM
   */
-  String to_string () const;
+  string to_string () const;
   static int compare (Moment const &, Moment const &);
   SCM as_scheme () const;
 };
+
 IMPLEMENT_ARITHMETIC_OPERATOR (Moment, +);
 IMPLEMENT_ARITHMETIC_OPERATOR (Moment, -);
 IMPLEMENT_ARITHMETIC_OPERATOR (Moment, /);
@@ -63,7 +64,7 @@ INSTANTIATE_COMPARE (Moment const &, Moment::compare);
 Moment robust_scm2moment (SCM, Moment);
 
 #ifdef STREAM_SUPPORT
-std::ostream &operator << (std::ostream &, Moment const &);
+ostream &operator << (ostream &, Moment const &);
 #endif
 
 bool moment_less (SCM a, SCM b);