partial: 0.1.57.jcn

[lilypond.git] / flower / include / fproto.hh

diff --git a/flower/include/fproto.hh b/flower/include/fproto.hh
index 030157cbe458fe9f1fbdb6d336e953181ac4312e..5c491d61144622fccc6bafdfaf6a22c259ddb42f 100644 (file)
--- a/flower/include/fproto.hh
+++ b/flower/include/fproto.hh
@@ -11,7 +11,7 @@
 char const * flower_version_sz();
 
 // what the F*** is "int" ?
-// depreciate int, long, etc., use i32, i64, remember: linux-16/linux-64 ?
+// deprecate int, long, etc., use i32, i64, remember: linux-16/linux-64 ?
 /// (i32)
 typedef int i32;
 /// (i64)
@@ -20,15 +20,17 @@ typedef long long I64;
 template<class T> struct Array;
 template<class T> struct sstack;
 template<class T,class K> struct Assoc;
+template<class T> struct Dictionary;
+template<class T> struct Dictionary_iter;
 template<class T> struct List;
-template<class T> struct PointerList;
-template<class T> struct IPointerList;
+template<class T> struct Link_list;
+template<class T> struct Pointer_list;
 template<class T> struct Cursor;
 template<class T> struct PCursor;
 template<class T> struct Link;
 template<class T> struct Handle;
 template<class T> struct Interval_t;
-template<class T,class Q> struct PQueue;
+template<class T> struct PQueue;
 
 #include "real.hh"
 
@@ -37,18 +39,34 @@ typedef Interval_t<Real> Interval;
 struct Choleski_decomposition;
 
 struct Long_option_init;
+struct File_path;
+struct Directed_graph_node;
 struct Getopt_long;
 struct Matrix;
 struct String_data;
+struct FlowerString;
 struct String_handle;
 struct String_convert;
 struct String;
 struct Matrix_storage;
 struct Vector ;
+struct MyRational;
+
+
+#if PARANOIA
+#ifndef Rational
+#define Rational MyRational
+#endif
+#else
+struct Rational;
+#endif
+
 struct Text_stream;
 struct Data_file;
 struct Text_db;
 struct Scalar;
 typedef unsigned char Byte;
+
+
 #endif // FPROTO_HH