Merge branch 'master' into nested-bookparts

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

diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index 0b16ff11d303e56dd342cfa2c9cd7e143e763051..4421a619d7d3513ba67ba37697a42bc5bfc4b5b2 100644 (file)
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -1,26 +1,26 @@
-
 /*
   fflower-proto.hh -- typenames in flowerlib
 
-  (c) 1996--2005 Han-Wen Nienhuys
+  (c) 1996--2007 Han-Wen Nienhuys
 */
 
-#ifndef FPROTO_HH
-#define FPROTO_HH
+#ifndef FLOWER_PROTO_HH
+#define FLOWER_PROTO_HH
 
 char const *flower_version_str0 ();
 
-template<class T> struct Link_array;
-template<class T> struct Array;
-template<class T, class K> struct Assoc;
-template<class K, class V> struct Hash_table;
-template<class K, class V> struct Hash_table_iter;
-template<class T> struct Link_list;
-template<class T> struct Interval_t;
-template<class T> struct PQueue;
+typedef unsigned char Byte;
+struct String_convert;
+
+#include "std-string.hh"
+using namespace std;
 
 #include "real.hh"
 
+template<class T> struct Interval_t;
+template<class T> struct PQueue;
+template<class T, class A> class Matrix;
+
 typedef Interval_t<Real> Interval;
 
 struct Offset;
@@ -29,15 +29,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;
-struct Text_db;
-struct Scalar;
 
 typedef unsigned char U8;
 typedef short I16;
@@ -46,16 +37,9 @@ typedef unsigned U32;
 typedef int I32;
 typedef long long I64;
 
-typedef unsigned char Byte;
 
-struct Duration;
-struct Duration_iterator;
-struct Source_file;
-struct Binary_source_file;
-struct Sources;
 struct File_storage;
 struct Mapped_file_storage;
 struct Simple_file_storage;
 
-#endif // FPROTO_HH
-
+#endif /* FLOWER_PROTO_HH */