From 7a131db2a067d35670925da3260a992afd17ae5a Mon Sep 17 00:00:00 2001 From: Dainis Jonitis Date: Thu, 9 Jul 2015 15:37:17 +0300 Subject: [PATCH] c++11 code should use nothrow instead of throw() --- include/msgpack/detail/cpp11_zone.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/msgpack/detail/cpp11_zone.hpp b/include/msgpack/detail/cpp11_zone.hpp index 8010d760..a4e5b67c 100644 --- a/include/msgpack/detail/cpp11_zone.hpp +++ b/include/msgpack/detail/cpp11_zone.hpp @@ -203,21 +203,21 @@ public: void swap(zone& o); - static void* operator new(std::size_t size) throw(std::bad_alloc) + static void* operator new(std::size_t size) { void* p = ::malloc(size); if (!p) throw std::bad_alloc(); return p; } - static void operator delete(void *p) throw() + static void operator delete(void *p) noexcept { ::free(p); } - static void* operator new(std::size_t /*size*/, void* mem) throw() + static void* operator new(std::size_t /*size*/, void* mem) noexcept { return mem; } - static void operator delete(void * /*p*/, void* /*mem*/) throw() + static void operator delete(void * /*p*/, void* /*mem*/) noexcept { }