diff options
author | Chris Apers | 2006-09-17 10:16:52 +0000 |
---|---|---|
committer | Chris Apers | 2006-09-17 10:16:52 +0000 |
commit | f6daab19c5ba57fb68860aff4b56a6ee278cdfed (patch) | |
tree | 7b6caef8818503669673a835b308f35fd24108e3 /backends/platform | |
parent | 8de5d496fa9a90e8fc3f0496668010fa7b9641ac (diff) | |
download | scummvm-rg350-f6daab19c5ba57fb68860aff4b56a6ee278cdfed.tar.gz scummvm-rg350-f6daab19c5ba57fb68860aff4b56a6ee278cdfed.tar.bz2 scummvm-rg350-f6daab19c5ba57fb68860aff4b56a6ee278cdfed.zip |
Compiler seems to not use these operators when they are inlined
svn-id: r23915
Diffstat (limited to 'backends/platform')
-rw-r--r-- | backends/platform/PalmOS/Src/extend.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/backends/platform/PalmOS/Src/extend.cpp b/backends/platform/PalmOS/Src/extend.cpp index 297eb28c16..f2b9bbcc0a 100644 --- a/backends/platform/PalmOS/Src/extend.cpp +++ b/backends/platform/PalmOS/Src/extend.cpp @@ -21,7 +21,7 @@ * $Id$ * */ - + #include <stdlib.h> #include "globals.h" @@ -84,25 +84,26 @@ void *operator new [] (UInt32 size) { MemSet(ptr, 0, size); return ptr; } -#elif defined(COMPILE_OS5) +#elif defined(COMPILE_OS5) || defined(STDLIB_TRACE_MEMORY) -__inline void *operator new(UInt32 size) { +void *operator new(UInt32 size) { void *ptr = malloc(size); MemSet(ptr, 0, size); return ptr; } -__inline void *operator new [] (UInt32 size) { +void *operator new [] (UInt32 size) { void *ptr = malloc(size); MemSet(ptr, 0, size); return ptr; } -__inline void operator delete(void *ptr) throw() { +void operator delete(void *ptr) throw() { if (ptr) free(ptr); } -__inline void operator delete[](void *ptr) throw() { +void operator delete[](void *ptr) throw() { if (ptr) free(ptr); } + #endif |