mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-27 02:20:05 +00:00
Code Activity

New class HeapBlock, which provides a safe and object-oriented way to allocate heap space. I've used HeapBlocks to replace almost all uses of malloc/free throughout the codebase.

Browse source
This commit is contained in:
Julian Storer 2010-01-02 14:55:44 +00:00
parent 8c988319ec
commit 4ed1d791e5
86 changed files with 22712 additions and 22630 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/containers/juce_BitArray.cpp
View file

@ -39,7 +39,7 @@ BitArray::BitArray() throw()
highestBit (-1),
negative (false)
{
values = (unsigned int*) juce_calloc (sizeof (unsigned int) * (numValues + 1));
values.calloc (numValues + 1);
}
BitArray::BitArray (const int value) throw()
@ -47,7 +47,7 @@ BitArray::BitArray (const int value) throw()
highestBit (31),
negative (value < 0)
{
values = (unsigned int*) juce_calloc (sizeof (unsigned int) * (numValues + 1));
values.calloc (numValues + 1);
values[0] = abs (value);
highestBit = getHighestBit();
}
@ -57,7 +57,7 @@ BitArray::BitArray (int64 value) throw()
highestBit (63),
negative (value < 0)
{
values = (unsigned int*) juce_calloc (sizeof (unsigned int) * (numValues + 1));
values.calloc (numValues + 1);
if (value < 0)
value = -value;
@ -72,7 +72,7 @@ BitArray::BitArray (const unsigned int value) throw()
highestBit (31),
negative (false)
{
values = (unsigned int*) juce_calloc (sizeof (unsigned int) * (numValues + 1));
values.calloc (numValues + 1);
values[0] = value;
highestBit = getHighestBit();
}
@ -82,28 +82,23 @@ BitArray::BitArray (const BitArray& other) throw()
highestBit (other.getHighestBit()),
negative (other.negative)
{
const int bytes = sizeof (unsigned int) * (numValues + 1);
values = (unsigned int*) juce_malloc (bytes);
memcpy (values, other.values, bytes);
values.malloc (numValues + 1);
memcpy (values, other.values, sizeof (unsigned int) * (numValues + 1));
}
BitArray::~BitArray() throw()
{
juce_free (values);
}
const BitArray& BitArray::operator= (const BitArray& other) throw()
{
if (this != &other)
{
juce_free (values);
highestBit = other.getHighestBit();
numValues = jmax (4, (highestBit >> 5) + 1);
negative = other.negative;
const int memSize = sizeof (unsigned int) * (numValues + 1);
values = (unsigned int*)juce_malloc (memSize);
memcpy (values, other.values, memSize);
values.malloc (numValues + 1);
memcpy (values, other.values, sizeof (unsigned int) * (numValues + 1));
}
return *this;
@ -167,9 +162,8 @@ void BitArray::clear() throw()
{
if (numValues > 16)
{
juce_free (values);
numValues = 4;
values = (unsigned int*) juce_calloc (sizeof (unsigned int) * (numValues + 1));
values.calloc (numValues + 1);
}
else
{
@ -821,7 +815,7 @@ void BitArray::ensureSize (const int numVals) throw()
{
int oldSize = numValues;
numValues = ((numVals + 2) * 3) / 2;
values = (unsigned int*) juce_realloc (values, sizeof (unsigned int) * numValues + 4);
values.realloc (numValues + 1);
while (oldSize < numValues)
values [oldSize++] = 0;