* flower/include/std-string.hh:

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

diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index 650622eef9e1269f9b29cea227e29d12d4d1161f..91e2e36aae59a7969636a8df3b16b5f28ebd2e38 100644 (file)
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -15,16 +15,19 @@ template<class K, class V> struct Hash_table;
 template<class K, class V> struct Hash_table_iter;
 
 typedef unsigned char Byte;
-namespace std {
-  struct String_data;
-  struct String_handle;
-  //template<class T> struct Array;
-  template<class T> struct Link_array;
-}
 struct String_convert;
 
+#if 0
+namespace std {
+struct string;
+template<typename T> struct vector;
+}
+#else
 #include "std-string.hh"
 #include "std-vector.hh"
+#endif
+using namespace std;
+
 #include "real.hh"
 
 template<class T> struct Link_list;