fixed compilation errors when DEBUG is switched on

[deliverable/titan.core.git] / common / new.cc

diff --git a/common/new.cc b/common/new.cc
index ed12449cd6fa26da326554519d594cf550e93524..fa26100a42f21eabc8797741e48ba4ac1135f108 100644 (file)
--- a/common/new.cc
+++ b/common/new.cc
@@ -18,12 +18,12 @@
 
 static void *dummy = NULL;
 
-void *operator new(size_t size) throw ()
+void *operator new(size_t size) throw (std::bad_alloc)
 {
     return Malloc(size);
 }
 
-void *operator new[](size_t size) throw ()
+void *operator new[](size_t size) throw (std::bad_alloc)
 {
     if (size == 0) return &dummy;
     else return Malloc(size);
@@ -55,6 +55,17 @@ void* operator new[](size_t size, const char* file, int line)
     else return Malloc_dbg(file, line, size);
 }
 
+void* operator new(size_t size, const std::nothrow_t&, const char* file, int line)
+{
+    return Malloc_dbg(file, line, size);
+}
+
+void* operator new[](size_t size, const std::nothrow_t&, const char* file, int line)
+{
+    if (size == 0) return &dummy;
+    else return Malloc_dbg(file, line, size);
+}
+
 int debug_new_counter_t::count = 0; // initial value
 
 #if defined(__CYGWIN__) || defined(INTERIX)