diff --git a/Sources/Plasma/CoreLib/hsMalloc.h b/Sources/Plasma/CoreLib/hsMalloc.h index 9bffcbb8..c68b543d 100644 --- a/Sources/Plasma/CoreLib/hsMalloc.h +++ b/Sources/Plasma/CoreLib/hsMalloc.h @@ -167,7 +167,6 @@ inline void CDECL operator delete (void *, void *) {} #define ALLOC(b) MemAlloc(b, 0, __FILE__, __LINE__) #define ALLOCZERO(b) MemAlloc(b, kMemZero, __FILE__, __LINE__) #define ALLOCFLAGS(b, f) MemAlloc(b, (f), __FILE__, __LINE__) -#define FREEFLAGS(p, f) MemFree(p, (f)) #define REALLOC(p, b) MemRealloc(p, b, 0, __FILE__, __LINE__) #define REALLOCFLAGS(p, b, f) MemRealloc(p, b, (f), __FILE__, __LINE__) #define CALLOC(n, s) MemAlloc((n)*(s), kMemZero, __FILE__, __LINE__) diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h b/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h index 09cb6e09..14f25042 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h +++ b/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h @@ -142,7 +142,7 @@ TBuffer::TBuffer (const TBuffer & source) { template TBuffer::~TBuffer () { if (m_data) - FREEFLAGS(m_data, ARR_MEMORY_FLAGS); + free(m_data); } //=========================================================================== @@ -181,7 +181,7 @@ T TBuffer::operator[] (unsigned index) const { template void TBuffer::Attach (T * source, unsigned count) { if (m_data) - FREEFLAGS(m_data, ARR_MEMORY_FLAGS); + free(m_data); m_data = source; ASSERT(MemSize(source) >= count * sizeof(T)); } @@ -196,7 +196,7 @@ unsigned TBuffer::Bytes () const { template void TBuffer::Clear () { if (m_data) { - FREEFLAGS(m_data, ARR_MEMORY_FLAGS); + free(m_data); m_data = nil; } } @@ -247,7 +247,7 @@ void TBuffer::SetBytes (unsigned bytes) { if (bytes) m_data = (T *)REALLOCFLAGS(m_data, bytes, ARR_MEMORY_FLAGS); else if (m_data) { - FREEFLAGS(m_data, ARR_MEMORY_FLAGS); + free(m_data); m_data = nil; } } @@ -539,7 +539,7 @@ void TFArray::AdjustSize (unsigned newAlloc, unsigned newCount) { C::CopyConstruct(newData, m_data, m_count); C::Destruct(m_data, m_count); if (m_data) - FREEFLAGS(m_data, ARR_MEMORY_FLAGS); + free(m_data); } m_alloc = newAlloc; m_data = newData; @@ -558,7 +558,7 @@ template void TFArray::Attach (T * source, unsigned count) { C::Destruct(m_data, m_count); if (m_data) - FREEFLAGS(m_data, ARR_MEMORY_FLAGS); + free(m_data); m_data = source; m_alloc = MemSize(source) / sizeof(T); m_count = count; @@ -570,7 +570,7 @@ template void TFArray::AttachTemp (T * source, unsigned count) { C::Destruct(m_data, m_count); if (m_data) - FREEFLAGS(m_data, ARR_MEMORY_FLAGS); + free(m_data); m_data = source; m_alloc = count; m_count = count; @@ -587,7 +587,7 @@ template void TFArray::Clear () { C::Destruct(m_data, m_count); if (m_data) - FREEFLAGS(m_data, ARR_MEMORY_FLAGS); + free(m_data); m_data = nil; m_alloc = m_count = 0; }