Run `make grand-replace'.

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

diff --git a/lily/file-name-map.cc b/lily/file-name-map.cc
index dc1a240e46076d1656429847fa55a4b750755de8..6adb1e586336a05ce5ffd1433065682f671d0ed7 100644 (file)
--- a/lily/file-name-map.cc
+++ b/lily/file-name-map.cc
@@ -1,31 +1,30 @@
 /*
-  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 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <map>
+using namespace std;
 
 #include "file-name-map.hh"
 #include "lily-guile.hh"
 
-std::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];
-    }
+    s = file_name_map_global[s];
   return s;
 }
 
 LY_DEFINE (ly_add_file_name_alist, "ly:add-file-name-alist",
           1, 0, 0, (SCM alist),
-          "Add mappings for error messages from specified alist")
+          "Add mappings for error messages from @var{alist}.")
 {
   for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
     {