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. --- intern/string/STR_String.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern') diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h index 19875c27fa4..b24dea1d3c9 100644 --- a/intern/string/STR_String.h +++ b/intern/string/STR_String.h @@ -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 }; -- cgit v1.2.3