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 /intern/string | |
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 'intern/string')
-rw-r--r-- | intern/string/STR_String.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 }; |