X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstream.hh;h=0d981a97c45ef0ee0daa4a26fad721cf1f1e7227;hb=1e9b3a12dfaa81f718a5b5d203161be8ca732013;hp=c3a26f108cf9084d3c5f650fdf99092ce1b16d3d;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

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