Release: bump Welcome versions.

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

diff --git a/lily/include/input.hh b/lily/include/input.hh
index dbe3a2b52568cb133e3d5821a82fcc230d7f986e..aab0d117a66a561b7f6a0cea4c727a97b64d3e24 100644 (file)
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -32,7 +32,7 @@ class Input : public Simple_smob<Input>
   char const *end_;
   Source_file *source_file_;
 public:
-  static const char type_p_name_[];
+  static const char * const type_p_name_;
   int print_smob (SCM, scm_print_state *) const;
   static SCM equal_p (SCM, SCM);
   SCM mark_smob () const;
@@ -41,21 +41,21 @@ public:
   char const *end () const;
 
   void set (Source_file *, char const *, char const *);
-  void error (const std::string&) const;
-  void programming_error (const std::string&) const;
-  void non_fatal_error (const std::string&) const;
-  void warning (const std::string&) const;
-  void message (const std::string&) const;
-  void debug_output (const std::string&) const;
+  void error (const string&) const;
+  void programming_error (const string&) const;
+  void non_fatal_error (const string&) const;
+  void warning (const string&) const;
+  void message (const string&) const;
+  void debug_output (const string&) const;
   void set_spot (Input const &);
   void step_forward ();
   void set_location (Input const &, Input const &);
 
   Input spot () const;
 
-  std::string location_string () const;
-  std::string line_number_string () const;
-  std::string file_string ()const;
+  string location_string () const;
+  string line_number_string () const;
+  string file_string ()const;
 
   int line_number ()const;
   int column_number ()const;
@@ -67,8 +67,8 @@ public:
   Input (Input const &i);
   Input ();
 protected:
-  std::string message_location () const;
-  std::string message_string (const std::string &msg) const;
+  string message_location () const;
+  string message_string (const string &msg) const;
 };
 
 extern Input dummy_input_global;