* lily/tuplet-bracket.cc (calc_position_and_height): check musical

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

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index 30689a5d26bebff5f4e461a545ca34c7fe240557..b95cf42b4d8183687ecaa518923bde8278ef2499 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -47,7 +47,7 @@ public:
     Deliver a copy of THIS as a smobified SCM
    */
   SCM smobbed_copy () const;
-  String str () const;
+  String to_string () const;
   static int compare (Moment const&, Moment const&);
   
 };
@@ -63,7 +63,7 @@ INSTANTIATE_COMPARE (Moment const&, Moment::compare);
 
 
 #ifdef STREAM_SUPPORT
-ostream & operator << ( ostream &,Moment const &);
+std::ostream & operator << (std::ostream &, Moment const &);
 #endif
 
 #endif /* MOMENT_HH */