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

* BinaryInsertUnique() didn't work at all.

Browse Source 
* both, BinaryInsert() and BinaryInsertUnique() now propagate the result of
  the AddItem() call - which could fail because of low memory.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14825 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-11-10 15:31:18 +00:00
parent 2522a90fd1
commit d5f377d66c
1 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/shared/ObjectList.h
+29 -33
View File
@@ -198,9 +198,9 @@ public:
// these to work // these to work
// simple insert // simple insert
void BinaryInsert(T *, CompareFunction); bool BinaryInsert(T *, CompareFunction);
void BinaryInsert(T *, CompareFunctionWithState, void *state); bool BinaryInsert(T *, CompareFunctionWithState, void *state);
void BinaryInsert(T *, const UnaryPredicate<T> &); bool BinaryInsert(T *, const UnaryPredicate<T> &);
// unique insert, returns false if item already in list // unique insert, returns false if item already in list
bool BinaryInsertUnique(T *, CompareFunction); bool BinaryInsertUnique(T *, CompareFunction);
@@ -216,7 +216,6 @@ public:
T *BinaryInsertCopyUnique(const T &copyThis, CompareFunction); T *BinaryInsertCopyUnique(const T &copyThis, CompareFunction);
T *BinaryInsertCopyUnique(const T &copyThis, CompareFunctionWithState, void *state); T *BinaryInsertCopyUnique(const T &copyThis, CompareFunctionWithState, void *state);
int32 FindBinaryInsertionIndex(const UnaryPredicate<T> &, bool *alreadyInList = 0) const; int32 FindBinaryInsertionIndex(const UnaryPredicate<T> &, bool *alreadyInList = 0) const;
// returns either the index into which a new item should be inserted // returns either the index into which a new item should be inserted
// or index of an existing item that matches the predicate // or index of an existing item that matches the predicate
@@ -399,7 +398,6 @@ BObjectList<T>::~BObjectList()
if (Owning()) if (Owning())
// have to nuke elements first // have to nuke elements first
MakeEmpty(); MakeEmpty();
} }
template<class T> template<class T>
@@ -641,55 +639,55 @@ BObjectList<T>::BinarySearch(const T &key, CompareFunctionWithState func, void *
} }
template<class T> template<class T>
void bool
BObjectList<T>::BinaryInsert(T *item, CompareFunction func) BObjectList<T>::BinaryInsert(T *item, CompareFunction func)
{ {
int32 index = _PointerList_::BinarySearchIndex(item, int32 index = _PointerList_::BinarySearchIndex(item,
(GenericCompareFunction)func); (GenericCompareFunction)func);
if (index >= 0) if (index >= 0) {
// already in list, add after existing // already in list, add after existing
AddItem(item, index + 1); return AddItem(item, index + 1);
else }
AddItem(item, -index - 1);
}
template<class T> return AddItem(item, -index - 1);
void
BObjectList<T>::BinaryInsert(T *item, CompareFunctionWithState func, void *state)
{
int32 index = _PointerList_::BinarySearchIndex(item,
(GenericCompareFunctionWithState)func, state);
if (index >= 0)
// already in list, add after existing
AddItem(item, index + 1);
else
AddItem(item, -index - 1);
} }
template<class T> template<class T>
bool bool
BObjectList<T>::BinaryInsertUnique(T *, CompareFunction func) BObjectList<T>::BinaryInsert(T *item, CompareFunctionWithState func, void *state)
{
int32 index = _PointerList_::BinarySearchIndex(item,
(GenericCompareFunctionWithState)func, state);
if (index >= 0) {
// already in list, add after existing
return AddItem(item, index + 1);
}
return AddItem(item, -index - 1);
}
template<class T>
bool
BObjectList<T>::BinaryInsertUnique(T *item, CompareFunction func)
{ {
int32 index = _PointerList_::BinarySearchIndex(item, int32 index = _PointerList_::BinarySearchIndex(item,
(GenericCompareFunction)func); (GenericCompareFunction)func);
if (index >= 0) if (index >= 0)
return false; return false;
AddItem(item, -index - 1); return AddItem(item, -index - 1);
return true;
} }
template<class T> template<class T>
bool bool
BObjectList<T>::BinaryInsertUnique(T *, CompareFunctionWithState func, void *state) BObjectList<T>::BinaryInsertUnique(T *item, CompareFunctionWithState func, void *state)
{ {
int32 index = _PointerList_::BinarySearchIndex(item, int32 index = _PointerList_::BinarySearchIndex(item,
(GenericCompareFunctionWithState)func, state); (GenericCompareFunctionWithState)func, state);
if (index >= 0) if (index >= 0)
return false; return false;
AddItem(item, -index - 1); return AddItem(item, -index - 1);
return true;
} }
@@ -776,11 +774,10 @@ BObjectList<T>::FindBinaryInsertionIndex(const UnaryPredicate<T> &pred, bool *al
} }
template<class T> template<class T>
void bool
BObjectList<T>::BinaryInsert(T *item, const UnaryPredicate<T> &pred) BObjectList<T>::BinaryInsert(T *item, const UnaryPredicate<T> &pred)
{ {
int32 index = FindBinaryInsertionIndex(pred); return AddItem(item, FindBinaryInsertionIndex(pred));
AddItem(item, index);
} }
template<class T> template<class T>
@@ -796,5 +793,4 @@ BObjectList<T>::BinaryInsertUnique(T *item, const UnaryPredicate<T> &pred)
return true; return true;
} }
#endif /* __OBJECT_LIST__ */
#endif