Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / lily / include / file-name-map.hh

diff --git a/lily/include/file-name-map.hh b/lily/include/file-name-map.hh
index 6ae14254dfe61bc0b6fead271878b47e7f29d09c..78034c785ece52f1def5a4871c9dab1040d5bd45 100644 (file)
--- a/lily/include/file-name-map.hh
+++ b/lily/include/file-name-map.hh
@@ -3,16 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FILE_NAME_MAP_HH
 #define FILE_NAME_MAP_HH
 
-#include "string.hh"
+#include "std-string.hh"
 
-String map_file_name (String s);
+string map_file_name (string s);
 
 #endif /* FILE_NAME_MAP_HH */