*** empty log message ***

[lilypond.git] / flower / include / flower-proto.hh

diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index 24a050b16951d646b6964d9bdefddba284e303ff..f175eebb1ae9ba753b36c84120416ad8b973696a 100644 (file)
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -19,6 +19,15 @@ template<class T> struct Link_list;
 template<class T> struct Interval_t;
 template<class T> struct PQueue;
 
+typedef unsigned char Byte;
+namespace std {
+  struct String_data;
+  struct String_handle;
+  //struct String;
+}
+struct String_convert;
+
+#include "std-string.hh"
 #include "real.hh"
 
 typedef Interval_t<Real> Interval;
@@ -29,10 +38,6 @@ struct Rational;
 class File_name;
 class File_path;
 struct Getopt_long;
-struct String_data;
-struct String_handle;
-struct String_convert;
-struct String;
 
 struct Text_stream;
 struct Data_file;
@@ -46,7 +51,6 @@ typedef unsigned U32;
 typedef int I32;
 typedef long long I64;
 
-typedef unsigned char Byte;
 
 struct Duration;
 struct Duration_iterator;