summaryrefslogtreecommitdiffstats
path: root/vespamalloc
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-05-04 11:01:09 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2017-05-05 13:58:09 +0200
commit43d1510fcceef6240850a185cd141af6f79a5466 (patch)
treeaf450aeff08fd9b5de25c58b4949e96b5046c60b /vespamalloc
parente09902597b1ed45cd4b32989501c06d18883a7a2 (diff)
No dynamic exceptions in ISO c++1z, gcc 7
Diffstat (limited to 'vespamalloc')
-rw-r--r--vespamalloc/src/vespamalloc/malloc/overload.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/vespamalloc/src/vespamalloc/malloc/overload.h b/vespamalloc/src/vespamalloc/malloc/overload.h
index 4f3f62b8655..4735aedbd58 100644
--- a/vespamalloc/src/vespamalloc/malloc/overload.h
+++ b/vespamalloc/src/vespamalloc/malloc/overload.h
@@ -25,7 +25,7 @@ void operator delete(void* ptr, std::size_t sz, const std::nothrow_t&) noexcept
void operator delete[](void* ptr, std::size_t sz, const std::nothrow_t&) noexcept __attribute__((visibility ("default")));
#endif
-void* operator new(std::size_t sz) throw (std::bad_alloc)
+void* operator new(std::size_t sz)
{
void * ptr(vespamalloc::createAllocator()->malloc(sz));
if (ptr == nullptr) {
@@ -34,7 +34,7 @@ void* operator new(std::size_t sz) throw (std::bad_alloc)
return ptr;
}
-void* operator new[](std::size_t sz) throw (std::bad_alloc)
+void* operator new[](std::size_t sz)
{
return ::operator new(sz);
}