patch::: 1.3.8.uu1

[lilypond.git] / lily / warn.cc

diff --git a/lily/warn.cc b/lily/warn.cc
index c35e6e60158720cf1284f02447023a99f8c0ba69..36231783801d492490c1755e13438e6a00e9ada5 100644 (file)
--- a/lily/warn.cc
+++ b/lily/warn.cc
@@ -3,36 +3,20 @@
 
   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"
-#include "time-description.hh"
+#include "timing-translator.hh"
 #include "source-file.hh"
 #include "source.hh"
 #include "main.hh"
 #include "input.hh"
 
 ostream &warnout (cerr);
-ostream *mlog(&cerr);
+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);
-}
-
-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);
-}