*** empty log message ***

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

diff --git a/flower/include/parray.hh b/flower/include/parray.hh
index 21a40429c60af407a835c0525f9b7bfe56bc26b0..bbaf1275ee65066a6ff6ca14f6b391dbbabcf23b 100644 (file)
--- a/flower/include/parray.hh
+++ b/flower/include/parray.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -130,7 +130,7 @@ public:
   Array<void*>::size;
   Array<void*>::clear;
   Array<void*>::set_size;
-  Array<void*>::empty;
+  Array<void*>::is_empty;
   Array<void*>::reverse;
   Array<void*>::tighten_maxsize;
 
@@ -235,14 +235,14 @@ junk_pointers (Link_array<T> &a)
 */
 template<class T>
 int
-binsearchs (Array<T> const &arr, T t, int (*compare) (T const&,T const&))
+binsearch (Array<T> const &arr, T t, int (*compare) (T const&,T const&))
 {
   int lo;
   int hi;
   int cmp;
   int result;
   lo = 0;
-  hi = maxkey;
+  hi = Array<T>::maxkey;
 
   /* binary search */
   do
@@ -283,7 +283,7 @@ binsearch_links (Link_array<T> const &arr, T *t,
   {
       cmp = (lo + hi) / 2;
 
-      result = compare (t, arr[cmp]);
+      result = (*compare) (t, arr[cmp]);
 
       if (result < 0)
           hi = cmp;