generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-06-03 05:22:05 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #313 from jonitis/master

Browse Source 
c++11 code should use nothrow instead of throw()
This commit is contained in:
Takatoshi Kondo 2015-07-12 09:53:04 +09:00
commit b8d357c2ad
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/msgpack/detail/cpp11_zone.hpp
View File

@ -97,7 +97,6 @@ private:
++m_tail; ++m_tail;
} }
#if !defined(MSGPACK_USE_CPP03)
finalizer_array(finalizer_array&& other) noexcept finalizer_array(finalizer_array&& other) noexcept
:m_tail(other.m_tail), m_end(other.m_end), m_array(other.m_array) :m_tail(other.m_tail), m_end(other.m_end), m_array(other.m_array)
{ {
@ -111,7 +110,7 @@ private:
new (this) finalizer_array(std::move(other)); new (this) finalizer_array(std::move(other));
return *this; return *this;
} }
#endif
finalizer* m_tail; finalizer* m_tail;
finalizer* m_end; finalizer* m_end;
finalizer* m_array; finalizer* m_array;
@ -162,7 +161,6 @@ private:
m_free = chunk_size; m_free = chunk_size;
m_ptr = reinterpret_cast<char*>(m_head) + sizeof(chunk); m_ptr = reinterpret_cast<char*>(m_head) + sizeof(chunk);
} }
#if !defined(MSGPACK_USE_CPP03)
chunk_list(chunk_list&& other) noexcept chunk_list(chunk_list&& other) noexcept
:m_free(other.m_free), m_ptr(other.m_ptr), m_head(other.m_head) :m_free(other.m_free), m_ptr(other.m_ptr), m_head(other.m_head)
{ {
@ -174,7 +172,7 @@ private:
new (this) chunk_list(std::move(other)); new (this) chunk_list(std::move(other));
return *this; return *this;
} }
#endif
size_t m_free; size_t m_free;
char* m_ptr; char* m_ptr;
chunk* m_head; chunk* m_head;
@ -203,21 +201,21 @@ public:
void swap(zone& o); 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); void* p = ::malloc(size);
if (!p) throw std::bad_alloc(); if (!p) throw std::bad_alloc();
return p; return p;
} }
static void operator delete(void *p) throw() static void operator delete(void *p) noexcept
{ {
::free(p); ::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; return mem;
} }
static void operator delete(void * /*p*/, void* /*mem*/) throw() static void operator delete(void * /*p*/, void* /*mem*/) noexcept
{ {
} }