[Bf-blender-cvs] [5f120f7] master: Fix for building with C++ guarded alloc

[Campbell Barton]

Commit: 5f120f7723584032a9ed7ddf4f921e3075db7f2d
Author: Campbell Barton
Date:   Tue Sep 8 17:49:21 2015 +1000
Branches: master
https://developer.blender.org/rB5f120f7723584032a9ed7ddf4f921e3075db7f2d

Fix for building with C++ guarded alloc

KX_WorldInfo is already inherits the overrides

===================================================================

M	source/gameengine/Ketsji/KX_WorldInfo.h

===================================================================

diff --git a/source/gameengine/Ketsji/KX_WorldInfo.h b/source/gameengine/Ketsji/KX_WorldInfo.h
index f2b37ec..b155faf 100644
--- a/source/gameengine/Ketsji/KX_WorldInfo.h
+++ b/source/gameengine/Ketsji/KX_WorldInfo.h
@@ -36,10 +36,6 @@
 #include "KX_KetsjiEngine.h"
 #include "EXP_PyObjectPlus.h"
 
-#ifdef WITH_CXX_GUARDEDALLOC
-#include "MEM_guardedalloc.h"
-#endif
-
 #ifdef USE_MATHUTILS
 void KX_WorldInfo_Mathutils_Callback_Init(void);
 #endif
@@ -104,10 +100,6 @@ public:
 	static int pyattr_set_ambient_color(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 	virtual PyObject *py_repr(void);
 #endif
-
-#ifdef WITH_CXX_GUARDEDALLOC
-	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_WorldInfo")
-#endif
 };
 
 #endif  /* __KX_WORLDINFO_H__ */