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 91e2e36aae59a7969636a8df3b16b5f28ebd2e38..8246d09fe3b93b5bba5fca71ad9e49aec79fa501 100644 (file)
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -1,8 +1,7 @@
-
 /*
   fflower-proto.hh -- typenames in flowerlib
 
-  (c) 1996--2006 Han-Wen Nienhuys
+  (c) 1996--2007 Han-Wen Nienhuys
 */
 
 #ifndef FLOWER_PROTO_HH
@@ -10,30 +9,17 @@
 
 char const *flower_version_str0 ();
 
-template<class T, class K> struct Assoc;
-template<class K, class V> struct Hash_table;
-template<class K, class V> struct Hash_table_iter;
-
 typedef unsigned char Byte;
 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;
 template<class T> struct Interval_t;
 template<class T> struct PQueue;
-
+template<class T, class A> class Matrix;
 
 typedef Interval_t<Real> Interval;