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

Merge pull request #499 from redboltz/fix_498

Browse Source 
Fixed #498.
This commit is contained in:
Takatoshi Kondo 2016-07-10 09:27:11 +09:00 committed by GitHub
commit f573fd6a26
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/msgpack/v2/unpack.hpp
View File

@ -1262,13 +1262,13 @@ struct zone_push_finalizer {
class unpacker : public parser<unpacker, zone_push_finalizer>, class unpacker : public parser<unpacker, zone_push_finalizer>,
public detail::create_object_visitor { public detail::create_object_visitor {
typedef parser<unpacker, zone_push_finalizer> parser; typedef parser<unpacker, zone_push_finalizer> parser_t;
public: public:
unpacker(unpack_reference_func f = &unpacker::default_reference_func, unpacker(unpack_reference_func f = &unpacker::default_reference_func,
void* user_data = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR,
std::size_t initial_buffer_size = MSGPACK_UNPACKER_INIT_BUFFER_SIZE, std::size_t initial_buffer_size = MSGPACK_UNPACKER_INIT_BUFFER_SIZE,
unpack_limit const& limit = unpack_limit()) 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), detail::create_object_visitor(f, user_data, limit),
m_z(new msgpack::zone), m_z(new msgpack::zone),
m_finalizer(*m_z) { m_finalizer(*m_z) {
@ -1318,7 +1318,7 @@ private:
}; };
inline bool unpacker::next(msgpack::object_handle& result, bool& referenced) { inline bool unpacker::next(msgpack::object_handle& result, bool& referenced) {
bool ret = parser::next(); bool ret = parser_t::next();
if (ret) { if (ret) {
referenced = detail::create_object_visitor::referenced(); referenced = detail::create_object_visitor::referenced();
result.zone().reset( release_zone() ); result.zone().reset( release_zone() );