[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61101] trunk/blender/source/gameengine: Fix for recent BGE commits, when building with c++ guardedalloc.

[Bastien Montagne]

Revision: 61101
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61101
Author:   mont29
Date:     2013-11-04 22:22:54 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
Fix for recent BGE commits, when building with c++ guardedalloc.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h

Modified: trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h	2013-11-04 22:14:04 UTC (rev 61100)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h	2013-11-04 22:22:54 UTC (rev 61101)
@@ -441,6 +441,11 @@
 		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.

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h	2013-11-04 22:14:04 UTC (rev 61100)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h	2013-11-04 22:22:54 UTC (rev 61101)
@@ -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 @@
 
 
 #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
 };