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 cb8cb71bae8c61c01b25db395e91ba8ecf33a790..4421a619d7d3513ba67ba37697a42bc5bfc4b5b2 100644 (file)
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -1,7 +1,7 @@
 /*
   fflower-proto.hh -- typenames in flowerlib
 
-  (c) 1996--2006 Han-Wen Nienhuys
+  (c) 1996--2007 Han-Wen Nienhuys
 */
 
 #ifndef FLOWER_PROTO_HH
@@ -13,14 +13,13 @@ typedef unsigned char Byte;
 struct String_convert;
 
 #include "std-string.hh"
-#include "std-vector.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;
 
@@ -31,11 +30,6 @@ class File_name;
 class File_path;
 struct Getopt_long;
 
-struct Text_stream;
-struct Data_file;
-struct Text_db;
-struct Scalar;
-
 typedef unsigned char U8;
 typedef short I16;
 typedef unsigned short U16;
@@ -44,11 +38,6 @@ typedef int I32;
 typedef long long I64;
 
 
-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;