Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2013-11-05 02:22:54 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2013-11-05 02:22:54 +0400
commit93de84f267157c7e8558b2595e0dcdbbd45df7eb (patch)
treed684f042d479d33fa18e97b76e6706f675eae8f7 /source/gameengine/Rasterizer
parentee854a04fa8e38b00777eb65bbdb18dc409e3cab (diff)
Fix for recent BGE commits, when building with c++ guardedalloc.
Diffstat (limited to 'source/gameengine/Rasterizer')
-rw-r--r--source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h8
1 files changed, 5 insertions, 3 deletions
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
};