* The grand 2005-2006 replace.

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

diff --git a/flower/include/parray.hh b/flower/include/parray.hh
index 6395cd493e025364e92aae85c701ea4e33db214a..d7a4afba00005cecbe63a41bc8b563e0dad52b7f 100644 (file)
--- a/flower/include/parray.hh
+++ b/flower/include/parray.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PARRAY_HH
@@ -104,9 +104,7 @@ public:
       if (new_p)
        elem_ref (i) = new_p;
       else
-       {
-         unordered_del (i);
-       }
+       unordered_del (i);
   }
   void default_sort ()
   {
@@ -159,7 +157,7 @@ public:
     return (T *) Array<void *>::get (i);
   }
   Link_array<T>
-  slice (int l, int u)
+  slice (int l, int u) const
   {
     return Array<void *>::slice (l, u);
   }
@@ -219,9 +217,7 @@ void
 junk_pointers (Link_array<T> &a)
 {
   for (int i = 0; i < a.size (); i++)
-    {
-      delete a[i];
-    }
+    delete a[i];
   a.clear ();
 }
 
@@ -232,12 +228,10 @@ template<class T>
 int
 binsearch (Array<T> const &arr, T t, int (*compare) (T const &, T const &))
 {
-  int lo;
-  int hi;
   int cmp;
   int result;
-  lo = 0;
-  hi = Array<T>::maxkey;
+  int lo = 0;
+  int hi = arr.size ();
 
   /* binary search */
   do
@@ -262,13 +256,12 @@ binsearch (Array<T> const &arr, T t, int (*compare) (T const &, T const &))
 template<class T>
 int
 binsearch_links (Link_array<T> const &arr, T *t,
-                int (*compare) (T *const &, T *const &),
-                int lo = 0, int hi = -1)
+                int (*compare) (T *const &, T *const &))
 {
   int cmp;
   int result;
-  if (hi < 0)
-    hi = arr.size ();
+  int lo = 0;
+  int hi = arr.size ();
 
   if (hi == 0)
     return -1;