From ac59f755238feb7f880b96d7fb44926d3e22882e Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 12 Sep 2004 00:14:34 +0000 Subject: [PATCH] Fixed memory allocation --- dlls/fakemeta/sdk/amxxmodule.cpp | 12 ++++-------- dlls/fakemeta/sdk/amxxmodule.h | 4 ---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/fakemeta/sdk/amxxmodule.cpp b/dlls/fakemeta/sdk/amxxmodule.cpp index f6a95cb3..1d01d24c 100755 --- a/dlls/fakemeta/sdk/amxxmodule.cpp +++ b/dlls/fakemeta/sdk/amxxmodule.cpp @@ -2689,8 +2689,6 @@ void ValidateMacros_DontCallThis_Smiley() } #endif -#ifdef MEMORY_TEST - /************* MEMORY *************/ // undef all defined macros #undef new @@ -2804,7 +2802,7 @@ void *operator new(size_t reportedSize) return ptr; // allocation failed - throw std::bad_alloc(); + } void *operator new[](size_t reportedSize) @@ -2817,7 +2815,7 @@ void *operator new[](size_t reportedSize) return ptr; // allocation failed - throw std::bad_alloc(); + } // Microsoft memory tracking operators @@ -2831,7 +2829,7 @@ void *operator new(size_t reportedSize, const char *sourceFile, int sourceLine) return ptr; // allocation failed - throw std::bad_alloc(); + } void *operator new[](size_t reportedSize, const char *sourceFile, int sourceLine) { @@ -2843,7 +2841,7 @@ void *operator new[](size_t reportedSize, const char *sourceFile, int sourceLine return ptr; // allocation failed - throw std::bad_alloc(); + } void operator delete(void *reportedAddress) @@ -2862,8 +2860,6 @@ void operator delete[](void *reportedAddress) Mem_Deallocator(g_Mem_CurrentFilename, g_Mem_CurrentLine, g_Mem_CurrentFunc, m_alloc_delete_array, reportedAddress); } -#endif - /************* stuff from dlls/util.cpp *************/ // must come here because cbase.h declares it's own operator new diff --git a/dlls/fakemeta/sdk/amxxmodule.h b/dlls/fakemeta/sdk/amxxmodule.h index c3d0eb42..8cb630c1 100755 --- a/dlls/fakemeta/sdk/amxxmodule.h +++ b/dlls/fakemeta/sdk/amxxmodule.h @@ -2122,8 +2122,6 @@ void MF_Log(const char *fmt, ...); #define MF_UnregisterSPForward g_fn_UnregisterSPForward #define MF_GetPlayerFlags g_fn_GetPlayerFlags -#ifdef MEMORY_TEST - /*** Memory ***/ void *operator new(size_t reportedSize); void *operator new[](size_t reportedSize); @@ -2167,6 +2165,4 @@ void Mem_Deallocator(const char *sourceFile, const unsigned int sourceLine, cons #define realloc(ptr,sz) Mem_Reallocator(__FILE__,__LINE__,__FUNCTION__,m_alloc_realloc,sz,ptr) #define free(ptr) Mem_Deallocator(__FILE__,__LINE__,__FUNCTION__,m_alloc_free,ptr) -#endif //MEMORY_TEST - #endif // #ifndef __AMXXMODULE_H__