summaryrefslogtreecommitdiffhomepage
path: root/FoundationEx
diff options
context:
space:
mode:
authorYasha Jannoo <alledodo@gmail.com>2019-09-10 01:08:21 +0100
committerYasha Jannoo <alledodo@gmail.com>2019-09-10 01:08:21 +0100
commit2e43457e9c7f328012f744adb4ac7e96f503b6df (patch)
treecf1c60593fd7c959c28f3da46a74ea1ce5d05760 /FoundationEx
parentf935fb0960b1563d6404d2fec21963b20f498a3b (diff)
downloadstarshatter-2e43457e9c7f328012f744adb4ac7e96f503b6df.zip
starshatter-2e43457e9c7f328012f744adb4ac7e96f503b6df.tar.gz
starshatter-2e43457e9c7f328012f744adb4ac7e96f503b6df.tar.bz2
Revert "Turn off Minimal Rebuild across the board"
This reverts commit f935fb0960b1563d6404d2fec21963b20f498a3b.
Diffstat (limited to 'FoundationEx')
-rw-r--r--FoundationEx/MemDebug.cpp15
-rw-r--r--FoundationEx/MemDebug.h19
2 files changed, 10 insertions, 24 deletions
diff --git a/FoundationEx/MemDebug.cpp b/FoundationEx/MemDebug.cpp
index 3e1c0f5..2694b33 100644
--- a/FoundationEx/MemDebug.cpp
+++ b/FoundationEx/MemDebug.cpp
@@ -61,21 +61,6 @@ static HANDLE mem_log_file = 0;
#define CrtClrDebugField(a) _CrtSetDbgFlag(~(a) & _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG))
#endif
-inline void* __cdecl operator new(unsigned int s, const char* f, int l)
-{
- return ::operator new(s, 1, f, l);
-}
-
-inline void* __cdecl operator new(unsigned int s)
-{
- return ::operator new(s, 1, __FILE__, __LINE__);
-}
-
-inline void __cdecl operator delete(void* p, const char*, int)
-{
- ::operator delete(p);
-}
-
static void heapdump()
{
_HEAPINFO hinfo;
diff --git a/FoundationEx/MemDebug.h b/FoundationEx/MemDebug.h
index 39e8dca..14bc0cf 100644
--- a/FoundationEx/MemDebug.h
+++ b/FoundationEx/MemDebug.h
@@ -51,8 +51,8 @@
#ifndef _DEBUG
-void* __cdecl operator new(unsigned int s, const char*, int) { return ::operator new(s); }
-void __cdecl operator delete(void* p, const char*, int) { ::operator delete(p); }
+inline void* __cdecl operator new(unsigned int s, const char*, int) { return ::operator new(s); }
+inline void __cdecl operator delete(void* p, const char*, int) { ::operator delete(p); }
#else
@@ -89,20 +89,21 @@ public:
#ifndef _DEBUG
-
-
-void* __cdecl operator new(unsigned int s, const char*, int) { return ::operator new(s); }
-void __cdecl operator delete(void* p, const char*, int) { ::operator delete(p); }
+inline void* __cdecl operator new(unsigned int s, const char*, int) { return ::operator new(s); }
+inline void __cdecl operator delete(void* p, const char*, int) { ::operator delete(p); }
#else
/*_CRTIMP*/
void* __cdecl operator new(unsigned int, int, const char*, int);
-void* __cdecl operator new(unsigned int s, const char* f, int l);
+inline void* __cdecl operator new(unsigned int s, const char* f, int l)
+ { return ::operator new(s, 1, f, l); }
-void* __cdecl operator new(unsigned int s);
+inline void* __cdecl operator new(unsigned int s)
+ { return ::operator new(s, 1, __FILE__, __LINE__); }
-void __cdecl operator delete(void* p, const char*, int);
+inline void __cdecl operator delete(void* p, const char*, int)
+ { ::operator delete(p); }
#endif _DEBUG