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:
authorCampbell Barton <ideasman42@gmail.com>2012-06-28 16:32:06 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-28 16:32:06 +0400
commitc8c743b60947ca4a5ba85d66b2abccf60c504a53 (patch)
tree91b671281d032fe8a14827356c2d97e4cc25278b /intern/guardedalloc
parent57b69abe0d3263c4f03d453d896ee9527c75d673 (diff)
code cleanup: compile with clang and quiet some warnings.
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 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)