|
|
|
@@ -184,7 +184,7 @@ public: |
|
|
|
: numChannels (other.numChannels),
|
|
|
|
size (other.size),
|
|
|
|
allocatedBytes (other.allocatedBytes),
|
|
|
|
channels (other.channels),
|
|
|
|
channels (numChannels < (int) numElementsInArray (preallocatedChannelSpace) ? preallocatedChannelSpace : other.channels),
|
|
|
|
allocatedData (static_cast<HeapBlock<char, true>&&> (other.allocatedData)),
|
|
|
|
isClear (other.isClear)
|
|
|
|
{
|
|
|
|
@@ -200,7 +200,7 @@ public: |
|
|
|
numChannels = other.numChannels;
|
|
|
|
size = other.size;
|
|
|
|
allocatedBytes = other.allocatedBytes;
|
|
|
|
channels = other.channels;
|
|
|
|
channels = numChannels < (int) numElementsInArray (preallocatedChannelSpace) ? preallocatedChannelSpace : other.channels;
|
|
|
|
allocatedData = static_cast<HeapBlock<char, true>&&> (other.allocatedData);
|
|
|
|
isClear = other.isClear;
|
|
|
|
memcpy (preallocatedChannelSpace, other.preallocatedChannelSpace, sizeof (preallocatedChannelSpace));
|
|
|
|
|