X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=flower%2Fwarn.cc;h=52631a866592661850c77c0c19053d1e35fd1c3e;hb=7c61b155a19349e4b1140b0de5dfd0c318af365c;hp=8ac73541b6cf0cc30f2559f32b24c1896ae7424a;hpb=57be7394ffa2e7d7ba6d60548dba563f3409d472;p=lilypond.git

diff --git a/flower/warn.cc b/flower/warn.cc
index 8ac73541b6..52631a8665 100644
--- a/flower/warn.cc
+++ b/flower/warn.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "warn.hh"
@@ -11,18 +11,22 @@
 #include <cstdlib>
 #include <cstdio>
 
+#include "international.hh"
+
+using namespace std;
+
 /* Is progress indication at NEWLINE?  */
 static bool progress_newline = true;
 
 /* Display user information that is not a full message.  */
 void
-progress_indication (String s)
+progress_indication (string s)
 {
   /* Test if all silly progress_indication ("\n") can be dropped now.  */
   if (s == "\n")
     return;
 
-  fputs (s.to_str0 (), stderr);
+  fputs (s.c_str (), stderr);
   fflush (stderr);
   if (s.length ())
     progress_newline = s[s.length () - 1] == '\n';
@@ -30,7 +34,7 @@ progress_indication (String s)
 
 /* Display a single user message.  Always starts on a new line.  */
 void
-message (String s)
+message (string s)
 {
   if (!progress_newline)
     fputc ('\n', stderr);
@@ -39,27 +43,27 @@ message (String s)
 
 /* Display a warning message.  Always starts on a new line.  */
 void
-warning (String s)
+warning (string s)
 {
-  message (_f ("warning: %s", s.to_str0 ()) + "\n");
+  message (_f ("warning: %s", s.c_str ()) + "\n");
 }
 
 void
-non_fatal_error (String s)
+non_fatal_error (string s)
 {
-  message (_f ("error: %s", s.to_str0 ()) + "\n");
+  message (_f ("error: %s", s.c_str ()) + "\n");
 }
 
 /* Display an error message.  Always starts on a new line.  */
 void
-error (String s)
+error (string s)
 {
   non_fatal_error (s);
   exit (1);
 }
 
 void
-programming_error (String s)
+programming_error (string s)
 {
   message (_f ("programming error: %s", s) + "\n");
   message (_ ("continuing, cross fingers") + "\n");