Merge branch 'master' into wm-drag-drop-rewritewm-drag-drop-rewrite

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[]");
 }