(Paper_column): copy rank_. This fixes

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

diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index cad9bff1f2cf1672bb55dbb56e84f310013f387b..1b8ceabe4b6720affe98cdc2274082d067c7a77e 100644 (file)
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -2,23 +2,20 @@
 /*
   fflower-proto.hh -- typenames in flowerlib
 
-  (c) 1996 Han-Wen Nienhuys
+  (c) 1996--2004 Han-Wen Nienhuys
 */
 
 #ifndef FPROTO_HH
 #define FPROTO_HH
 
 
-char const * flower_version_sz();
+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 Dictionary_iter;
-template<class T> struct Dictionary;
-template<class T> struct Dictionary_iter;
 template<class T> struct Link_list;
 template<class T> struct Interval_t;
 template<class T> struct PQueue;
@@ -26,12 +23,12 @@ template<class T> struct PQueue;
 #include "real.hh"
 
 typedef Interval_t<Real> Interval;
-typedef Interval_t<int> Slice; // junkme.
 
 struct Offset;
 struct Long_option_init;
 struct Rational;
-struct File_path;
+class File_name;
+class File_path;
 struct Getopt_long;
 struct String_data;
 struct String_handle;