From 2e4de8b65c43962c412488ead41abc53a4f88f30 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Wed, 6 Jul 2016 20:35:26 +0900 Subject: [PATCH] Fixed #498. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=38764 --- include/msgpack/v2/unpack.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/msgpack/v2/unpack.hpp b/include/msgpack/v2/unpack.hpp index 08cf2d5e..227d1c77 100644 --- a/include/msgpack/v2/unpack.hpp +++ b/include/msgpack/v2/unpack.hpp @@ -1262,13 +1262,13 @@ struct zone_push_finalizer { class unpacker : public parser, public detail::create_object_visitor { - typedef parser parser; + typedef parser parser_t; public: unpacker(unpack_reference_func f = &unpacker::default_reference_func, void* user_data = MSGPACK_NULLPTR, std::size_t initial_buffer_size = MSGPACK_UNPACKER_INIT_BUFFER_SIZE, unpack_limit const& limit = unpack_limit()) - :parser(m_finalizer, initial_buffer_size), + :parser_t(m_finalizer, initial_buffer_size), detail::create_object_visitor(f, user_data, limit), m_z(new msgpack::zone), m_finalizer(*m_z) { @@ -1318,7 +1318,7 @@ private: }; inline bool unpacker::next(msgpack::object_handle& result, bool& referenced) { - bool ret = parser::next(); + bool ret = parser_t::next(); if (ret) { referenced = detail::create_object_visitor::referenced(); result.zone().reset( release_zone() );