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:
authorCampbell Barton <ideasman42@gmail.com>2012-06-25 13:14:37 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-25 13:14:37 +0400
commitcc0784c1b9c4d813837dedddd5b2b4c52fe291f0 (patch)
treec898623170b1576dddeb38f1ef30aa3cc83d6567 /source/gameengine/Ketsji/KX_OrientationInterpolator.h
parent78196d60d1a4585c613f822040f7dc339b9558b4 (diff)
optionally use guarded alloc for tiles compositor, also replace allocation functions with a macro.
Diffstat (limited to 'source/gameengine/Ketsji/KX_OrientationInterpolator.h')
-rw-r--r--source/gameengine/Ketsji/KX_OrientationInterpolator.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_OrientationInterpolator.h b/source/gameengine/Ketsji/KX_OrientationInterpolator.h
index 1a4ed534d16..59014b70174 100644
--- a/source/gameengine/Ketsji/KX_OrientationInterpolator.h
+++ b/source/gameengine/Ketsji/KX_OrientationInterpolator.h
@@ -56,9 +56,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
-private:
- void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_OrientationInterpolator"); }
- void operator delete( void *mem ) { MEM_freeN(mem); }
+ MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_OrientationInterpolator")
#endif
};