Fix for recent BGE commits, when building with c++ guardedalloc.

2013-11-04 22:22:54 +00:00
parent ee854a04fa
commit 93de84f267
2 changed files with 10 additions and 3 deletions
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h
@@ -28,6 +28,10 @@
 #ifndef __KX_STORAGE
 #define __KX_STORAGE

+#ifdef WITH_CXX_GUARDEDALLOC
+  #include "MEM_guardedalloc.h"
+#endif
+
 class RAS_MeshSlot;

 class RAS_IStorage
@@ -46,9 +50,7 @@ public:


 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_IStorage"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_IStorage")
 #endif
 };