diff --git a/Sources/Plasma/CoreLib/hsMalloc.h b/Sources/Plasma/CoreLib/hsMalloc.h index 0cdb2e40..f60cc0b1 100644 --- a/Sources/Plasma/CoreLib/hsMalloc.h +++ b/Sources/Plasma/CoreLib/hsMalloc.h @@ -166,7 +166,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 ZERO(s) MemSet(&s, 0, sizeof(s)) #define ZEROPTR(p) MemSet(p, 0, sizeof(*p)) diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp b/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp index 11ac920f..52a74857 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp +++ b/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp @@ -95,7 +95,7 @@ unsigned CBaseArray::CalcAllocGrowth (unsigned newAlloc, unsigned oldAlloc, unsi void * CBaseArray::ReallocPtr (void * ptr, unsigned bytes) { void * newPtr = nil; if (bytes) { - newPtr = ALLOCFLAGS(bytes, ARR_MEMORY_FLAGS); + newPtr = malloc(bytes); } return newPtr; } diff --git a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h b/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h index e20c737f..a804c012 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h +++ b/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h @@ -67,8 +67,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define SORTARRAYTYPE(type) TSortArray< type, TArrayCopyBits< type >, type, 0> #define SORTARRAYTYPEOBJ(type) TSortArray< type, TArrayCopyObject< type >, type, 0> -#define ARR_MEMORY_FLAGS 0 /*| kMemIgnoreBlock*/ - /**************************************************************************** * @@ -449,7 +447,7 @@ template TFArray::TFArray (unsigned count) { m_alloc = m_count = count; if (count) { - m_data = (T *)ALLOCFLAGS(count * sizeof(T), ARR_MEMORY_FLAGS); + m_data = (T *)malloc(count * sizeof(T)); C::Construct(m_data, count); } else @@ -461,7 +459,7 @@ template TFArray::TFArray (const T * source, unsigned count) { m_alloc = m_count = count; if (count) { - m_data = (T *)ALLOCFLAGS(count * sizeof(T), ARR_MEMORY_FLAGS); + m_data = (T *)malloc(count * sizeof(T)); C::CopyConstruct(m_data, source, count); } else @@ -473,7 +471,7 @@ template TFArray::TFArray (const TFArray & source) { m_alloc = m_count = source.m_count; if (m_count) { - m_data = (T *)ALLOCFLAGS(m_count * sizeof(T), ARR_MEMORY_FLAGS); + m_data = (T *)malloc(m_count * sizeof(T)); C::CopyConstruct(m_data, source.m_data, m_count); } else