- WITH_CXX_GUARDEDALLOC working again
authorCampbell Barton <ideasman42@gmail.com>
Sun, 6 Jun 2010 01:15:44 +0000 (01:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 6 Jun 2010 01:15:44 +0000 (01:15 +0000)
- CMake building without python or fluidsim working again (broke in recent commit)
- remove BLI_short_filename(), it wasnt used anywhere.

135 files changed:
intern/string/STR_String.h
source/blender/blenlib/BLI_fileops.h
source/blender/blenlib/intern/fileops.c
source/blender/blenlib/intern/path_util.c
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/object/object_constraint.c
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/space_script/script_edit.c
source/blender/editors/space_script/space_script.c
source/blender/makesrna/intern/rna_wm.c
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
source/gameengine/BlenderRoutines/KX_BlenderSystem.h
source/gameengine/Converter/BL_DeformableGameObject.h
source/gameengine/Converter/BL_MeshDeformer.h
source/gameengine/Converter/BL_ModifierDeformer.h
source/gameengine/Converter/BL_ShapeDeformer.h
source/gameengine/Converter/BL_SkinDeformer.h
source/gameengine/Converter/BlenderWorldInfo.h
source/gameengine/Converter/KX_BlenderScalarInterpolator.h
source/gameengine/Converter/KX_BlenderSceneConverter.h
source/gameengine/Converter/KX_SoftBodyDeformer.h
source/gameengine/Expressions/BoolValue.h
source/gameengine/Expressions/ConstExpr.h
source/gameengine/Expressions/EmptyValue.h
source/gameengine/Expressions/ErrorValue.h
source/gameengine/Expressions/Expression.h
source/gameengine/Expressions/FloatValue.h
source/gameengine/Expressions/IdentifierExpr.h
source/gameengine/Expressions/IfExpr.h
source/gameengine/Expressions/InputParser.h
source/gameengine/Expressions/IntValue.h
source/gameengine/Expressions/KX_HashedPtr.h
source/gameengine/Expressions/Operator1Expr.h
source/gameengine/Expressions/Operator2Expr.h
source/gameengine/Expressions/PyObjectPlus.h
source/gameengine/Expressions/StringValue.h
source/gameengine/Expressions/Value.h
source/gameengine/Expressions/VectorValue.h
source/gameengine/Expressions/VoidValue.h
source/gameengine/GameLogic/SCA_ActuatorEventManager.h
source/gameengine/GameLogic/SCA_AlwaysEventManager.h
source/gameengine/GameLogic/SCA_BasicEventManager.h
source/gameengine/GameLogic/SCA_EventManager.h
source/gameengine/GameLogic/SCA_ExpressionController.h
source/gameengine/GameLogic/SCA_IActuator.h
source/gameengine/GameLogic/SCA_IInputDevice.h
source/gameengine/GameLogic/SCA_IScene.h
source/gameengine/GameLogic/SCA_JoystickManager.h
source/gameengine/GameLogic/SCA_KeyboardManager.h
source/gameengine/GameLogic/SCA_LogicManager.h
source/gameengine/GameLogic/SCA_MouseManager.h
source/gameengine/GameLogic/SCA_PropertyEventManager.h
source/gameengine/GameLogic/SCA_RandomEventManager.h
source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
source/gameengine/GameLogic/SCA_TimeEventManager.h
source/gameengine/Ketsji/BL_BlenderShader.h
source/gameengine/Ketsji/BL_Material.h
source/gameengine/Ketsji/BL_Shader.h
source/gameengine/Ketsji/BL_Texture.h
source/gameengine/Ketsji/KX_BulletPhysicsController.h
source/gameengine/Ketsji/KX_CameraIpoSGController.h
source/gameengine/Ketsji/KX_ClientObjectInfo.h
source/gameengine/Ketsji/KX_Dome.h
source/gameengine/Ketsji/KX_EmptyObject.h
source/gameengine/Ketsji/KX_IInterpolator.h
source/gameengine/Ketsji/KX_IPO_SGController.h
source/gameengine/Ketsji/KX_IPhysicsController.h
source/gameengine/Ketsji/KX_IScalarInterpolator.h
source/gameengine/Ketsji/KX_ISceneConverter.h
source/gameengine/Ketsji/KX_ISystem.h
source/gameengine/Ketsji/KX_KetsjiEngine.h
source/gameengine/Ketsji/KX_LightIpoSGController.h
source/gameengine/Ketsji/KX_MaterialIpoController.h
source/gameengine/Ketsji/KX_MotionState.h
source/gameengine/Ketsji/KX_ObColorIpoSGController.h
source/gameengine/Ketsji/KX_OrientationInterpolator.h
source/gameengine/Ketsji/KX_PolygonMaterial.h
source/gameengine/Ketsji/KX_PositionInterpolator.h
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_RayCast.h
source/gameengine/Ketsji/KX_RayEventManager.h
source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
source/gameengine/Ketsji/KX_SG_NodeRelationships.h
source/gameengine/Ketsji/KX_ScalarInterpolator.h
source/gameengine/Ketsji/KX_ScalingInterpolator.h
source/gameengine/Ketsji/KX_Scene.h
source/gameengine/Ketsji/KX_TimeCategoryLogger.h
source/gameengine/Ketsji/KX_TimeLogger.h
source/gameengine/Ketsji/KX_TouchEventManager.h
source/gameengine/Ketsji/KX_WorldInfo.h
source/gameengine/Ketsji/KX_WorldIpoController.h
source/gameengine/Network/NG_NetworkDeviceInterface.h
source/gameengine/Network/NG_NetworkMessage.h
source/gameengine/Network/NG_NetworkObject.h
source/gameengine/Network/NG_NetworkScene.h
source/gameengine/Physics/Bullet/CcdGraphicController.h
source/gameengine/Physics/Bullet/CcdPhysicsController.h
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
source/gameengine/Physics/common/PHY_IController.h
source/gameengine/Physics/common/PHY_IGraphicController.h
source/gameengine/Physics/common/PHY_IMotionState.h
source/gameengine/Physics/common/PHY_IPhysicsController.h
source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
source/gameengine/Physics/common/PHY_IVehicle.h
source/gameengine/Rasterizer/RAS_2DFilterManager.h
source/gameengine/Rasterizer/RAS_BucketManager.h
source/gameengine/Rasterizer/RAS_Deformer.h
source/gameengine/Rasterizer/RAS_FramingManager.h
source/gameengine/Rasterizer/RAS_ICanvas.h
source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
source/gameengine/Rasterizer/RAS_IRasterizer.h
source/gameengine/Rasterizer/RAS_IRenderTools.h
source/gameengine/Rasterizer/RAS_MaterialBucket.h
source/gameengine/Rasterizer/RAS_MeshObject.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
source/gameengine/Rasterizer/RAS_Polygon.h
source/gameengine/Rasterizer/RAS_Rect.h
source/gameengine/Rasterizer/RAS_TexVert.h
source/gameengine/SceneGraph/SG_BBox.h
source/gameengine/SceneGraph/SG_Controller.h
source/gameengine/SceneGraph/SG_DList.h
source/gameengine/SceneGraph/SG_IObject.h
source/gameengine/SceneGraph/SG_Node.h
source/gameengine/SceneGraph/SG_ParentRelation.h
source/gameengine/SceneGraph/SG_QList.h
source/gameengine/SceneGraph/SG_Spatial.h
source/gameengine/SceneGraph/SG_Tree.h

index 19875c2..b24dea1 100644 (file)
@@ -202,8 +202,8 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "CXX:STR_String"); }
-       void operator delete( void *mem ) { MEM_freeN(mem); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "CXX:STR_String"); }
+       void operator delete(void *mem) { MEM_freeN(mem); }
 #endif
 };
 
index e6ea355..6c98d30 100644 (file)
@@ -54,7 +54,6 @@ char *BLI_last_slash(const char *string);
 int      BLI_add_slash(char *string);
 void  BLI_del_slash(char *string);
 char *first_slash(char *string);
-const char *BLI_short_filename(const char *string);
 
 /* only for the sane unix world: direct calls to system functions :( */
 #ifndef WIN32
index 73434c5..a543f46 100644 (file)
@@ -80,31 +80,6 @@ char *BLI_last_slash(const char *string) {
        else return lfslash;
 }
 
-static const char *last_slash_len(const char *string, int len) {
-       int a;
-
-       for(a=len-1; a>=0; a--)
-               if(string[a] == '/' || string[a] == '\\')
-                       return &string[a];
-       
-       return NULL;
-}
-
-const char *BLI_short_filename(const char *string) {
-       const char *ls, *lls;
-       
-       ls= last_slash_len(string, strlen(string));
-       if(!ls)
-               return string;
-       
-       lls= last_slash_len(string, ls-string);
-
-       if(lls)
-               return lls+1;
-       else
-               return ls+1;
-}
-
 /* adds a slash if there isnt one there alredy */
 int BLI_add_slash(char *string) {
        int len = strlen(string);
index f91c38b..2cea9c2 100644 (file)
@@ -1175,7 +1175,7 @@ void BLI_join_dirfile(char *string, const char *dir, const char *file)
 /* like pythons os.path.basename( ) */
 char *BLI_path_basename(char *path)
 {
-       const char *filename= BLI_last_slash(path);
+       char *filename= BLI_last_slash(path);
        return filename ? filename + 1 : path;
 }
 
index 29ceb1f..4b4590a 100644 (file)
@@ -39,8 +39,8 @@ IF(WITH_INTERNATIONAL)
        ADD_DEFINITIONS(-DINTERNATIONAL)
 ENDIF(WITH_INTERNATIONAL)
 
-IF(WITH_PYTHON)
+IF(NOT WITH_PYTHON)
        ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
+ENDIF(NOT WITH_PYTHON)
 
 BLENDERLIB(bf_editor_interface "${SRC}" "${INC}")
index 034de3f..7b61d8d 100644 (file)
@@ -199,9 +199,9 @@ char *buildmenu_pyconstraints (Text *con_text, int *pyconindex)
 /* this callback gets called when the 'refresh' button of a pyconstraint gets pressed */
 void update_pyconstraint_cb (void *arg1, void *arg2)
 {
+#ifndef DISABLE_PYTHON
        Object *owner= (Object *)arg1;
        bConstraint *con= (bConstraint *)arg2;
-#ifndef DISABLE_PYTHON
        if (owner && con)
                BPY_pyconstraint_update(owner, con);
 #endif
@@ -1286,9 +1286,9 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase
                        
                case CONSTRAINT_TYPE_PYTHON: // FIXME: this code is not really valid anymore
                {
+#ifndef DISABLE_PYTHON
                        char *menustr;
                        int scriptint= 0;
-#ifndef DISABLE_PYTHON
                        /* popup a list of usable scripts */
                        menustr = buildmenu_pyconstraints(NULL, &scriptint);
                        // XXX scriptint = pupmenu(menustr);
index d84754b..ebe3f91 100644 (file)
@@ -32,6 +32,10 @@ SET(INC
        ../../../../intern/guardedalloc
 )
 
+IF(NOT WITH_ELBEEM)
+       ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+ENDIF(NOT WITH_ELBEEM)
+
 IF(WITH_OPENMP)
                ADD_DEFINITIONS(-DPARALLEL=1)
 ENDIF(WITH_OPENMP)
index 0299354..064e229 100644 (file)
 
 #include "script_intern.h"     // own include
 
-
+#ifndef DISABLE_PYTHON
 #include "BPY_extern.h" /* BPY_run_python_script */
+#endif
 
 static int run_pyfile_exec(bContext *C, wmOperator *op)
 {
-       ARegion *ar= CTX_wm_region(C);
-       
-
        char path[512];
        RNA_string_get(op->ptr, "path", path);
 #ifndef DISABLE_PYTHON
        if(BPY_run_python_script(C, path, NULL, op->reports)) {
+               ARegion *ar= CTX_wm_region(C);
                ED_region_tag_redraw(ar);
                return OPERATOR_FINISHED;
        }
index 9fb1d1a..0aba1df 100644 (file)
@@ -50,8 +50,9 @@
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
-
+#ifndef DISABLE_PYTHON
 #include "BPY_extern.h"
+#endif
 
 #include "script_intern.h"     // own include
 
index 844df1a..52c18b4 100644 (file)
@@ -611,6 +611,7 @@ static int rna_wmKeyMapItem_name_length(PointerRNA *ptr)
                return 0;
 }
 
+#ifndef DISABLE_PYTHON
 static void rna_Operator_unregister(const bContext *C, StructRNA *type)
 {
        char *idname;
@@ -746,7 +747,6 @@ static void operator_draw(bContext *C, wmOperator *op)
        RNA_parameter_list_free(&list);
 }
 
-#ifndef DISABLE_PYTHON
 void operator_wrapper(wmOperatorType *ot, void *userdata);
 void macro_wrapper(wmOperatorType *ot, void *userdata);
 
index 5b7ceaa..c916cde 100644 (file)
@@ -166,7 +166,9 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
                bool frameRate = (SYS_GetCommandLineInt(syshandle, "show_framerate", 0) != 0);
                bool animation_record = (SYS_GetCommandLineInt(syshandle, "animation_record", 0) != 0);
                bool displaylists = (SYS_GetCommandLineInt(syshandle, "displaylists", 0) != 0);
+#ifndef DISABLE_PYTHON
                bool nodepwarnings = (SYS_GetCommandLineInt(syshandle, "ignore_deprecation_warnings", 0) != 0);
+#endif
                bool novertexarrays = (SYS_GetCommandLineInt(syshandle, "novertexarrays", 0) != 0);
                if(animation_record) usefixed= true; /* override since you's always want fixed time for sim recording */
 
index 0d80bde..42f956c 100644 (file)
@@ -192,7 +192,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderCanvas"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderCanvas"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 67cd901..5bdf0cc 100644 (file)
@@ -234,8 +234,8 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderInputDevice"); }
-       void operator delete( void *mem ) { MEM_freeN(mem); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderInputDevice"); }
+       void operator delete(void *mem) { MEM_freeN(mem); }
 #endif
 };                                                                                                                 
 #endif //__KX_BLENDERINPUTDEVICE
index 6cd47a5..eab0528 100644 (file)
@@ -51,8 +51,8 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderKeyboardDevice"); }
-       void operator delete( void *mem ) { MEM_freeN(mem); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderKeyboardDevice"); }
+       void operator delete(void *mem) { MEM_freeN(mem); }
 #endif
 };
 
index 8f037ae..ce067ff 100644 (file)
@@ -49,8 +49,8 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderMouseDevice"); }
-       void operator delete( void *mem ) { MEM_freeN(mem); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderMouseDevice"); }
+       void operator delete(void *mem) { MEM_freeN(mem); }
 #endif
 };
 
index 0722652..9a7d9c7 100644 (file)
@@ -99,7 +99,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderRenderTools"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderRenderTools"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 7c848a7..fb40ded 100644 (file)
@@ -51,7 +51,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderSystem"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderSystem"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 0696a61..5d16e3b 100644 (file)
@@ -102,7 +102,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_DeformableGameObject"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_DeformableGameObject"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index c8f58dc..50bad25 100644 (file)
@@ -89,7 +89,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_MeshDeformer"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_MeshDeformer"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index adf5371..6e0ede8 100644 (file)
@@ -105,7 +105,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ModifierDeformer"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ModifierDeformer"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 0ae3496..98bd4a1 100644 (file)
@@ -86,7 +86,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ShapeDeformer"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ShapeDeformer"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 80bdd96..df7e8f6 100644 (file)
@@ -109,7 +109,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_SkinDeformer"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_SkinDeformer"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index b2762e9..b500c55 100644 (file)
@@ -98,7 +98,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BlenderWorldInfo"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BlenderWorldInfo"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index ad4779f..7b49cbc 100644 (file)
@@ -53,7 +53,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ScalarInterpolator"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ScalarInterpolator"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -69,7 +69,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_InterpolatorList"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_InterpolatorList"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 3dd3afb..23d506c 100644 (file)
@@ -178,7 +178,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderSceneConverter"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderSceneConverter"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 89407f2..ce3f695 100644 (file)
@@ -92,7 +92,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ShapeDeformer"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ShapeDeformer"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index baec6bd..dac70e3 100644 (file)
@@ -55,7 +55,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CBoolValue"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CBoolValue"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index f48b8d3..aef2ddc 100644 (file)
@@ -45,7 +45,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CConstExpr"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CConstExpr"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 01029d1..f00bc6c 100644 (file)
@@ -38,7 +38,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CEmptyValue"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CEmptyValue"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 2f65850..6bd131b 100644 (file)
@@ -37,7 +37,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CErrorValue"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CErrorValue"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index bd346fd..de0c082 100644 (file)
@@ -66,7 +66,7 @@ class CBrokenLinkInfo
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CBrokenLinkInfo"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CBrokenLinkInfo"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -136,7 +136,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CExpression"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CExpression"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index f146973..49d4efa 100644 (file)
@@ -47,7 +47,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CFloatValue"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CFloatValue"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index c47a636..0e67b17 100644 (file)
@@ -50,7 +50,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CIdentifierExpr"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CIdentifierExpr"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index f06718c..b2a953b 100644 (file)
@@ -48,7 +48,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CIfExpr"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CIfExpr"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 0d7eab2..b640d4e 100644 (file)
@@ -106,7 +106,7 @@ private:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CParser"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CParser"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 2615067..63efea5 100644 (file)
@@ -62,7 +62,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CIntValue"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CIntValue"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index c4abf3b..0933237 100644 (file)
@@ -52,7 +52,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CHashedPtr"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CHashedPtr"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index c2bc680..62f178f 100644 (file)
@@ -50,7 +50,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator1Expr"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator1Expr"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index bb26b7c..73ea177 100644 (file)
@@ -56,7 +56,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator2Expr"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator2Expr"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index e19f480..7afa85c 100644 (file)
@@ -135,8 +135,8 @@ typedef struct PyObjectPlus_Proxy {
 // leave above line empty (macro)!
 #ifdef WITH_CXX_GUARDEDALLOC
 #define Py_Header __Py_Header \
-  void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, Type.tp_name); } \
-  void operator delete( void *mem ) { MEM_freeN(mem); } \
+  void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, Type.tp_name); } \
+  void operator delete(void *mem) { MEM_freeN(mem); } \
 
 #else
 #define Py_Header __Py_Header
@@ -144,7 +144,7 @@ typedef struct PyObjectPlus_Proxy {
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #define Py_HeaderPtr __Py_HeaderPtr \
-  void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, Type.tp_name); } \
+  void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, Type.tp_name); } \
   void operator delete( void *mem ) { MEM_freeN(mem); } \
 
 #else
@@ -466,16 +466,17 @@ typedef PyTypeObject * PyParentObject;                            // Define the PyParent Object
 
 #define Py_Header \
  public: \
-
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PyObjectPlus"); } \
+       void operator delete( void *mem ) { MEM_freeN(mem); } \
 
 #define Py_HeaderPtr \
  public: \
-
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PyObjectPlusPtr"); } \
+       void operator delete( void *mem ) { MEM_freeN(mem); } \
 
 #endif
 
 
-
 // By making SG_QList the ultimate parent for PyObjectPlus objects, it
 // allows to put them in 2 different dynamic lists at the same time
 // The use of these links is interesting because they free of memory allocation
index a23bb4e..d28e435 100644 (file)
@@ -52,7 +52,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CStringValue"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CStringValue"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index f639ae5..2bb9e39 100644 (file)
@@ -181,7 +181,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CAction"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CAction"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -436,7 +436,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CPropValue"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CPropValue"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 49fb1e7..cc4deda 100644 (file)
@@ -83,7 +83,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CVectorValue"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CVectorValue"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 5281fb4..f30f8c1 100644 (file)
@@ -63,7 +63,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CVoidValue"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CVoidValue"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 9adb9fc..859cc50 100644 (file)
@@ -47,7 +47,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ActuatorEventManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ActuatorEventManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index cbbb5de..5942930 100644 (file)
@@ -41,7 +41,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_AlwaysEventManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_AlwaysEventManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index a0fae49..db67b18 100644 (file)
@@ -48,7 +48,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_BasicEventManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_BasicEventManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 8f77e7d..b01d364 100644 (file)
@@ -82,7 +82,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_EventManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_EventManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index d7bb8ed..38e3904 100644 (file)
@@ -57,7 +57,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ExpressionController"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ExpressionController"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index f456183..d3ead7c 100644 (file)
@@ -157,7 +157,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IActuator"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IActuator"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index a72c48a..a13efee 100644 (file)
@@ -316,8 +316,8 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_InputEvent"); }
-       void operator delete( void *mem ) { MEM_freeN(mem); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_InputEvent"); }
+       void operator delete(void *mem) { MEM_freeN(mem); }
 #endif
 };
 
index 7fd04e9..93b040c 100644 (file)
@@ -72,7 +72,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IScene"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IScene"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index cde2e86..e5f5344 100644 (file)
@@ -48,7 +48,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_JoystickManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_JoystickManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index a9fe208..53735f9 100644 (file)
@@ -58,7 +58,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_KeyboardManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_KeyboardManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 8573327..c5f377e 100644 (file)
@@ -146,7 +146,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_LogicManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_LogicManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 0e7dfa2..8bf0605 100644 (file)
@@ -67,7 +67,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_MouseManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_MouseManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 159b6d8..4e2920d 100644 (file)
@@ -46,7 +46,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_PropertyEventManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_PropertyEventManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 386ec88..51d233c 100644 (file)
@@ -47,7 +47,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_RandomEventManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_RandomEventManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 1e644fe..8402d03 100644 (file)
@@ -77,7 +77,7 @@ class SCA_RandomNumberGenerator {
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_RandomNumberGenerator"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_RandomNumberGenerator"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index ad4f343..b2a2eb5 100644 (file)
@@ -52,7 +52,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_TimeEventManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_TimeEventManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 073ce8f..400c355 100644 (file)
@@ -61,7 +61,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderShader"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderShader"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 6b53e7f..62e5a6e 100644 (file)
@@ -106,7 +106,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Material"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Material"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index ebd2e49..5108ace 100644 (file)
@@ -28,7 +28,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Sampler"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Sampler"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -75,7 +75,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Uniform"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Uniform"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -100,7 +100,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_DefUniform"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_DefUniform"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 2dfd9c5..eb3888b 100644 (file)
@@ -70,7 +70,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Texture"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Texture"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 7fc799a..48a3c98 100644 (file)
@@ -83,7 +83,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BulletPhysicsController"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BulletPhysicsController"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 3690043..e6596ed 100644 (file)
@@ -88,7 +88,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_CameraIpoSGController"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_CameraIpoSGController"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index f08988c..c428432 100644 (file)
@@ -78,7 +78,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ClientObjectInfo"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ClientObjectInfo"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 9ff33fe..749fbeb 100644 (file)
@@ -188,7 +188,7 @@ protected:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_Dome"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_Dome"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index c82c2ec..c41e40f 100644 (file)
@@ -41,7 +41,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_EmptyObject"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_EmptyObject"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index b08a236..aadc964 100644 (file)
@@ -44,7 +44,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IInterpolator"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IInterpolator"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 3841cae..12803cd 100644 (file)
@@ -119,7 +119,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IpoSGController"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IpoSGController"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index faab46c..288e779 100644 (file)
@@ -130,7 +130,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IPhysicsController"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IPhysicsController"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 43e07d6..a84e1b5 100644 (file)
@@ -42,7 +42,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IScalarInterpolator"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IScalarInterpolator"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index d4081da..8a11b87 100644 (file)
@@ -87,7 +87,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISceneConverter"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISceneConverter"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 027e634..fb01929 100644 (file)
@@ -55,7 +55,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISystem"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISystem"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index b3549c5..0a461a8 100644 (file)
@@ -412,7 +412,7 @@ protected:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_KetsjiEngine"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_KetsjiEngine"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 97034d3..c857994 100644 (file)
@@ -96,7 +96,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_LightIpoSGController"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_LightIpoSGController"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 906c124..a979f59 100644 (file)
@@ -54,7 +54,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_MaterialIpoController"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_MaterialIpoController"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 80bdd8b..1267abc 100644 (file)
@@ -55,7 +55,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_MotionState"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_MotionState"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index fd8de7a..4bb18fb 100644 (file)
@@ -71,7 +71,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ObColorIpoSGController"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ObColorIpoSGController"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index fda331f..de41323 100644 (file)
@@ -54,7 +54,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 private:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_OrientationInterpolator"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_OrientationInterpolator"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 9d538b4..03b4bf1 100644 (file)
@@ -143,6 +143,7 @@ public:
        static PyObject*        pyattr_get_specular(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);   
        static int                      pyattr_set_specular(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 #endif
+
 };
 
 #endif // __KX_POLYGONMATERIAL_H__
index 3dd72a6..764c7bd 100644 (file)
@@ -54,7 +54,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 private:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_PositionInterpolator"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_PositionInterpolator"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index e25bdd8..5fe62a0 100644 (file)
@@ -121,18 +121,21 @@ extern "C" {
        #include "BLO_readfile.h"
 }
 
-
 #include "NG_NetworkScene.h" //Needed for sendMessage()
 
-static void setSandbox(TPythonSecurityLevel level);
-
 // 'local' copy of canvas ptr, for window height/width python scripts
+
+#ifndef DISABLE_PYTHON
+
 static RAS_ICanvas* gp_Canvas = NULL;
+static char gp_GamePythonPath[FILE_MAXDIR + FILE_MAXFILE] = "";
+static char gp_GamePythonPathOrig[FILE_MAXDIR + FILE_MAXFILE] = ""; // not super happy about this, but we need to remember the first loaded file for the global/dict load save
+
+#endif // DISABLE_PYTHON
+
 static KX_Scene*       gp_KetsjiScene = NULL;
 static KX_KetsjiEngine*        gp_KetsjiEngine = NULL;
 static RAS_IRasterizer* gp_Rasterizer = NULL;
-static char gp_GamePythonPath[FILE_MAXDIR + FILE_MAXFILE] = "";
-static char gp_GamePythonPathOrig[FILE_MAXDIR + FILE_MAXFILE] = ""; // not super happy about this, but we need to remember the first loaded file for the global/dict load save
 
 void KX_SetActiveScene(class KX_Scene* scene)
 {
@@ -1704,7 +1707,7 @@ static PyMethodDef meth_import[] = {{ "import", KXpy_import, METH_VARARGS, "our
 //static PyObject *g_oldimport = 0;
 //static int g_security = 0;
 
-void setSandbox(TPythonSecurityLevel level)
+static void setSandbox(TPythonSecurityLevel level)
 {
     PyObject *m = PyImport_AddModule("__builtin__");
     PyObject *d = PyModule_GetDict(m);
index f2084b7..1512d81 100644 (file)
@@ -95,7 +95,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayCast"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayCast"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -134,7 +134,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayCast::Callback"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayCast::Callback"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 35bf57f..55c2b81 100644 (file)
@@ -46,7 +46,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayEventManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayEventManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index be8c495..05e9d9f 100644 (file)
@@ -103,7 +103,7 @@ private :
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BoneParentRelation"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BoneParentRelation"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index f62e18b..7bb6f76 100644 (file)
@@ -93,7 +93,7 @@ private :
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_NormalParentRelation"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_NormalParentRelation"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -150,7 +150,7 @@ private :
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_VertexParentRelation"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_VertexParentRelation"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -233,7 +233,7 @@ private :
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_SlowParentRelation"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_SlowParentRelation"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 29962dd..5b66ad4 100644 (file)
@@ -59,7 +59,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ScalarInterpolator"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ScalarInterpolator"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 72e0e11..87b85a3 100644 (file)
@@ -54,7 +54,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ScalingInterpolator"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ScalingInterpolator"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 4755eee..cd8277e 100644 (file)
@@ -84,6 +84,10 @@ class btCollisionShape;
 class KX_BlenderSceneConverter;
 struct KX_ClientObjectInfo;
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 /* for ID freeing */
 #define IS_TAGGED(_id) ((_id) && (((ID *)_id)->flag & LIB_DOIT))
 
@@ -610,8 +614,6 @@ public:
        //void PrintStats(int verbose_level) {
        //      m_bucketmanager->PrintStats(verbose_level)
        //}
-
-
 };
 
 typedef std::vector<KX_Scene*> KX_SceneList;
index 7eda71c..b020683 100644 (file)
@@ -128,7 +128,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TimeCategoryLogger"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TimeCategoryLogger"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index b17000c..058b1c2 100644 (file)
@@ -106,7 +106,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TimeLogger"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TimeLogger"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 57d2894..3881953 100644 (file)
@@ -79,7 +79,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TouchEventManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TouchEventManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 21f8f52..3b3d52f 100644 (file)
@@ -67,7 +67,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_WorldInfo"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_WorldInfo"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index c89f893..f6c3619 100644 (file)
@@ -94,7 +94,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_WorldIpoController"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_WorldIpoController"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 251f4b2..5925870 100644 (file)
@@ -74,7 +74,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkDeviceInterface"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkDeviceInterface"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index fd6dbd0..0d43e3c 100644 (file)
@@ -130,7 +130,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkMessage"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkMessage"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index ae185f8..7bdd253 100644 (file)
@@ -47,7 +47,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkObject"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkObject"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 7da949d..60bb0b0 100644 (file)
@@ -108,7 +108,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkScene"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkScene"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 07cf6d9..9789342 100644 (file)
@@ -80,7 +80,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdGraphicController"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdGraphicController"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 607602a..3bbe174 100644 (file)
@@ -199,7 +199,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdShapeConstructionInfo"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdShapeConstructionInfo"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -576,7 +576,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdPhysicsController"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdPhysicsController"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -610,7 +610,7 @@ class       DefaultMotionState : public PHY_IMotionState
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:DefaultMotionState"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:DefaultMotionState"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 21f74e9..c6e7597 100644 (file)
@@ -277,7 +277,7 @@ protected:
                
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdPhysicsEnvironment"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdPhysicsEnvironment"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 9cf125f..0ad6649 100644 (file)
@@ -96,7 +96,7 @@ public:
                
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:DummyPhysicsEnvironment"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:DummyPhysicsEnvironment"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 8fd9a37..de2e53c 100644 (file)
@@ -54,7 +54,7 @@ class PHY_IController
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IController"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IController"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index adca10c..aeccdb5 100644 (file)
@@ -51,7 +51,7 @@ class PHY_IGraphicController : public PHY_IController
                virtual PHY_IGraphicController* GetReplica(class PHY_IMotionState* motionstate) {return 0;}
 
 #ifdef WITH_CXX_GUARDEDALLOC
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IController"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IController"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 41dc45e..a644bb3 100644 (file)
@@ -59,7 +59,7 @@ class PHY_IMotionState
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IMotionState"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IMotionState"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 07ae3a0..82baa8c 100644 (file)
@@ -101,7 +101,7 @@ class PHY_IPhysicsController : public PHY_IController
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IPhysicsController"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IPhysicsController"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index b557d4e..abce276 100644 (file)
@@ -88,7 +88,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IRayCastFilterCallback"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IRayCastFilterCallback"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -179,7 +179,7 @@ class PHY_IPhysicsEnvironment
                
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IPhysicsEnvironment"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IPhysicsEnvironment"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 261bae4..7c00b5d 100644 (file)
@@ -58,7 +58,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IVehicle"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IVehicle"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 7ff7cde..9671f91 100644 (file)
@@ -106,7 +106,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_2DFilterManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_2DFilterManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 0c871a8..9edac8d 100644 (file)
@@ -85,7 +85,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_BucketManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_BucketManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 396b671..17c2cb4 100644 (file)
@@ -89,7 +89,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_Deformer"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_Deformer"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index c058c8c..aedac23 100644 (file)
@@ -161,7 +161,7 @@ private :
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_FrameSettings"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_FrameSettings"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 }; 
@@ -288,7 +288,7 @@ private :
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_FramingManager"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_FramingManager"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };             
index 339521c..826fe73 100644 (file)
@@ -210,7 +210,7 @@ protected:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_ICanvas"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_ICanvas"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index bcc8c32..e7bd78c 100644 (file)
@@ -176,7 +176,7 @@ public:
                
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_IPolyMaterial"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_IPolyMaterial"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 3ffbfcd..630a43d 100644 (file)
@@ -414,7 +414,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_IRasterizer"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_IRasterizer"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 0d89cb4..50de498 100644 (file)
@@ -180,7 +180,7 @@ public:
                
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_IRenderTools"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_IRenderTools"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 0f7db93..c9ccac8 100644 (file)
@@ -176,7 +176,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshSlot"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshSlot"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -193,7 +193,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshMaterial"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshMaterial"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -252,7 +252,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MaterialBucket"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MaterialBucket"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 87314a1..5a834bf 100644 (file)
@@ -171,7 +171,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshObject"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshObject"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index d3c14b4..28c56b9 100644 (file)
@@ -72,7 +72,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_ListRasterizer"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_ListRasterizer"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 6bbf65f..7b516cb 100644 (file)
@@ -292,7 +292,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_OpenGLRasterizer"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_OpenGLRasterizer"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 92833d9..96f6344 100644 (file)
@@ -61,7 +61,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_VAOpenGLRasterizer"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_VAOpenGLRasterizer"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 48fa4a2..8dc9813 100644 (file)
@@ -93,7 +93,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_Polygon"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_Polygon"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 828257d..7a1d21b 100644 (file)
@@ -96,7 +96,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_Rect"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_Rect"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index b74cfb4..bdf2a64 100644 (file)
@@ -141,7 +141,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_TexVert"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_TexVert"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index cc9dfc2..1a65fc7 100644 (file)
@@ -135,7 +135,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_BBox"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_BBox"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 6e44e05..b4636d5 100644 (file)
@@ -42,7 +42,7 @@ class SG_Controller
 public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "SG_Controller"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "SG_Controller"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 
index 24b2fd6..0768eaa 100644 (file)
@@ -215,7 +215,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_DList"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_DList"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 2b9fb68..4c9c31e 100644 (file)
@@ -354,7 +354,7 @@ protected :
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_IObject"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_IObject"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 5d2bac2..30d09b5 100644 (file)
@@ -269,7 +269,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_Node"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_Node"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 8097fbd..0bc0424 100644 (file)
@@ -131,7 +131,7 @@ protected :
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_ParentRelation"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_ParentRelation"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };     
index 9f49060..691ec9e 100644 (file)
@@ -155,7 +155,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_QList"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_QList"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 372a1f6..b819380 100644 (file)
@@ -286,7 +286,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_Spatial"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_Spatial"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
index 041f34a..fa6facd 100644 (file)
@@ -115,7 +115,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_Tree"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_Tree"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -158,7 +158,7 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_TreeFactory"); }
+       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_TreeFactory"); }
        void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };