-/*
-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--2006 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 filename,
- 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 filename, 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 */