diff --git a/r5dev/public/tier0/imemalloc.h b/r5dev/public/tier0/imemalloc.h index db530823..a33b72e9 100644 --- a/r5dev/public/tier0/imemalloc.h +++ b/r5dev/public/tier0/imemalloc.h @@ -87,19 +87,11 @@ struct MemAllocFileLine_t #endif //----------------------------------------------------------------------------- - -#if (defined(_DEBUG) || defined(USE_MEM_DEBUG)) -#define MEM_ALLOC_CREDIT_(tag) CMemAllocAttributeAlloction memAllocAttributeAlloction( tag, __LINE__ ) -#define MemAlloc_PushAllocDbgInfo( pszFile, line ) g_pMemAlloc->PushAllocDbgInfo( pszFile, line ) -#define MemAlloc_PopAllocDbgInfo() g_pMemAlloc->PopAllocDbgInfo() -#define MemAlloc_RegisterAllocation( pFileName, nLine, nLogicalSize, nActualSize, nTime ) g_pMemAlloc->RegisterAllocation( pFileName, nLine, nLogicalSize, nActualSize, nTime ) -#define MemAlloc_RegisterDeallocation( pFileName, nLine, nLogicalSize, nActualSize, nTime ) g_pMemAlloc->RegisterDeallocation( pFileName, nLine, nLogicalSize, nActualSize, nTime ) -#else +// Stubbed, not used for anything!!! #define MEM_ALLOC_CREDIT_(tag) ((void)0) #define MemAlloc_PushAllocDbgInfo( pszFile, line ) ((void)0) #define MemAlloc_PopAllocDbgInfo() ((void)0) #define MemAlloc_RegisterAllocation( pFileName, nLine, nLogicalSize, nActualSize, nTime ) ((void)0) #define MemAlloc_RegisterDeallocation( pFileName, nLine, nLogicalSize, nActualSize, nTime ) ((void)0) -#endif #endif /* TIER0_MEMALLOC_H */ \ No newline at end of file diff --git a/r5dev/tier0/dbg.cpp b/r5dev/tier0/dbg.cpp index f0787a44..2c9f1301 100644 --- a/r5dev/tier0/dbg.cpp +++ b/r5dev/tier0/dbg.cpp @@ -80,7 +80,7 @@ bool HushAsserts() #ifdef TCHAR_IS_CHAR Assert(!IsBadStringPtr(ptr, maxchar)); #else - Assert(!IsBadStringPtrW(ptr, maxchar)); + Assert(!IsBadStringPtr(ptr, maxchar)); #endif #else Assert(ptr);