[Scummvm-cvs-logs] CVS: scummvm/common scummsys.h,1.42,1.43

Max Horn fingolfin at users.sourceforge.net
Sun Dec 21 11:25:04 CET 2003


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv28222/common

Modified Files:
	scummsys.h 
Log Message:
disable custom new/delete/free by default (only keep it around in case it comes in handy again in the future)

Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scummsys.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- scummsys.h	21 Dec 2003 16:45:16 -0000	1.42
+++ scummsys.h	21 Dec 2003 19:24:14 -0000	1.43
@@ -426,10 +426,9 @@
 	typedef int16 NewGuiColor;
 #endif
 
-#if !defined(__PALM_OS__) && !defined(MACOSX)
-	/* Initialized operator new */
-	// FIXME - get rid of these new/delete overrides!!! They conflict with the
-	// Standard C++ library, and they are only there to support lazy programmers anyway.
+/*
+#if !defined(__PALM_OS__)
+	// Initialized operator new
 	void * operator new(size_t size);
 	void operator delete(void *ptr);
 	
@@ -442,5 +441,6 @@
 	void free_check(void *ptr);
 	#endif
 #endif
+*/
 
 #endif





More information about the Scummvm-git-logs mailing list