Imported Upstream version 2.14.2

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

diff --git a/lily/include/stream.hh b/lily/include/stream.hh
index 7559d912016ba8b00739f1a4ca185be1e6590911..2547900e9e6d664067fc3e67eab9c2a185996492 100644 (file)
--- a/lily/include/stream.hh
+++ b/lily/include/stream.hh
@@ -1,25 +1,36 @@
 /*
-  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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2001--2006 Han-Wen Nienhuys <hanwen@xs4all.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>
 using namespace std;
 
-#include "string.hh"
-
 #if __GNUC__ > 2
-ostream *open_file_stream (String file_name,
+ostream *open_file_stream (string file_name,
                                ios_base::openmode mode = ios::out);
 #else
-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 (ostream *os);