diff options
Diffstat (limited to 'src/lib/util/corealloc.h')
-rw-r--r-- | src/lib/util/corealloc.h | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/src/lib/util/corealloc.h b/src/lib/util/corealloc.h index 5b002557769..eb97e643686 100644 --- a/src/lib/util/corealloc.h +++ b/src/lib/util/corealloc.h @@ -51,33 +51,23 @@ void dump_unfreed_mem(UINT64 start = 0); //************************************************************************** -// INLINE FUNCTIONS +// OPERATOR OVERLOADS - DECLARATIONS //************************************************************************** // zeromem_t is a dummy class used to tell new to zero memory after allocation class zeromem_t { }; -#ifndef NO_MEM_TRACKING - -// standard new/delete operators (try to avoid using) -ATTR_FORCE_INLINE inline void *operator new(std::size_t size) throw (std::bad_alloc) { return malloc_file_line(size, NULL, 0, false, true, false); } -ATTR_FORCE_INLINE inline void *operator new[](std::size_t size) throw (std::bad_alloc) { return malloc_file_line(size, NULL, 0, true, true, false); } -ATTR_FORCE_INLINE inline void operator delete(void *ptr) throw() { if (ptr != NULL) free_file_line(ptr, NULL, 0, false); } -ATTR_FORCE_INLINE inline void operator delete[](void *ptr) throw() { if (ptr != NULL) free_file_line(ptr, NULL, 0, true); } - -#endif - // file/line new/delete operators -ATTR_FORCE_INLINE inline void *operator new(std::size_t size, const char *file, int line) throw (std::bad_alloc) { return malloc_file_line(size, file, line, false, true, false); } -ATTR_FORCE_INLINE inline void *operator new[](std::size_t size, const char *file, int line) throw (std::bad_alloc) { return malloc_file_line(size, file, line, true, true, false); } -ATTR_FORCE_INLINE inline void operator delete(void *ptr, const char *file, int line) { if (ptr != NULL) free_file_line(ptr, file, line, false); } -ATTR_FORCE_INLINE inline void operator delete[](void *ptr, const char *file, int line) { if (ptr != NULL) free_file_line(ptr, file, line, true); } +void *operator new(std::size_t size, const char *file, int line) throw (std::bad_alloc); +void *operator new[](std::size_t size, const char *file, int line) throw (std::bad_alloc); +void operator delete(void *ptr, const char *file, int line); +void operator delete[](void *ptr, const char *file, int line); // file/line new/delete operators with zeroing -ATTR_FORCE_INLINE inline void *operator new(std::size_t size, const char *file, int line, const zeromem_t &) throw (std::bad_alloc) { return malloc_file_line(size, file, line, false, true, true); } -ATTR_FORCE_INLINE inline void *operator new[](std::size_t size, const char *file, int line, const zeromem_t &) throw (std::bad_alloc) { return malloc_file_line(size, file, line, true, true, true); } -ATTR_FORCE_INLINE inline void operator delete(void *ptr, const char *file, int line, const zeromem_t &) { if (ptr != NULL) free_file_line(ptr, file, line, false); } -ATTR_FORCE_INLINE inline void operator delete[](void *ptr, const char *file, int line, const zeromem_t &) { if (ptr != NULL) free_file_line(ptr, file, line, true); } +void *operator new(std::size_t size, const char *file, int line, const zeromem_t &) throw (std::bad_alloc); +void *operator new[](std::size_t size, const char *file, int line, const zeromem_t &) throw (std::bad_alloc); +void operator delete(void *ptr, const char *file, int line, const zeromem_t &); +void operator delete[](void *ptr, const char *file, int line, const zeromem_t &); |