Imported Upstream version 2.16.0

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

diff --git a/lily/include/stream.hh b/lily/include/stream.hh
index c3a26f108cf9084d3c5f650fdf99092ce1b16d3d..000ec16f1c4bf01351d210709b735a87d0d357dc 100644 (file)
--- a/lily/include/stream.hh
+++ b/lily/include/stream.hh
@@ -1,26 +1,38 @@
 /*
-  stream.hh -- declare compatibility glue for gcc 3.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2001--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2001--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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 */