*** empty log message ***

[lilypond.git] / lily / lily-parser-scheme.cc

diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index 6d615ea915c5e8db9444cc545e94a488926ee439..212ca92e682b8e783323f6d820c2a1b972e22ec8 100644 (file)
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -11,6 +11,7 @@
 #include "file-name-map.hh"
 #include "file-name.hh"
 #include "file-path.hh"
+#include "international.hh"
 #include "lily-lexer.hh"
 #include "lily-parser.hh"
 #include "ly-module.hh"
@@ -38,7 +39,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
   char const *file = scm_i_string_chars (name);
   char const *extensions[] = {"ly", "", 0};
 
-  String file_name = global_path.find (file, extensions);
+  std::string file_name = global_path.find (file, extensions);
 
   /* By default, use base name of input file for output file name,
      write output to cwd; do not use root and directory parts of input
@@ -82,13 +83,13 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
        out_file_name = File_name (output_name_global);
     }
 
-  String init;
+  std::string init;
   if (!init_name_global.empty ())
     init = init_name_global;
   else
     init = "init.ly";
 
-  String out_file = out_file_name.to_string ();
+  std::string out_file = out_file_name.to_string ();
 
   if (init.length () && global_path.find (init).empty ())
     {
@@ -109,7 +110,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
       Sources sources;
       sources.set_path (&global_path);
 
-      String mapped_fn = map_file_name (file_name);
+      std::string mapped_fn = map_file_name (file_name);
       message (_f ("Processing `%s'", mapped_fn.c_str ()));
       progress_indication ("\n");