*** empty log message ***

[lilypond.git] / lily / include / includable-lexer.hh

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index 2d4754fec2a7f537a6d4c02854d6d907dcc6a1dd..66c07ef78dfbc88d04fa8d3e6eb39177441bd514 100644 (file)
--- a/lily/include/includable-lexer.hh
+++ b/lily/include/includable-lexer.hh
@@ -13,7 +13,7 @@
 #include <FlexLexer.h>
 #endif
 
-#include "string.hh"
+#include "std-string.hh"
 #include "parray.hh"
 #include "lily-proto.hh"
 
@@ -39,11 +39,11 @@ public:
   ~Includable_lexer ();
 
   /// store dependencies for Makefile stuff.
-  Array<String> file_name_strings_;
+  Array<std::string> file_name_strings_;
 
   Source_file *get_source_file () const;
-  void new_input (String s, Sources *);
-  void new_input (String name, String data, Sources *);
+  void new_input (std::string s, Sources *);
+  void new_input (std::string name, std::string data, Sources *);
 
   char const *here_str0 () const;
 };