X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgeneral-scheme.cc;h=558d111f8617b7b61147504ec8dbf658446b76ed;hb=6224c5c3bfe0a4c7aef15a060a323c77c99bd3f0;hp=3e1d23cf11ef79b224f1d28a5db1d2d87bf78ff2;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index 3e1d23cf11..558d111f86 100644
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -31,8 +31,8 @@ LY_DEFINE (ly_find_file, "ly:find-file",
 {
   SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
 
-  std::string nm = ly_scm2string (name);
-  std::string file_name = global_path.find (nm);
+  string nm = ly_scm2string (name);
+  string file_name = global_path.find (nm);
   if (file_name.empty ())
     return SCM_BOOL_F;
 
@@ -56,7 +56,7 @@ LY_DEFINE (ly_gulp_file, "ly:gulp-file",
       sz = scm_to_int (size);
     }
   
-  std::string contents = gulp_file_to_string (ly_scm2string (name), true, sz);
+  string contents = gulp_file_to_string (ly_scm2string (name), true, sz);
   return scm_from_locale_stringn (contents.c_str (), contents.length ());
 }
 
@@ -224,7 +224,7 @@ LY_DEFINE (ly_output_formats, "ly:output-formats",
 	   "Formats passed to --format as a list of strings, "
 	   "used for the output.")
 {
-  std::vector<std::string> output_formats = split_string (output_format_global, ',');
+  vector<string> output_formats = string_split (output_format_global, ',');
 
   SCM lst = SCM_EOL;
   int output_formats_count = output_formats.size ();