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

Removed redundant version namespace qualification.

Browse Source
This commit is contained in:
Takatoshi Kondo
2018-04-08 23:24:17 +09:00
parent f8dc0f0d04
commit 458b4c0363
2 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,10 +36,10 @@ class unpacker : public parser<unpacker, zone_push_finalizer>,
public detail::create_object_visitor {
typedef parser<unpacker, zone_push_finalizer> parser_t;
public:
unpacker(msgpack::v2::unpack_reference_func f = &unpacker::default_reference_func,
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,
msgpack::v2::unpack_limit const& limit = msgpack::v2::unpack_limit())
unpack_limit const& limit = unpack_limit())
:parser_t(m_finalizer, initial_buffer_size),
detail::create_object_visitor(f, user_data, limit),
m_z(new msgpack::zone),
@@ -147,8 +147,8 @@ inline bool unpacker::flush_zone()
inline msgpack::object_handle unpack(
const char* data, std::size_t len, std::size_t& off, bool& referenced,
msgpack::v2::unpack_reference_func f, void* user_data,
msgpack::v2::unpack_limit const& limit
unpack_reference_func f, void* user_data,
unpack_limit const& limit
)
{
msgpack::object obj;
@@ -173,8 +173,8 @@ inline msgpack::object_handle unpack(
inline msgpack::object_handle unpack(
const char* data, std::size_t len, std::size_t& off,
msgpack::v2::unpack_reference_func f, void* user_data,
msgpack::v2::unpack_limit const& limit)
unpack_reference_func f, void* user_data,
unpack_limit const& limit)
{
bool referenced;
return msgpack::v2::unpack(data, len, off, referenced, f, user_data, limit);
@@ -182,8 +182,8 @@ inline msgpack::object_handle unpack(
inline msgpack::object_handle unpack(
const char* data, std::size_t len, bool& referenced,
msgpack::v2::unpack_reference_func f, void* user_data,
msgpack::v2::unpack_limit const& limit)
unpack_reference_func f, void* user_data,
unpack_limit const& limit)
{
std::size_t off = 0;
return msgpack::v2::unpack(data, len, off, referenced, f, user_data, limit);
@@ -191,8 +191,8 @@ inline msgpack::object_handle unpack(
inline msgpack::object_handle unpack(
const char* data, std::size_t len,
msgpack::v2::unpack_reference_func f, void* user_data,
msgpack::v2::unpack_limit const& limit)
unpack_reference_func f, void* user_data,
unpack_limit const& limit)
{
bool referenced;
std::size_t off = 0;
@@ -202,8 +202,8 @@ inline msgpack::object_handle unpack(
inline void unpack(
msgpack::object_handle& result,
const char* data, std::size_t len, std::size_t& off, bool& referenced,
msgpack::v2::unpack_reference_func f, void* user_data,
msgpack::v2::unpack_limit const& limit)
unpack_reference_func f, void* user_data,
unpack_limit const& limit)
{
msgpack::object obj;
msgpack::unique_ptr<msgpack::zone> z(new msgpack::zone);
@@ -231,8 +231,8 @@ inline void unpack(
inline void unpack(
msgpack::object_handle& result,
const char* data, std::size_t len, std::size_t& off,
msgpack::v2::unpack_reference_func f, void* user_data,
msgpack::v2::unpack_limit const& limit)
unpack_reference_func f, void* user_data,
unpack_limit const& limit)
{
bool referenced;
msgpack::v2::unpack(result, data, len, off, referenced, f, user_data, limit);
@@ -241,8 +241,8 @@ inline void unpack(
inline void unpack(
msgpack::object_handle& result,
const char* data, std::size_t len, bool& referenced,
msgpack::v2::unpack_reference_func f, void* user_data,
msgpack::v2::unpack_limit const& limit)
unpack_reference_func f, void* user_data,
unpack_limit const& limit)
{
std::size_t off = 0;
msgpack::v2::unpack(result, data, len, off, referenced, f, user_data, limit);
@@ -251,8 +251,8 @@ inline void unpack(
inline void unpack(
msgpack::object_handle& result,
const char* data, std::size_t len,
msgpack::v2::unpack_reference_func f, void* user_data,
msgpack::v2::unpack_limit const& limit)
unpack_reference_func f, void* user_data,
unpack_limit const& limit)
{
bool referenced;
std::size_t off = 0;
@@ -263,8 +263,8 @@ inline void unpack(
inline msgpack::object unpack(
msgpack::zone& z,
const char* data, std::size_t len, std::size_t& off, bool& referenced,
msgpack::v2::unpack_reference_func f, void* user_data,
msgpack::v2::unpack_limit const& limit)
unpack_reference_func f, void* user_data,
unpack_limit const& limit)
{
msgpack::object obj;
std::size_t noff = off;
@@ -288,8 +288,8 @@ inline msgpack::object unpack(
inline msgpack::object unpack(
msgpack::zone& z,
const char* data, std::size_t len, std::size_t& off,
msgpack::v2::unpack_reference_func f, void* user_data,
msgpack::v2::unpack_limit const& limit)
unpack_reference_func f, void* user_data,
unpack_limit const& limit)
{
bool referenced;
return msgpack::v2::unpack(z, data, len, off, referenced, f, user_data, limit);
@@ -298,8 +298,8 @@ inline msgpack::object unpack(
inline msgpack::object unpack(
msgpack::zone& z,
const char* data, std::size_t len, bool& referenced,
msgpack::v2::unpack_reference_func f, void* user_data,
msgpack::v2::unpack_limit const& limit)
unpack_reference_func f, void* user_data,
unpack_limit const& limit)
{
std::size_t off = 0;
return msgpack::v2::unpack(z, data, len, off, referenced, f, user_data, limit);
@@ -308,8 +308,8 @@ inline msgpack::object unpack(
inline msgpack::object unpack(
msgpack::zone& z,
const char* data, std::size_t len,
msgpack::v2::unpack_reference_func f, void* user_data,
msgpack::v2::unpack_limit const& limit)
unpack_reference_func f, void* user_data,
unpack_limit const& limit)
{
bool referenced;
std::size_t off = 0;
@@ -321,8 +321,8 @@ namespace detail {
inline parse_return
unpack_imp(const char* data, std::size_t len, std::size_t& off,
msgpack::zone& result_zone, msgpack::object& result, bool& referenced,
msgpack::v2::unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR,
msgpack::v2::unpack_limit const& limit = msgpack::v2::unpack_limit())
unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR,
unpack_limit const& limit = unpack_limit())
{
create_object_visitor v(f, user_data, limit);
v.set_zone(result_zone);

28
include/msgpack/v2/unpack_decl.hpp
View File

@@ -102,7 +102,7 @@ class basic_unpacker;
*/
msgpack::object_handle unpack(
const char* data, std::size_t len, std::size_t& off, bool& referenced,
msgpack::v2::unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, msgpack::v2::unpack_limit const& limit = msgpack::v2::unpack_limit());
unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit());
/// Unpack msgpack::object from a buffer.
/**
@@ -118,7 +118,7 @@ msgpack::object_handle unpack(
*/
msgpack::object_handle unpack(
const char* data, std::size_t len, std::size_t& off,
msgpack::v2::unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, msgpack::v2::unpack_limit const& limit = msgpack::v2::unpack_limit());
unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit());
/// Unpack msgpack::object from a buffer.
/**
@@ -134,7 +134,7 @@ msgpack::object_handle unpack(
*/
msgpack::object_handle unpack(
const char* data, std::size_t len, bool& referenced,
msgpack::v2::unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, msgpack::v2::unpack_limit const& limit = msgpack::v2::unpack_limit());
unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit());
/// Unpack msgpack::object from a buffer.
/**
@@ -149,7 +149,7 @@ msgpack::object_handle unpack(
*/
msgpack::object_handle unpack(
const char* data, std::size_t len,
msgpack::v2::unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, msgpack::v2::unpack_limit const& limit = msgpack::v2::unpack_limit());
unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit());
/// Unpack msgpack::object from a buffer.
@@ -168,7 +168,7 @@ msgpack::object_handle unpack(
void unpack(
msgpack::object_handle& result,
const char* data, std::size_t len, std::size_t& off, bool& referenced,
msgpack::v2::unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, msgpack::v2::unpack_limit const& limit = msgpack::v2::unpack_limit());
unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit());
/// Unpack msgpack::object from a buffer.
/**
@@ -185,7 +185,7 @@ void unpack(
void unpack(
msgpack::object_handle& result,
const char* data, std::size_t len, std::size_t& off,
msgpack::v2::unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, msgpack::v2::unpack_limit const& limit = msgpack::v2::unpack_limit());
unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit());
/// Unpack msgpack::object from a buffer.
/**
@@ -202,7 +202,7 @@ void unpack(
void unpack(
msgpack::object_handle& result,
const char* data, std::size_t len, bool& referenced,
msgpack::v2::unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, msgpack::v2::unpack_limit const& limit = msgpack::v2::unpack_limit());
unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit());
/// Unpack msgpack::object from a buffer.
/**
@@ -218,7 +218,7 @@ void unpack(
void unpack(
msgpack::object_handle& result,
const char* data, std::size_t len,
msgpack::v2::unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, msgpack::v2::unpack_limit const& limit = msgpack::v2::unpack_limit());
unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit());
/// Unpack msgpack::object from a buffer.
/**
@@ -237,7 +237,7 @@ void unpack(
msgpack::object unpack(
msgpack::zone& z,
const char* data, std::size_t len, std::size_t& off, bool& referenced,
msgpack::v2::unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, msgpack::v2::unpack_limit const& limit = msgpack::v2::unpack_limit());
unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit());
/// Unpack msgpack::object from a buffer.
/**
@@ -255,7 +255,7 @@ msgpack::object unpack(
msgpack::object unpack(
msgpack::zone& z,
const char* data, std::size_t len, std::size_t& off,
msgpack::v2::unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, msgpack::v2::unpack_limit const& limit = msgpack::v2::unpack_limit());
unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit());
/// Unpack msgpack::object from a buffer.
/**
@@ -273,7 +273,7 @@ msgpack::object unpack(
msgpack::object unpack(
msgpack::zone& z,
const char* data, std::size_t len, bool& referenced,
msgpack::v2::unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, msgpack::v2::unpack_limit const& limit = msgpack::v2::unpack_limit());
unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit());
/// Unpack msgpack::object from a buffer.
/**
@@ -290,15 +290,15 @@ msgpack::object unpack(
msgpack::object unpack(
msgpack::zone& z,
const char* data, std::size_t len,
msgpack::v2::unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, msgpack::v2::unpack_limit const& limit = msgpack::v2::unpack_limit());
unpack_reference_func f = MSGPACK_NULLPTR, void* user_data = MSGPACK_NULLPTR, unpack_limit const& limit = unpack_limit());
namespace detail {
parse_return
unpack_imp(const char* data, std::size_t len, std::size_t& off,
msgpack::zone& result_zone, msgpack::object& result, bool& referenced,
msgpack::v2::unpack_reference_func f, void* user_data,
msgpack::v2::unpack_limit const& limit);
unpack_reference_func f, void* user_data,
unpack_limit const& limit);
} // detail