generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-17 19:25:54 +02:00
Code Issues Projects Releases Wiki Activity

Restored pointer based interfaces to maintain compatibility.

Browse Source
This commit is contained in:
Takatoshi Kondo
2013-09-05 11:31:03 +09:00
parent 616be1aa60
commit 9bd339baf8
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/msgpack/object.hpp
View File

@@ -90,7 +90,6 @@ struct object {
template <typename T> template <typename T>
void convert(T* v) const; void convert(T* v) const;
object(); object();
object(msgpack_object o); object(msgpack_object o);

33
src/msgpack/unpack.hpp
View File

@@ -670,25 +670,29 @@ private:
}; };
static void unpack(unpacked& result, inline void unpack(unpacked& result,
const char* data, size_t len, size_t* offset = NULL);
inline void unpack(unpacked* result,
const char* data, size_t len, size_t* offset = NULL); const char* data, size_t len, size_t* offset = NULL);
// obsolete // obsolete
typedef enum { typedef enum {
UNPACK_SUCCESS = 2, UNPACK_SUCCESS = 2,
UNPACK_EXTRA_BYTES = 1, UNPACK_EXTRA_BYTES = 1,
UNPACK_CONTINUE = 0, UNPACK_CONTINUE = 0,
UNPACK_PARSE_ERROR = -1, UNPACK_PARSE_ERROR = -1,
} unpack_return; } unpack_return;
// obsolete // obsolete
static unpack_return unpack(const char* data, size_t len, size_t* off, static unpack_return unpack(const char* data, size_t len, size_t* off,
zone& z, object& result); zone& z, object& result);
static unpack_return unpack(const char* data, size_t len, size_t* off,
zone* z, object* result);
// obsolete // obsolete
static object unpack(const char* data, size_t len, zone& z, size_t* off = NULL); static object unpack(const char* data, size_t len, zone& z, size_t* off = NULL);
static object unpack(const char* data, size_t len, zone* z, size_t* off = NULL);
inline unpacker::unpacker(size_t initial_buffer_size) inline unpacker::unpacker(size_t initial_buffer_size)
@@ -943,7 +947,7 @@ namespace detail {
inline unpack_return inline unpack_return
unpack_imp(const char* data, size_t len, size_t* off, unpack_imp(const char* data, size_t len, size_t* off,
zone& result_zone, object& result) zone& result_zone, object& result)
{ {
size_t noff = 0; size_t noff = 0;
if(off != NULL) { noff = *off; } if(off != NULL) { noff = *off; }
@@ -981,8 +985,9 @@ unpack_imp(const char* data, size_t len, size_t* off,
} // detail } // detail
// reference version
inline void unpack(unpacked& result, inline void unpack(unpacked& result,
const char* data, size_t len, size_t* offset) const char* data, size_t len, size_t* offset)
{ {
object obj; object obj;
msgpack::unique_ptr<zone> z(new zone()); msgpack::unique_ptr<zone> z(new zone());
@@ -1010,17 +1015,30 @@ inline void unpack(unpacked& result,
throw unpack_error("parse error"); throw unpack_error("parse error");
} }
} }
// pointer version
inline void unpack(unpacked* result,
const char* data, size_t len, size_t* offset) {
unpack(*result, data, len, offset);
}
// obsolete // obsolete
// reference version
inline unpack_return unpack(const char* data, size_t len, size_t* off, inline unpack_return unpack(const char* data, size_t len, size_t* off,
zone& z, object& result) zone& z, object& result)
{ {
return detail::unpack_imp(data, len, off, return detail::unpack_imp(data, len, off,
z, result); z, result);
} }
// pointer version
inline unpack_return unpack(const char* data, size_t len, size_t* off,
zone* z, object* result)
{
return unpack(data, len, off, *z, *result);
}
// obsolete // obsolete
// reference version
inline object unpack(const char* data, size_t len, zone& z, size_t* off) inline object unpack(const char* data, size_t len, zone& z, size_t* off)
{ {
object result; object result;
@@ -1044,6 +1062,11 @@ inline object unpack(const char* data, size_t len, zone& z, size_t* off)
throw unpack_error("parse error"); throw unpack_error("parse error");
} }
} }
// pointer version
inline object unpack(const char* data, size_t len, zone* z, size_t* off)
{
return unpack(data, len, *z, off);
}
} // namespace msgpack } // namespace msgpack