diff --git a/src/openrct2/core/Memory.hpp b/src/openrct2/core/Memory.hpp index e24d410c06..eef2c28451 100644 --- a/src/openrct2/core/Memory.hpp +++ b/src/openrct2/core/Memory.hpp @@ -34,13 +34,6 @@ namespace OpenRCT2::Memory return result; } - template static T* AllocateArray(size_t count) - { - T* result = static_cast(malloc(count * sizeof(T))); - Guard::ArgumentNotNull(result, "Failed to allocate array of %zu * %s (%zu bytes)", count, typeid(T).name(), sizeof(T)); - return result; - } - template static T* Reallocate(T* ptr, size_t size) { T* result; @@ -56,33 +49,9 @@ namespace OpenRCT2::Memory return result; } - template static T* ReallocateArray(T* ptr, size_t count) - { - T* result; - if (ptr == nullptr) - { - result = static_cast(malloc(count * sizeof(T))); - } - else - { - result = static_cast(realloc(reinterpret_cast(ptr), count * sizeof(T))); - } - Guard::ArgumentNotNull( - result, "Failed to reallocate array at %x (%s) to have %zu entries", ptr, typeid(T).name(), count); - return result; - } - template static void Free(T* ptr) { free(const_cast(reinterpret_cast(ptr))); } - template static void FreeArray(T* ptr, size_t count) - { - for (size_t i = 0; i < count; i++) - { - ptr[i].~T(); - } - Free(ptr); - } } // namespace OpenRCT2::Memory