From ed338da8c963cfcc26315584bb694a95f2c89088 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 6 Jun 2010 01:15:44 +0000 Subject: - 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. --- source/gameengine/Expressions/Value.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/gameengine/Expressions/Value.h') diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h index f639ae5af78..2bb9e39cafc 100644 --- a/source/gameengine/Expressions/Value.h +++ b/source/gameengine/Expressions/Value.h @@ -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 }; -- cgit v1.2.3