diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-06-06 05:15:44 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-06-06 05:15:44 +0400 |
commit | ed338da8c963cfcc26315584bb694a95f2c89088 (patch) | |
tree | e21a68328e7d0d1f4d41f95fd27690172bfc0957 /source/gameengine/SceneGraph | |
parent | 0cc077ec455e701a1d3caa1350051f7d3737763b (diff) |
- WITH_CXX_GUARDEDALLOC working again
- CMake building without python or fluidsim working again (broke in recent commit)
- remove BLI_short_filename(), it wasnt used anywhere.
Diffstat (limited to 'source/gameengine/SceneGraph')
-rw-r--r-- | source/gameengine/SceneGraph/SG_BBox.h | 2 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_Controller.h | 2 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_DList.h | 2 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_IObject.h | 2 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_Node.h | 2 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_ParentRelation.h | 2 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_QList.h | 2 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_Spatial.h | 2 | ||||
-rw-r--r-- | source/gameengine/SceneGraph/SG_Tree.h | 4 |
9 files changed, 10 insertions, 10 deletions
diff --git a/source/gameengine/SceneGraph/SG_BBox.h b/source/gameengine/SceneGraph/SG_BBox.h index cc9dfc2db4e..1a65fc7ef6f 100644 --- a/source/gameengine/SceneGraph/SG_BBox.h +++ b/source/gameengine/SceneGraph/SG_BBox.h @@ -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 }; diff --git a/source/gameengine/SceneGraph/SG_Controller.h b/source/gameengine/SceneGraph/SG_Controller.h index 6e44e05cb0b..b4636d5fa62 100644 --- a/source/gameengine/SceneGraph/SG_Controller.h +++ b/source/gameengine/SceneGraph/SG_Controller.h @@ -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 diff --git a/source/gameengine/SceneGraph/SG_DList.h b/source/gameengine/SceneGraph/SG_DList.h index 24b2fd6dee6..0768eaa5021 100644 --- a/source/gameengine/SceneGraph/SG_DList.h +++ b/source/gameengine/SceneGraph/SG_DList.h @@ -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 }; diff --git a/source/gameengine/SceneGraph/SG_IObject.h b/source/gameengine/SceneGraph/SG_IObject.h index 2b9fb68adf5..4c9c31e4934 100644 --- a/source/gameengine/SceneGraph/SG_IObject.h +++ b/source/gameengine/SceneGraph/SG_IObject.h @@ -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 }; diff --git a/source/gameengine/SceneGraph/SG_Node.h b/source/gameengine/SceneGraph/SG_Node.h index 5d2bac2b955..30d09b5bdfd 100644 --- a/source/gameengine/SceneGraph/SG_Node.h +++ b/source/gameengine/SceneGraph/SG_Node.h @@ -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 }; diff --git a/source/gameengine/SceneGraph/SG_ParentRelation.h b/source/gameengine/SceneGraph/SG_ParentRelation.h index 8097fbdb6bb..0bc04245c93 100644 --- a/source/gameengine/SceneGraph/SG_ParentRelation.h +++ b/source/gameengine/SceneGraph/SG_ParentRelation.h @@ -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 }; diff --git a/source/gameengine/SceneGraph/SG_QList.h b/source/gameengine/SceneGraph/SG_QList.h index 9f49060b302..691ec9e1262 100644 --- a/source/gameengine/SceneGraph/SG_QList.h +++ b/source/gameengine/SceneGraph/SG_QList.h @@ -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 }; diff --git a/source/gameengine/SceneGraph/SG_Spatial.h b/source/gameengine/SceneGraph/SG_Spatial.h index 372a1f6d977..b8193806ecb 100644 --- a/source/gameengine/SceneGraph/SG_Spatial.h +++ b/source/gameengine/SceneGraph/SG_Spatial.h @@ -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 }; diff --git a/source/gameengine/SceneGraph/SG_Tree.h b/source/gameengine/SceneGraph/SG_Tree.h index 041f34a5bc6..fa6facde66c 100644 --- a/source/gameengine/SceneGraph/SG_Tree.h +++ b/source/gameengine/SceneGraph/SG_Tree.h @@ -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 }; |