X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstream.hh;h=7e44506787ac0e9e0002b7efbc4e72ce6d19c968;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=1178fc51ae23b8b32583049c8deeda81fea00e1a;hpb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;p=lilypond.git

diff --git a/lily/include/stream.hh b/lily/include/stream.hh
index 1178fc51ae..7e44506787 100644
--- a/lily/include/stream.hh
+++ b/lily/include/stream.hh
@@ -3,23 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STREAM_HH
 #define STREAM_HH
 
+#include "std-string.hh"
+
 #include <iostream>
 #include <sstream>
 using namespace std;
 
-#include "string.hh"
-
 #if __GNUC__ > 2
-ostream *open_file_stream (String file_name,
+ostream *open_file_stream (string file_name,
 				ios_base::openmode mode = ios::out);
 #else
-ostream *open_file_stream (String file_name, int mode = ios::out);
+ostream *open_file_stream (string file_name, int mode = ios::out);
 #endif
 void close_file_stream (ostream *os);