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

diff --git a/lily/include/stream.hh b/lily/include/stream.hh
index 5c58945936..7e44506787 100644
--- a/lily/include/stream.hh
+++ b/lily/include/stream.hh
@@ -1,28 +1,27 @@
-/*   
-stream.hh -- declare compatibility glue for gcc 3.
+/*
+  stream.hh -- declare compatibility glue for gcc 3.
 
-source file of the GNU LilyPond music typesetter
+  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>
-
-#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 */