1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 12:32:20 +02:00

Test fix, linux fix

This commit is contained in:
Brian Fiete 2019-11-19 13:36:51 -08:00
parent 503261e916
commit 68151e69ca
6 changed files with 117 additions and 35 deletions

View file

@ -257,10 +257,10 @@ private:
void Resize(intptr newSize, bool forceNewHashCodes)
{
BF_ASSERT(newSize >= mAllocSize);
int_cosize* newBuckets = (int_cosize*)rawAllocate(sizeof(int_cosize) * newSize);
int_cosize* newBuckets = (int_cosize*)this->rawAllocate(sizeof(int_cosize) * newSize);
for (int_cosize i = 0; i < newSize; i++)
newBuckets[i] = -1;
Entry* newEntries = (Entry*)rawAllocate(sizeof(Entry)*newSize);
Entry* newEntries = (Entry*)this->rawAllocate(sizeof(Entry)*newSize);
for (int i = 0; i < mCount; i++)
{
@ -294,8 +294,8 @@ private:
}
}
rawDeallocate(mBuckets);
rawDeallocate(mEntries);
this->rawDeallocate(mBuckets);
this->rawDeallocate(mEntries);
mBuckets = newBuckets;
mEntries = newEntries;
@ -332,10 +332,10 @@ private:
void Initialize(intptr capacity)
{
int_cosize size = GetPrimeish((int_cosize)capacity);
mBuckets = (int_cosize*)rawAllocate(sizeof(int_cosize) * size);
mBuckets = (int_cosize*)this->rawAllocate(sizeof(int_cosize) * size);
mAllocSize = size;
for (int_cosize i = 0; i < (int_cosize)mAllocSize; i++) mBuckets[i] = -1;
mEntries = (Entry*)rawAllocate(sizeof(Entry) * size);
mEntries = (Entry*)this->rawAllocate(sizeof(Entry) * size);
mFreeList = -1;
}
@ -431,8 +431,8 @@ public:
}
else
{
mBuckets = (int_cosize*)rawAllocate(sizeof(int_cosize) * mAllocSize);
mEntries = (Entry*)rawAllocate(sizeof(Entry) * mAllocSize);
mBuckets = (int_cosize*)this->rawAllocate(sizeof(int_cosize) * mAllocSize);
mEntries = (Entry*)this->rawAllocate(sizeof(Entry) * mAllocSize);
for (int_cosize i = 0; i < mAllocSize; i++)
mBuckets[i] = val.mBuckets[i];
@ -476,8 +476,8 @@ public:
}
}
rawDeallocate(mBuckets);
rawDeallocate(mEntries);
this->rawDeallocate(mBuckets);
this->rawDeallocate(mEntries);
}
HashSet& operator=(const HashSet& rhs)