Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

[lilypond.git] / lily / include / stream.hh

diff --git a/lily/include/stream.hh b/lily/include/stream.hh
index ea403993e1e44ce81f03f007ca98c427dceadd59..9c3ab818dea44569a18831bd5a2250f870a2e961 100644 (file)
--- 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+  (c) 2001--2009 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 */