From 4f1e47aa785bbc82bd41183358ebe60ea575eb91 Mon Sep 17 00:00:00 2001 From: Dainis Jonitis Date: Thu, 9 Jul 2015 16:13:04 +0300 Subject: [PATCH] No need for MSGPACK_USE_CPP03 checks in c++11 specific file --- include/msgpack/detail/cpp11_zone.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/msgpack/detail/cpp11_zone.hpp b/include/msgpack/detail/cpp11_zone.hpp index a4e5b67c..ac30856d 100644 --- a/include/msgpack/detail/cpp11_zone.hpp +++ b/include/msgpack/detail/cpp11_zone.hpp @@ -97,7 +97,6 @@ private: ++m_tail; } -#if !defined(MSGPACK_USE_CPP03) finalizer_array(finalizer_array&& other) noexcept :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)); return *this; } -#endif + finalizer* m_tail; finalizer* m_end; finalizer* m_array; @@ -162,7 +161,6 @@ private: m_free = chunk_size; m_ptr = reinterpret_cast(m_head) + sizeof(chunk); } -#if !defined(MSGPACK_USE_CPP03) chunk_list(chunk_list&& other) noexcept :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)); return *this; } -#endif + size_t m_free; char* m_ptr; chunk* m_head;