* flower/include/std-string.hh:

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

diff --git a/lily/include/stream.hh b/lily/include/stream.hh
index 7559d912016ba8b00739f1a4ca185be1e6590911..4c938da6856a0ced1b122a4226adad4058127dc6 100644 (file)
--- a/lily/include/stream.hh
+++ b/lily/include/stream.hh
@@ -9,17 +9,17 @@
 #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);