*** empty log message ***

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

diff --git a/lily/include/input.hh b/lily/include/input.hh
index f9300bf4e84a958ddd8dd352a6cf89bdc225b834..9c255b70f0cc5ce83e09c7338c8652fc850e3d86 100644 (file)
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -10,6 +10,7 @@
 #define INPUT_HH
 
 #include "flower-proto.hh"
+#include "std-string.hh"
 
 /**
    Base class for anything that records its poisition in the parse file.
@@ -26,17 +27,17 @@ public:
   char const *end () const;
 
   void set (Source_file *, char const *, char const *);
-  void warning (String) const; // should use member func?
-  void non_fatal_error (String) const;
-  void error (String) const;
-  void message (String) const;
+  void warning (std::string) const; // should use member func?
+  void non_fatal_error (std::string) const;
+  void error (std::string) const;
+  void message (std::string) const;
   void set_spot (Input const &);
   void step_forward ();
   void set_location (Input const &, Input const &);
   Input spot () const;
-  String location_string () const;
-  String line_number_string () const;
-  String file_string ()const;
+  std::string location_string () const;
+  std::string line_number_string () const;
+  std::string file_string ()const;
 
   int line_number ()const;
   int column_number ()const;