Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-05-14 12:24:50 +0300
committerJacques Lucke <jacques@blender.org>2020-05-14 12:24:50 +0300
commit975c45df9a1c21140710ef16ce5ce4b5565ab90f (patch)
tree920092cb1fa8df6d4dfcf62c42afe7c2b6c72cb7 /intern/guardedalloc
parent9ebb3a386e7243c7931449cad68a5923dc982ba0 (diff)
Cleanup: don't use deprecated exception specifications
Usage of exception specifications is discouraged by the C++ core guidelines.
Diffstat (limited to 'intern/guardedalloc')
-rw-r--r--intern/guardedalloc/cpp/mallocn.cpp12
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[]");
}