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

2 files changed, 10 insertions, 3 deletions

diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index ecb894c1e8d..194a47ae2df 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -441,6 +441,11 @@ public:
 		btVector3 vec = getWalkDirection();
 		return MT_Vector3(vec[0], vec[1], vec[2]);
 	}
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	using PHY_ICharacter::operator new;
+	using PHY_ICharacter::operator delete;
+#endif
 };
 
 ///CcdPhysicsController is a physics object that supports continuous collision detection and time of impact based physics resolution.
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h
index 5a803115553..bfa6e1a6cb7 100644
--- 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
 };