Skip to content

Commit 8633845

Browse files
committed
UPBGE: Remove C++ guardedalloc.
C++ guardedalloc is removed for multiples reasons: - It wans't used by default - It wasn't able to be used because of missing include of MEM_guardedalloc.h - It is not supported in most of the class worthing it - It warn the same way for inheritance class. - A valgrind pass could do same and more.
1 parent d679ab0 commit 8633845

File tree

99 files changed

+6
-643
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+6
-643
lines changed

source/gameengine/BlenderRoutines/KX_BlenderCanvas.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
#include "RAS_ICanvas.h"
4040
#include "RAS_Rect.h"
4141

42-
#ifdef WITH_CXX_GUARDEDALLOC
43-
#include "MEM_guardedalloc.h"
44-
#endif
45-
4642
struct ARegion;
4743
struct wmWindow;
4844
struct wmWindowManager;
@@ -114,10 +110,6 @@ class KX_BlenderCanvas : public RAS_ICanvas
114110

115111
virtual void BeginDraw();
116112
virtual void EndDraw();
117-
118-
#ifdef WITH_CXX_GUARDEDALLOC
119-
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderCanvas")
120-
#endif
121113
};
122114

123115
#endif // __KX_BLENDERCANVAS_H__

source/gameengine/Converter/BL_DeformableGameObject.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,6 @@ class BL_DeformableGameObject : public KX_GameObject
9696
double m_lastframe;
9797
Object* m_blendobj;
9898
short m_activePriority;
99-
100-
101-
#ifdef WITH_CXX_GUARDEDALLOC
102-
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_DeformableGameObject")
103-
#endif
10499
};
105100

106101
#endif /* __BL_DEFORMABLEGAMEOBJECT_H__ */

source/gameengine/Converter/BL_MeshDeformer.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ class BL_MeshDeformer : public RAS_Deformer
100100
int m_tvtot;
101101
BL_DeformableGameObject *m_gameobj;
102102
double m_lastDeformUpdate;
103-
104-
#ifdef WITH_CXX_GUARDEDALLOC
105-
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_MeshDeformer")
106-
#endif
107103
};
108104

109105
#endif

source/gameengine/Converter/BL_ModifierDeformer.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ class BL_ModifierDeformer : public BL_ShapeDeformer
102102
double m_lastModifierUpdate;
103103
Scene *m_scene;
104104
DerivedMesh *m_dm;
105-
106-
#ifdef WITH_CXX_GUARDEDALLOC
107-
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ModifierDeformer")
108-
#endif
109105
};
110106

111107
#endif /* __BL_MODIFIERDEFORMER_H__ */

source/gameengine/Converter/BL_ShapeDeformer.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ class BL_ShapeDeformer : public BL_SkinDeformer
7979
bool m_useShapeDrivers;
8080
double m_lastShapeUpdate;
8181
Key *m_key;
82-
83-
84-
#ifdef WITH_CXX_GUARDEDALLOC
85-
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ShapeDeformer")
86-
#endif
8782
};
8883

8984
#endif

source/gameengine/Converter/BL_SkinDeformer.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@ class BL_SkinDeformer : public BL_MeshDeformer
116116
void BGEDeformVerts();
117117

118118
void UpdateTransverts();
119-
120-
#ifdef WITH_CXX_GUARDEDALLOC
121-
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_SkinDeformer")
122-
#endif
123119
};
124120

125121
#endif /* __BL_SKINDEFORMER_H__ */

source/gameengine/Converter/KX_BlenderScalarInterpolator.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ class BL_ScalarInterpolator : public KX_IScalarInterpolator {
5252

5353
private:
5454
struct FCurve *m_fcu;
55-
56-
57-
#ifdef WITH_CXX_GUARDEDALLOC
58-
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ScalarInterpolator")
59-
#endif
6055
};
6156

6257

@@ -66,11 +61,6 @@ class BL_InterpolatorList : public std::vector<KX_IScalarInterpolator *> {
6661
~BL_InterpolatorList();
6762

6863
KX_IScalarInterpolator *GetScalarInterpolator(const char *rna_path, int array_index);
69-
70-
71-
#ifdef WITH_CXX_GUARDEDALLOC
72-
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_InterpolatorList")
73-
#endif
7464
};
7565

7666
#endif /* __KX_BLENDERSCALARINTERPOLATOR_H__ */

source/gameengine/Converter/KX_BlenderSceneConverter.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,6 @@ class KX_BlenderSceneConverter : public KX_ISceneConverter
159159
CM_Message("\t m_map_blender_to_gameactuator: " << (int)m_map_blender_to_gameactuator.size());
160160
CM_Message("\t m_map_blender_to_gamecontroller: " << (int)m_map_blender_to_gamecontroller.size());
161161
CM_Message("\t m_map_blender_to_gameAdtList: " << (int)m_map_blender_to_gameAdtList.size());
162-
163-
#ifdef WITH_CXX_GUARDEDALLOC
164-
MEM_printmemlist_pydict();
165-
#endif
166162
}
167163

168164
/* LibLoad Options */
@@ -174,15 +170,9 @@ class KX_BlenderSceneConverter : public KX_ISceneConverter
174170
LIB_LOAD_ASYNC = 8,
175171
};
176172

177-
178-
179173
#ifdef WITH_PYTHON
180174
PyObject *GetPyNamespace();
181175
#endif
182-
183-
#ifdef WITH_CXX_GUARDEDALLOC
184-
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderSceneConverter")
185-
#endif
186176
};
187177

188178
#endif // __KX_BLENDERSCENECONVERTER_H__

source/gameengine/Converter/KX_SoftBodyDeformer.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@ class KX_SoftBodyDeformer : public RAS_Deformer
9191
{
9292
return false;
9393
}
94-
95-
#ifdef WITH_CXX_GUARDEDALLOC
96-
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ShapeDeformer")
97-
#endif
9894
};
9995

10096
#endif

source/gameengine/Expressions/EXP_BoolValue.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ class CBoolValue : public CPropValue
5050

5151
private:
5252
bool m_bool;
53-
54-
#ifdef WITH_CXX_GUARDEDALLOC
55-
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CBoolValue")
56-
#endif
5753
};
5854

5955
#endif // __EXP_BOOLVALUE_H__

0 commit comments

Comments
 (0)