diff options
Diffstat (limited to 'intern/guardedalloc')
| -rw-r--r-- | intern/guardedalloc/cpp/mallocn.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/guardedalloc/cpp/mallocn.cpp b/intern/guardedalloc/cpp/mallocn.cpp index 21f5e323cf2..da77f0e1c83 100644 --- a/intern/guardedalloc/cpp/mallocn.cpp +++ b/intern/guardedalloc/cpp/mallocn.cpp @@ -29,33 +29,33 @@ #include "../MEM_guardedalloc.h" /* not default but can be used when needing to set a string */ -void *operator new(size_t size, const char *str) +void *operator new(size_t size, const char *str) throw(std::bad_alloc) { return MEM_mallocN(size, str); } -void *operator new[](size_t size, const char *str) +void *operator new[](size_t size, const char *str) throw(std::bad_alloc) { return MEM_mallocN(size, str); } -void *operator new(size_t size) +void *operator new(size_t size) throw(std::bad_alloc) { return MEM_mallocN(size, "C++/anonymous"); } -void *operator new[](size_t size) +void *operator new[](size_t size) throw(std::bad_alloc) { return MEM_mallocN(size, "C++/anonymous[]"); } -void operator delete(void *p) +void operator delete(void *p) throw() { /* delete NULL is valid in c++ */ if (p) MEM_freeN(p); } -void operator delete[](void *p) +void operator delete[](void *p) throw() { /* delete NULL is valid in c++ */ if (p) |