release: 1.1.58

[lilypond.git] / lily / warn.cc

diff --git a/lily/warn.cc b/lily/warn.cc
index 02707c67c7ad64c49f94e53173c8fc70f5f967e7..532d2e3fb89809227264adfcfd3a3595778d9c92 100644 (file)
--- a/lily/warn.cc
+++ b/lily/warn.cc
@@ -3,11 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "proto.hh"
-#include "plist.hh"
 #include "debug.hh"
 #include "my-lily-lexer.hh"
 #include "moment.hh"
@@ -25,14 +24,14 @@ ostream *mlog (&cerr);
 void
 error_t (String const & s, Moment const & r)
 {
-    String t_mom = String (trunc (r)) + String (r - Moment (trunc (r)));
-    String e=s+ " (t = " +  t_mom + ")";
-    error (e);
+  String t_mom = r.trunc_rat ().str () +  (r - r.trunc_rat ()).str ();
+  String e=s+ " (t = " +  t_mom + ")";
+  error (e);
 }
 
 void
 error_t (String const & s, Time_description const &t_tdes)
 {
-    String e=s+ " (at t=" + String (t_tdes.bars_i_) + ": " + String (t_tdes.whole_in_measure_) + ")\n";
-    error (e);
+  String e=s+ " (at t=" +  to_str (t_tdes.bars_i_) + ": " +  (t_tdes.whole_in_measure_).str () + ")\n";
+  error (e);
 }