Index: base/allocator/generic_allocators.cc |
diff --git a/base/allocator/generic_allocators.cc b/base/allocator/generic_allocators.cc |
index 2726903faf3589e5f247a34c6eaf133b5a57c110..ae65f77a55bdb6d81259d9bfb5bd059578de25c3 100644 |
--- a/base/allocator/generic_allocators.cc |
+++ b/base/allocator/generic_allocators.cc |
@@ -28,7 +28,7 @@ void* operator new(size_t size) { |
return generic_cpp_alloc(size, false); |
} |
-void operator delete(void* p) { |
+void operator delete(void* p) throw() { |
free(p); |
} |
@@ -36,7 +36,7 @@ void* operator new[](size_t size) { |
return generic_cpp_alloc(size, false); |
} |
-void operator delete[](void* p) { |
+void operator delete[](void* p) throw() { |
free(p); |
} |
@@ -44,7 +44,7 @@ void* operator new(size_t size, const std::nothrow_t& nt) { |
return generic_cpp_alloc(size, true); |
} |
-void operator delete(void* p, const std::nothrow_t& nt) { |
+void operator delete(void* p, const std::nothrow_t& nt) throw() { |
free(p); |
} |
@@ -52,7 +52,7 @@ void* operator new[](size_t size, const std::nothrow_t& nt) { |
return generic_cpp_alloc(size, true); |
} |
-void operator delete[](void* p, const std::nothrow_t& nt) { |
+void operator delete[](void* p, const std::nothrow_t& nt) throw() { |
free(p); |
} |
@@ -83,10 +83,6 @@ void* calloc(size_t n, size_t elem_size) { |
return result; |
} |
-void cfree(void* p) { |
- free(p); |
-} |
- |
#ifdef WIN32 |
void* _recalloc(void* p, size_t n, size_t elem_size) { |