Revert this change until I determine why it now crashes the app_server when it didn't during my tests.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25919 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -174,7 +174,7 @@ BList::RemoveItem(int32 index)
|
|||||||
if (index >= 0 && index < fItemCount) {
|
if (index >= 0 && index < fItemCount) {
|
||||||
item = fObjectList[index];
|
item = fObjectList[index];
|
||||||
move_items(fObjectList + index + 1, -1, fItemCount - index - 1);
|
move_items(fObjectList + index + 1, -1, fItemCount - index - 1);
|
||||||
Resize(fItemCount - 1);
|
Resize(fItemCount - 1);
|
||||||
}
|
}
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
@@ -433,17 +433,11 @@ bool
|
|||||||
BList::Resize(int32 count)
|
BList::Resize(int32 count)
|
||||||
{
|
{
|
||||||
bool result = true;
|
bool result = true;
|
||||||
|
|
||||||
// calculate the new physical size
|
// calculate the new physical size
|
||||||
// by doubling the existing size
|
int32 newSize = count;
|
||||||
// until we can hold at least count items
|
if (newSize <= 0)
|
||||||
int32 newSize = fBlockSize;
|
newSize = 1;
|
||||||
if (count <= 0)
|
newSize = ((newSize - 1) / fBlockSize + 1) * fBlockSize;
|
||||||
count = fBlockSize;
|
|
||||||
if ((size_t)count != fPhysicalSize)
|
|
||||||
while (newSize < count)
|
|
||||||
newSize <<= 1;
|
|
||||||
|
|
||||||
// resize if necessary
|
// resize if necessary
|
||||||
if ((size_t)newSize != fPhysicalSize) {
|
if ((size_t)newSize != fPhysicalSize) {
|
||||||
void** newObjectList
|
void** newObjectList
|
||||||
|
|||||||
Reference in New Issue
Block a user