am 67917c05: Make exception specifications conditional on language dialect for new / delete operators (fixes warnings when compiling as C++11)

* commit '67917c05cce38db86e6e92bf0379d3668454c720':
  Make exception specifications conditional on language dialect for new / delete operators (fixes warnings when compiling as C++11)

1 files changed, 10 insertions, 1 deletions

diff --git a/src/memory.cc b/src/memory.cc
index c86fc85..c8d28fc 100644
--- a/src/memory.cc
+++ b/src/memory.cc
@@ -111,6 +111,9 @@ void* operator new(size_t size, const std::nothrow_t &) throw()
 
 __attribute__((weak))
 void operator delete(void * ptr)
+#if __cplusplus < 201000L
+throw()
+#endif
 {
 	free(ptr);
 }
@@ -118,6 +121,9 @@ void operator delete(void * ptr)
 
 __attribute__((weak))
 void * operator new[](size_t size)
+#if __cplusplus < 201000L
+throw(std::bad_alloc)
+#endif
 {
 	return ::operator new(size);
 }
@@ -137,7 +143,10 @@ void * operator new[](size_t size, const std::nothrow_t &) throw()
 
 
 __attribute__((weak))
-void operator delete[](void * ptr) throw()
+void operator delete[](void * ptr)
+#if __cplusplus < 201000L
+throw()
+#endif
 {
 	::operator delete(ptr);
 }