Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index 1b8ceabe4b6720affe98cdc2274082d067c7a77e..8246d09fe3b93b5bba5fca71ad9e49aec79fa501 100644 (file)
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -1,27 +1,26 @@
-
 /*
   fflower-proto.hh -- typenames in flowerlib
 
-  (c) 1996--2004 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 ();
 
-char const * flower_version_str0 ();
+typedef unsigned char Byte;
+struct String_convert;
 
-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;
+#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;
@@ -30,10 +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;
@@ -47,7 +42,6 @@ typedef unsigned U32;
 typedef int I32;
 typedef long long I64;
 
-typedef unsigned char Byte;
 
 struct Duration;
 struct Duration_iterator;
@@ -58,7 +52,4 @@ struct File_storage;
 struct Mapped_file_storage;
 struct Simple_file_storage;
 
-
-
-#endif // FPROTO_HH
-
+#endif /* FLOWER_PROTO_HH */