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

fix unpacker

Browse Source
This commit is contained in:
frsyuki
2009-03-01 02:27:04 +09:00
parent 6fc38d1669
commit bf13ba72b5
4 changed files with 76 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cpp/unpack.hpp
View File

@@ -39,7 +39,7 @@ struct unpack_error : public std::runtime_error {
class unpacker : public msgpack_unpacker {
public:
unpacker(size_t initial_buffer_size = MSGPACK_UNPACKER_DEFAULT_INITIAL_BUFFER_SIZE);
unpacker(size_t init_buffer_size = MSGPACK_UNPACKER_DEFAULT_INITIAL_BUFFER_SIZE);
~unpacker();
public:
@@ -126,6 +126,9 @@ public:
// Note that reset() leaves non-parsed buffer.
void remove_nonparsed_buffer();
private:
typedef msgpack_unpacker base;
private:
unpacker(const unpacker&);
};
@@ -207,9 +210,9 @@ inline zone* unpacker::release_zone()
zone* r = new zone();
msgpack_zone old = *this->z;
*this->z = *z;
*z = old;
msgpack_zone old = *base::z;
*base::z = *r;
*static_cast<msgpack_zone*>(r) = old;
return r;
}
@@ -232,22 +235,22 @@ inline size_t unpacker::parsed_size() const
inline char* unpacker::nonparsed_buffer()
{
return buf + off;
return base::buffer + base::off;
}
inline size_t unpacker::nonparsed_size() const
{
return used - off;
return base::used - base::off;
}
inline void unpacker::skip_nonparsed_buffer(size_t size)
{
off += size;
base::off += size;
}
inline void unpacker::remove_nonparsed_buffer()
{
used = off;
base::used = base::off;
}