1 files changed, 28 insertions, 9 deletions
diff --git a/lout/container.hh b/lout/container.hh
index 14803140..03800efd 100644
--- a/lout/container.hh
+++ b/lout/container.hh
@@ -137,16 +137,23 @@ public:
     * Notice that insertion is not very efficient, unless the position
     * is rather at the end.
     */
-   inline void insertSorted(object::Object *newElement)
-   { insert (newElement, bsearch (newElement, false)); }
+   inline void insertSorted(object::Object *newElement,
+                            object::Comparator *comparator =
+                            &object::standardComparator)
+   { insert (newElement, bsearch (newElement, false, comparator)); }
 
    void remove(int pos);
    inline object::Object *get(int pos) const
    { return (pos >= 0 && pos < numElements) ? array[pos] : NULL; }
    inline int size() { return numElements; }
    void clear();
-   void sort();
-   int bsearch(Object *key, bool mustExist);
+   void sort(object::Comparator *comparator = &object::standardComparator);
+   int bsearch(Object *key, bool mustExist, int start, int end,
+               object::Comparator *comparator = &object::standardComparator);
+   inline int bsearch(Object *key, bool mustExist,
+                      object::Comparator *comparator =
+                      &object::standardComparator)
+   { return bsearch (key, mustExist, 0, size () - 1, comparator); }
 };
 
 
@@ -406,16 +413,28 @@ public:
    { ((untyped::Vector*)this->base)->put(newElement, newPos); }
    inline void insert(T *newElement, int pos)
    { ((untyped::Vector*)this->base)->insert(newElement, pos); }
-   inline void insertSorted(T *newElement)
-   { ((untyped::Vector*)this->base)->insertSorted(newElement); }
+   inline void insertSorted(T *newElement,
+                            object::Comparator *comparator =
+                            &object::standardComparator)
+   { ((untyped::Vector*)this->base)->insertSorted(newElement, comparator); }
    inline void remove(int pos) { ((untyped::Vector*)this->base)->remove(pos); }
    inline T *get(int pos) const
    { return (T*)((untyped::Vector*)this->base)->get(pos); }
    inline int size() const { return ((untyped::Vector*)this->base)->size(); }
    inline void clear() { ((untyped::Vector*)this->base)->clear(); }
-   inline void sort() { ((untyped::Vector*)this->base)->sort(); }
-   inline int bsearch(T *key, bool mustExist)
-   { return ((untyped::Vector*)this->base)->bsearch(key, mustExist); }
+   inline void sort(object::Comparator *comparator =
+                    &object::standardComparator)
+   { ((untyped::Vector*)this->base)->sort(comparator); }
+   inline int bsearch(T *key, bool mustExist, int start, int end,
+                      object::Comparator *comparator =
+                      &object::standardComparator)
+   { return ((untyped::Vector*)this->base)->bsearch(key, mustExist, start, end,
+                                                    comparator); }
+   inline int bsearch(T *key, bool mustExist,
+                      object::Comparator *comparator =
+                      &object::standardComparator)
+   { return ((untyped::Vector*)this->base)->bsearch(key, mustExist,
+                                                    comparator); }
 };