- 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 19875c27fa4853d14f554d3462538a5437a1a5d1..b24dea1d3c9f4e46a0015c0f3900550e1dc7cccb 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 e6ea3559e8c360b491b3efc3ada59b9194d95550..6c98d30e4b1e32447a54e08108e2409f86e94736 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 73434c548a0f97f59252076448946da652ad8b7b..a543f4623f15c595646d9d002def981d68ee8de7 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 f91c38b8271f65f882617cea85e87d6731c68108..2cea9c21a57d57283a2fc7259312b798a5d03513 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 29ceb1fd82ec9e8601ed910d9f0126daa3aa8fa8..4b4590aeee51fceb3bb4884cad344e5c127dd70a 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 034de3fb7031c112cafe04c3cc6a7e02116b7054..7b61d8de43faf2c8201337a9046ea1dd2de96147 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 d84754b561d2498a9069066af927112cb151f9e3..ebe3f91350831da64eb93654c4b25852e1b4c4c2 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 02993549c94f11aeadd7d75c177040944dc0c7d2..064e2295006bba4e9f22f0db2f49be955c58bcca 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 9fb1d1a3f0b9928c5c42fa74bce0b6ec15648c2b..0aba1df47e9a6d84cd74127074013b413af51656 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 844df1ad2d36afcf915d9a3b0b6c1fd38a1950d1..52c18b4e581b72e68d5598119d7883af957d35a8 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 5b7ceaa296c51942e5166e7d3521c6ed7680af8d..c916cdeb67c42f6791df7ea061cb0e8c3efc112f 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 0d80bdee0551b6216278db8a52a43eb4cdbc7071..42f956cafcdee2933de78f291c58515f1fd6f0db 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 67cd901a0e5f3e3f717a265496d03e4a47b92896..5bdf0ccd81d73087d58d7693cefff5faca119a17 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 6cd47a5d93e33567a8db36c0687423d6299a9d07..eab052895db3aa199db3ad0b6efed59995cbab52 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 8f037ae5b076dca0d292fb869c39e5a1cee1edfc..ce067ffb37948d9077ae88eb873410c00791bfe6 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 072265245383d2ef29f996f905c91d5826daead3..9a7d9c7bcc085c819e6b3d28d010a02da04bd526 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 7c848a7a856d0b751e65e4077481313d0466ae0b..fb40ded92928f7c0c1aaf55139fc5adb81c79437 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 0696a61eb413721dd7c73347b74bd8399c3ea5e9..5d16e3ba1a8dcc447627ca23528e44083571f469 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 c8f58dc7b173f4fe3ad55c5a505314d343abb5cd..50bad254b42fed3e64d289655d0de07efab44e77 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 adf537110f1677686f8bf66a5bce3992124f64d4..6e0ede8e62fe779281dbeefbbc544cba56975bdb 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 0ae349642c4bda41133d7d4baab510c1624ae013..98bd4a1b4ba03548c2cb48188b60cffbeddf00b8 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 80bdd96febd9e78f9bafd10c61c36e56515847bb..df7e8f6dffc0cd9ba83559bc560ca1f8b5257f1d 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 b2762e9a73e4172ff5d39e4b988d5fe0648ca8ee..b500c55a7f264c9d79fedaf0109a406da2d1bd4d 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 ad4779fee6a70b08f66a624ba8ab2b15d7e5d03d..7b49cbcf66812dd0b81fcfdff8165238915692a3 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 3dd3afb56629c9f657f37c25f5a5d777ff6e3f7f..23d506c98ff5d925e90c6e7b247b0327c64b39aa 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 89407f2a279bd56e7a3c152c950e2b69f3b5b86e..ce3f695ef1108df88a7fec447b1b2b7e2a58b528 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 baec6bdee69d2ea0f0a278f37fb35a96ebd677c0..dac70e3c0b72bc083aa77a12fc7d8169cefcf205 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 f48b8d34355d7f97e50e7c220e403fe60847b5cb..aef2ddc246715d2f34bc014e570c3382d5336d07 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 01029d1655dafb4f3203fe0d913e4f63905b658f..f00bc6cfcd747b1c9064575b6249c817df0f7754 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 2f65850c4f106181319086ac51691d0d3d541ac8..6bd131b762dd6b4fefd7ba3ad97da5b86420acec 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 bd346fd0552044174dafa531bc695effc2c9e8bc..de0c0821727616130e79ba5cf9ff23f977b864f2 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 f1469734a1fb02412e8387fc72091eaf157c357f..49d4efa9f745b4b8505823e8531d7c651654b478 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 c47a63659c154359d594ed3f937d58ac2ddf264e..0e67b17a9c29a3ae87b812da629753ea288f0ef0 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 f06718c851ffb6ae9aaff2eac66ec5e4515b1f96..b2a953bd36de5633093ebb49905819579ba7f620 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 0d7eab27aebd58a7826aca4c0dc7e7efc9dd5e23..b640d4eedc7ce55310fad139c4d33d6ea84f6830 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 26150674c93361126d9e49153627673fad4e8316..63efea56d140873abc2ed3ed11c591475761e0ee 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 c4abf3b32797fd1cb4d5051fa2d2fab7be5060ea..0933237791854e31f7eee318e17888bbd1fa1ffd 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 c2bc68076a023f42974ce0227500e06eae91804c..62f178fb9f7c22a1a2dd05621f721d4475764f54 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 bb26b7c03bece9b99e7562270aa9a698484f7f48..73ea177f0d0fea54107db47575ca2718312bd809 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 e19f4800ca5e5d7caeba52bf2a64ce10ca44db7d..7afa85c8c31612e1d0f26c58a7e673c94e2369fa 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 a23bb4ec3e2c52a6fa93ee82c33f89902fbcfcd2..d28e435e2a7c38768a9e50a73857c884f57d2c80 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 f639ae5af78e3e39af26e0901d09a79dbf3cfb78..2bb9e39cafc6bf450c3dbc4d06349a46a45efffe 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 49fb1e7ea08c0783dedd670e33fd54af6744431d..cc4deda20418c71a5a84bbaac4cd91d3eb2eb273 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 5281fb4f8a36c145ab2d1b11596e7b1d49aaff37..f30f8c1be7c564c73ca02e7c6c8567ad284de955 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 9adb9fcca396ae7360004945bc1d2f7133032bd0..859cc5023f1e1c3633a586207edcd2f53d533f27 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 cbbb5debd3c88785da515496795e40fb316431cc..59429303fc4b43e9d1c925a9095d1cf2187e0380 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 a0fae4958c1e478ef36e39317d7b8604a2f704f0..db67b180fd85c5195edbccc22cef9dafa77e3692 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 8f77e7d490505b109528049ce14be4e66117230f..b01d3641cdbb5cdc139b8b325876df1956c1076f 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 d7bb8edebb11703ea674e0bd03705c50d732d425..38e3904a8d62d0b58319e4a4bb3dec74c9369c30 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 f456183a16c7c873e6c058867a6608c38c995b97..d3ead7c74609f5a2d31330ff97844b5a0864b499 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 a72c48a57e9dea9a79c11ab111f7d58df9c1b787..a13efee1316eb7b81ba06dd62e144b1b75ddf8cd 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 7fd04e9d27f6c96f0104f593cd988839832d37f9..93b040c9a31b32861f61c5c097f9bb2659fba912 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 cde2e86681555c8e13abd276056972e0d9d86a60..e5f5344204908ff6f90c3b93612166024fe42cc6 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 a9fe208eaca72500bb8d63845798b25552f1f067..53735f9fae1efab8843159966d61617d5bf9c27f 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 85733275a4516333a93a87e2bc02aa35585809d6..c5f377eeb44fda8ca236563f809eadaab7010935 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 0e7dfa2a284fd0a766c49b4cc244f067affa7436..8bf060537ca4843ad6f4380920b20fc6137f6191 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 159b6d8b82783de996c706fc430f56c2887e1f08..4e2920d9d70e62771905b494bd332f5350e02348 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 386ec886f062caad86dc7ee3a0210b8bc465a1af..51d233c432187e2c33b6d3786c2a4bd04577e86b 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 1e644fe5c26417894a571abb7b2c62f70206684a..8402d0312fc39253acd1378babc326f77d3d4e1b 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 ad4f343d1372c16c092d2df9265ac8918f2fb5a4..b2a2eb5fe5df02c5228c9a6e4f950bd8841343eb 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 073ce8f1ca5f9fea2e77b56f48e9574d5ee62cf7..400c355bd0af299eac95835be1845dc9e10ffe5b 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 6b53e7fa8b1c84a3557177c77e07b8ad36ea3345..62e5a6e638b192da5264d4e1faf7c0c68cbafaa2 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 ebd2e491f35cd901cd7da504b09c52c42fda55a8..5108acea0ffe742fac56b2e2f0961999bf4bb1be 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 2dfd9c542d33d7e22d799cde5c99c3a80bc1d932..eb3888b486263f0825121f65eff2cbfb4fe8ddba 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 7fc799abb7e5a3a13c8e7f93fbde3d43e396a869..48a3c98ff81f194abfd5a2e4ceb4c34fad1c2d00 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 3690043f4a9c83f4b0044e7c2f3a998982726084..e6596edbd1d498a2b51632b96ef4aa497bf05e9a 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 f08988c842ad4b3ef6f8baaddaa51fccee76649f..c42843274b3b644dbffcdf164e0d368f175bc7d6 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 9ff33fe285222650adc53503a6b89bbb4ac05320..749fbebe61c7ddcb0e27ba15dc2cdad8f10b5661 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 c82c2ec1657e57329182856639b833ba763f1e55..c41e40fdd4140e04297950cfe3effd7784e754b1 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 b08a2368e5bd544fa98e8648b5d3dde4d28ae8da..aadc964fe4933c27bc2c2b2db58f754a2c9ae35b 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 3841cae88da30ef76b73662679009dd967292eba..12803cde2f16998100760035e2e899026a56ac71 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 faab46c0673d67739ad407c9cccf0ddf8eb55d8b..288e779fee4e9dc69e76a0c353cc5042f722d1eb 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 43e07d696113b813c8aec0fefb5f025f982ac33a..a84e1b570fd45ab32c35cae5ffac14180470ebbe 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 d4081daa2c455fd392fa8bb47a4a9e37cf8d8e67..8a11b87534759cff77847f3abf741906f41cfbc2 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 027e6348729cc2dc4c3c41afcdde6e0dce4f9f83..fb019299135554190491905a2e430202318d177c 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 b3549c5fdabebc896ce3e03164a8bf4f49d82d06..0a461a8b63e64f3c96aaa07316abfcaa37280c19 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 97034d34429adafab0e2b97bb23045eaf9e4e9ef..c857994d145293e6d997c1aafef768a8e4befd3b 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 906c12426eb559dd303602aba4b032192961ae7f..a979f59ec95e0a09afa61ea42bf44249ebb605d8 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 80bdd8bca482b2c003c2229b814a3c0028713fd5..1267abc7fa94f6127d807a52dc2d02647e36172f 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 fd8de7a70d0b9e324c644449f3a95beb04cd39b3..4bb18fb392bf33629ef7fa8e3b1260678545f582 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 fda331f126d251a183c7ce7fb312158701b97bbc..de41323c289e28b300c71fee8773b9046515622e 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 9d538b4a3da62b2ccef9f1ba473a02c79c66bc5b..03b4bf11a18ae4e7eed051432f72a3bd39ba85e9 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 3dd72a6b08fc08e9ef7e1b4ff4ab820b6e03ed56..764c7bd87508858ec220e57fc1c3d554f99939c0 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 e25bdd8982e313c74284cb9bd06a21e03fc2df7b..5fe62a0e220fe80231273fd4485adbd558dcb94d 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 f2084b7669d582d11aaec6ca6f73f9a9916eb8d3..1512d81e94079c86a08ae75a2ee45b187420142a 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 35bf57f130c55af9c2f904ff2df87ed7de4d13fa..55c2b81b068bf8cb9978d0d450f635811f8a91fc 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 be8c495193578e9285cf04d8eaae5643cd046fce..05e9d9f02de6c1d7136663ef82fefea59084d1a4 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 f62e18b07c3351bfc543b6a95125200147ab6cbd..7bb6f767308514694fcc00614a5408b22be610be 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 29962ddf686ee8b09c60940f9517b0653671cb09..5b66ad42bd909e8b370ece1d36383edf31447ebc 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 72e0e1185dfae9d0ec12028c83bf9dbe77044835..87b85a30d1f785001f67f8a57b57324af6aa0535 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 4755eee6a6be8c0f4de781b11fa847d36f5f8530..cd8277ec39f434b6859ad96b77f84cecd6e7c7f9 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 7eda71c0798e40ccff0d49b2c343db5ca84cc62a..b020683bfc663b875d0c3f78d7dd0cd08cc70687 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 b17000c98d097e696f76879495101c4fcd8a2501..058b1c2b6c740cc60c736e478b8e4e11afa72e5f 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 57d2894498a4bab1bbf30928c4a73c0fdfe89819..388195367b9aa87d53431fd4bf2b365e61c4c117 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 21f8f521ef599104bd2dba951dc8fe9473b13e5d..3b3d52f91f74b5b1c3387e8e0b31c8904ab9c71c 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 c89f893458f08f990d4e40e0b9c8d092baf034ea..f6c36198ae768e9856a0be15b1297bc3b668cc7a 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 251f4b257f6ee6cacfbb5dea8c1ea287909d2ec9..5925870272dae31160d34964ff2144d5a48b1ae2 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 fd6dbd027e986f0d0e867893d649aec26b5ad41e..0d43e3c2b510f0920de8af02bf9e148f76bf5ad9 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 ae185f850984f34da4308bf29faea6380ffe0899..7bdd25305a00e9d3bde39a9417c0930b54067f71 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 7da949dfe0c64cdedb9a5a22a22798cdd0e28a93..60bb0b090979c978f0322d8e6c3ce9aaf4e07533 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 07cf6d940cb8b5e9d152c590d5c3e092c620c057..97893420d796d6986ca8b07efa5c6762f29706ab 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 607602a4d0dac74d925a0c276e08724c7e6e5064..3bbe17459c9559d8f8de62d9cf0933a218cbcac2 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 21f74e95ed4d6e9d9e051cf7b6daffbf95cdb38e..c6e759743a9eebb1260de4091bd3df065f246e1c 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 9cf125f3e3ffb02482abdf09c3069345de73a8be..0ad6649f2e5364a24da7a8141a110174afdc7781 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 8fd9a37dea06114b79be948e003d6673d7fa06e6..de2e53c3613305aca82acc361d2ac735993d794a 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 adca10cc1b469fc311db7b0a6f1887f4d1abcf10..aeccdb573b4556b49cddf5dfbc82170e75f583d3 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 41dc45e6e328988589fe0b86c8caa07469fcc25d..a644bb319aebf6ee30bd14671d8706b95c6acbf3 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 07ae3a01c912c8b283576ffc5f42ba970fb7c2f7..82baa8c47e110cbb9bd0c01363922d2bebb7b868 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 b557d4edc07421104a9ff170c1d082c482eb01af..abce2769f2a4bd4dab83093ae2f591c74a72a3ff 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 261bae480f5427e4a15bb793c0e6da02cac40230..7c00b5d0bef2f062ce915d1b20ee7b9eaa5caeba 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 7ff7cde788269e952de5832d189fd23a047d2494..9671f914fcdeea7a1845751a53d9adbb72bee3de 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 0c871a87428947b033021160953d2b2942130e37..9edac8dcdc8f17daa1981ca3cea496fea4a0c56c 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 396b6717144d7b928a0710664e0c1d558488ff61..17c2cb4695e6d800084fbc0d103ac4b0c93c8b61 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 c058c8cd3e8742c25212c05adc4ad68eea3beafd..aedac230cbe249ca5dfd2457c53c9aad153c4296 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 339521cb093aff97ad5b43ff8acdedcd65f48e2b..826fe732b949d65be4b97634d444dc20c49ff263 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 bcc8c32e54ec029c327f821010967784c064e614..e7bd78c23094a0cccca842fa99a5f36109de6c87 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 3ffbfcd5a8ac479f035bd65c4dcdc1a33f7dbb9a..630a43daddc3ff66ac373778595526df3d6124ff 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 0d89cb41e3cfec986a721bd3aa9a5c607ca5b4b3..50de4980e1d354f77fc5c9207a23988e518ea007 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 0f7db93049da8f7196fdfddae2de814c4e5b8a81..c9ccac8e8a759a9abac32b41ef9e5e8f130637c3 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 87314a104d1e8147393a955ae9a0639bf6cf0e6c..5a834bf26b061eacc8db7d14ea8d4c0b8a60b4e1 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 d3c14b4758c80c675b58d52141e37321dcd69acf..28c56b92c3c7760057a2631f39a75543aaa1eca7 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 6bbf65f72a46336f23b3728b0e044f44987dbbe8..7b516cb53a0e561ab24a2b383ce9cf6c34e36ffb 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 92833d9b17d74e8cd00b7aaeeef9c91656a62c27..96f6344b4036492a8ae89c3df8d1f0b5a1690724 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 48fa4a206f00802b033d9d54807abbd6b615b784..8dc9813f5b9f73bdbfa4ff179c4aa0f8c5229aa1 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 828257dceccd01ffa2cbf23f19c0022a20603d1f..7a1d21b89050f76b081fae8c84a3f8ddeebf8801 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 b74cfb47152ae10100f29452ec8e8683f8bf613a..bdf2a6487ad6958561fbfdd7d4f252285ee276d6 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 cc9dfc2db4e2b972293a5a00d4d5eb56cdbdd3ec..1a65fc7ef6f0afd558e2ad4e46411aec2cb9ddb3 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 6e44e05cb0b8379a99d8c53ee63d9b5386dad3be..b4636d5fa62877fe9eb4a6c373b4a7a8cc03ba78 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 24b2fd6dee613e2a75120e3dcce1ea5202e38556..0768eaa50219e1051ecb46bc5bd57009aae6b0dc 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 2b9fb68adf580b647a5a48b04e107e0865d4e8d1..4c9c31e49342b3d3686c12a3ff0b5cd6a28419e1 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 5d2bac2b955dbe8dd5b22bab031fc88c16090faf..30d09b5bdfd0d29d4c1b283b9a90ab5ff36e587e 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 8097fbdb6bbd1d6461a6999183a3805b0f8e415c..0bc04245c93eb51b64d5a630e0db72fdd2244106 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 9f49060b302e1abeea108ce56191d9b4ac6ea7b3..691ec9e126258829993359fd2b01abbd2804de62 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 372a1f6d977ffd1fedd907ecfced99f3c249242f..b8193806ecb8f9ae23ce3d14190b9f464b760b24 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 041f34a5bc674bde2bd84c52068806a93ad2dcd0..fa6facde66ce8067c857b756a1e7d019fc8c7eed 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
 };