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

No need for MSGPACK_USE_CPP03 checks in c++11 specific file

Browse Source
This commit is contained in:
Dainis Jonitis 2015-07-09 16:13:04 +03:00
parent 7a131db2a0
commit 4f1e47aa78
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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;