Fix the debugging 'new' defines for Windows

livecodefraser · livecodefraser · commit a2213ccae287 · 2016-10-07T12:15:39.000+01:00
They didn't supply the correct overloads, breaking most uses of 'new'
when compiling in debug mode.
diff --git a/engine/src/sysdefs.h b/engine/src/sysdefs.h
@@ -279,10 +279,10 @@ typedef struct __MCWinSysEnhMetafileHandle *MCWinSysEnhMetafileHandle;
 
 #define _DEBUG_MEMORY
 
-inline void *operator new(size_t size, const char *fnm, int line) {return _malloc_dbg(size, _NORMAL_BLOCK, fnm, line);}
-inline void *operator new[](size_t size, const char *fnm, int line) {return _malloc_dbg(size, _NORMAL_BLOCK, fnm, line);}
+inline void *operator new(size_t size, std::nothrow_t, const char *fnm, int line) throw () {return _malloc_dbg(size, _NORMAL_BLOCK, fnm, line);}
+inline void *operator new[](size_t size, std::nothrow_t, const char *fnm, int line) throw () {return _malloc_dbg(size, _NORMAL_BLOCK, fnm, line);}
 
-inline void *operator new(size_t, void *p, const char *, int)
+inline void *operator new(size_t, void *p, const char *, long)
 {
 	return p;
 }
diff --git a/revdb/src/dbdriver.h b/revdb/src/dbdriver.h
@@ -31,18 +31,20 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #define _CRTDBG_MAP_ALLOC
 #include <crtdbg.h>
 
-inline void *operator new(size_t size, const char *fnm, int line)
-{
-	return _malloc_dbg(size, _NORMAL_BLOCK, fnm, line);
-}
+#define _DEBUG_MEMORY
+#undef new
+#undef delete
 
-inline void *operator new[](size_t size, const char *fnm, int line)
+inline void *operator new(size_t size, std::nothrow_t, const char *fnm, int line) throw () {return _malloc_dbg(size, _NORMAL_BLOCK, fnm, line);}
+inline void *operator new[](size_t size, std::nothrow_t, const char *fnm, int line) throw () {return _malloc_dbg(size, _NORMAL_BLOCK, fnm, line);}
+
+inline void *operator new(size_t, void *p, const char *, long)
 {
-	return _malloc_dbg(size, _NORMAL_BLOCK, fnm, line);
+	return p;
 }
 
-#define new new(__FILE__, __LINE__)
-
+#define new(...) new(__VA_ARGS__, __FILE__, __LINE__ )
+#define delete delete
 #endif
 
 

Original file line number	Diff line number	Diff line change
`@@ -279,10 +279,10 @@ typedef struct __MCWinSysEnhMetafileHandle *MCWinSysEnhMetafileHandle;`
`279`	`279`
`280`	`280`	`#define _DEBUG_MEMORY`
`281`	`281`
`282`		`-inline void operator new(size_t size, const char fnm, int line) {return _malloc_dbg(size, _NORMAL_BLOCK, fnm, line);}`
`283`		`-inline void operator new[](size_t size, const char fnm, int line) {return _malloc_dbg(size, _NORMAL_BLOCK, fnm, line);}`
	`282`	`+inline void operator new(size_t size, std::nothrow_t, const char fnm, int line) throw () {return _malloc_dbg(size, _NORMAL_BLOCK, fnm, line);}`
	`283`	`+inline void operator new[](size_t size, std::nothrow_t, const char fnm, int line) throw () {return _malloc_dbg(size, _NORMAL_BLOCK, fnm, line);}`
`284`	`284`
`285`		`-inline void operator new(size_t, void p, const char *, int)`
	`285`	`+inline void operator new(size_t, void p, const char *, long)`
`286`	`286`	`{`
`287`	`287`	`return p;`
`288`	`288`	`}`