i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Made the return value of BObjectList::BinarySearch() non-const.

Browse Source 
* Added BObjectList::BinarySearchByKey() methods.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30292 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-04-21 12:15:42 +00:00
parent 113a493073
commit a2d8979e55
1 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/shared/ObjectList.h
+37 -6
View File
@@ -192,8 +192,16 @@ public:
T *FindIf(const UnaryPredicate<T> &); T *FindIf(const UnaryPredicate<T> &);
// list must be sorted with CompareFunction for these to work // list must be sorted with CompareFunction for these to work
const T *BinarySearch(const T &, CompareFunction) const; T *BinarySearch(const T &, CompareFunction) const;
const T *BinarySearch(const T &, CompareFunctionWithState, void *state) const; T *BinarySearch(const T &, CompareFunctionWithState, void *state) const;
template<typename Key>
T *BinarySearchByKey(const Key &key, int (*compare)(const Key *, const T *))
const;
template<typename Key>
T *BinarySearchByKey(const Key &key,
int (*compare)(const Key *, const T *, void *), void *state) const;
// Binary insertion - list must be sorted with CompareFunction for // Binary insertion - list must be sorted with CompareFunction for
// these to work // these to work
@@ -624,21 +632,44 @@ BObjectList<T>::HSortItems(CompareFunctionWithState function, void *state)
} }
template<class T> template<class T>
const T * T *
BObjectList<T>::BinarySearch(const T &key, CompareFunction func) const BObjectList<T>::BinarySearch(const T &key, CompareFunction func) const
{ {
return (const T *)_PointerList_::BinarySearch(&key, return (T*)_PointerList_::BinarySearch(&key,
(GenericCompareFunction)func); (GenericCompareFunction)func);
} }
template<class T> template<class T>
const T * T *
BObjectList<T>::BinarySearch(const T &key, CompareFunctionWithState func, void *state) const BObjectList<T>::BinarySearch(const T &key, CompareFunctionWithState func, void *state) const
{ {
return (const T *)_PointerList_::BinarySearch(&key, return (T*)_PointerList_::BinarySearch(&key,
(GenericCompareFunctionWithState)func, state); (GenericCompareFunctionWithState)func, state);
} }
template<class T>
template<typename Key>
T *
BObjectList<T>::BinarySearchByKey(const Key &key,
int (*compare)(const Key *, const T *)) const
{
return (T*)_PointerList_::BinarySearch(&key,
(GenericCompareFunction)compare);
}
template<class T>
template<typename Key>
T *
BObjectList<T>::BinarySearchByKey(const Key &key,
int (*compare)(const Key *, const T *, void *), void *state) const
{
return (T*)_PointerList_::BinarySearch(&key,
(GenericCompareFunctionWithState)compare, state);
}
template<class T> template<class T>
bool bool
BObjectList<T>::BinaryInsert(T *item, CompareFunction func) BObjectList<T>::BinaryInsert(T *item, CompareFunction func)