Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / file-name-map.cc

diff --git a/lily/file-name-map.cc b/lily/file-name-map.cc
index da6447db25674a80e05bf398bd386b76feaf108c..3f6939c1ff191228ae01d72c3407cd8ae6ee36da 100644 (file)
--- a/lily/file-name-map.cc
+++ b/lily/file-name-map.cc
@@ -1,9 +1,9 @@
 /*
-  file-name-map.cc --  implement map_file_name()
+  file-name-map.cc --  implement map_file_name ()
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <map>
@@ -12,10 +12,10 @@ using namespace std;
 #include "file-name-map.hh"
 #include "lily-guile.hh"
 
-map<String, String> file_name_map_global;
+map<string, string> file_name_map_global;
 
-String
-map_file_name (String s)
+string
+map_file_name (string s)
 {
   if (file_name_map_global.find (s) != file_name_map_global.end ())
     s = file_name_map_global[s];