diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2020-05-14 15:30:34 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2020-05-14 15:30:34 +0300 |
commit | 236794d07a707a5cf4b8aff9d441f88590d69901 (patch) | |
tree | eb309de08263b2c0c5b4928ee1f112b1c3cd60bf /intern | |
parent | c9360b239bc7ebe09721b7d740995f01ee7d8bb3 (diff) | |
parent | 7965c735f12b885803933363e9b1ca8e85067af6 (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'intern')
-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 94d614b942f..5bde16ddb42 100644 --- a/intern/guardedalloc/cpp/mallocn.cpp +++ b/intern/guardedalloc/cpp/mallocn.cpp @@ -21,24 +21,24 @@ #include "../MEM_guardedalloc.h" #include <new> -void *operator new(size_t size, const char *str) throw(std::bad_alloc); -void *operator new[](size_t size, const char *str) throw(std::bad_alloc); +void *operator new(size_t size, const char *str); +void *operator new[](size_t size, const char *str); /* not default but can be used when needing to set a string */ -void *operator new(size_t size, const char *str) throw(std::bad_alloc) +void *operator new(size_t size, const char *str) { return MEM_mallocN(size, str); } -void *operator new[](size_t size, const char *str) throw(std::bad_alloc) +void *operator new[](size_t size, const char *str) { return MEM_mallocN(size, str); } -void *operator new(size_t size) throw(std::bad_alloc) +void *operator new(size_t size) { return MEM_mallocN(size, "C++/anonymous"); } -void *operator new[](size_t size) throw(std::bad_alloc) +void *operator new[](size_t size) { return MEM_mallocN(size, "C++/anonymous[]"); } |