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/Operator1Expr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/gameengine/Expressions/Operator1Expr.h') diff --git a/source/gameengine/Expressions/Operator1Expr.h b/source/gameengine/Expressions/Operator1Expr.h index c2bc68076a0..62f178fb9f7 100644 --- a/source/gameengine/Expressions/Operator1Expr.h +++ b/source/gameengine/Expressions/Operator1Expr.h @@ -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 }; -- cgit v1.2.3