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

Modified passed by value of object to const reference of object.

Browse Source 
Removed C function call in operator==.
This commit is contained in:
Takatoshi Kondo
2013-09-04 13:28:23 +09:00
parent 56b0ad6809
commit 8a08548f36
5 changed files with 99 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cpp11/define.hpp
View File

@@ -24,7 +24,7 @@
{ \
msgpack::type::make_define(__VA_ARGS__).msgpack_pack(pk); \
} \
void msgpack_unpack(msgpack::object o) \
void msgpack_unpack(msgpack::object const& o) \
{ \
msgpack::type::make_define(__VA_ARGS__).msgpack_unpack(o); \
}\
@@ -38,7 +38,7 @@
#define MSGPACK_ADD_ENUM(enum) \
namespace msgpack { \
template <> \
inline enum& operator>> (object o, enum& v) \
inline enum& operator>> (object const& o, enum& v) \
{ \
int tmp; \
o >> tmp; \
@@ -71,7 +71,7 @@ struct define_imp {
define_imp<Tuple, N-1>::pack(pk, t);
pk.pack(std::get<N-1>(t));
}
static void unpack(msgpack::object o, Tuple& t) {
static void unpack(msgpack::object const& o, Tuple& t) {
define_imp<Tuple, N-1>::unpack(o, t);
const size_t size = o.via.array.size;
if(size <= N-1) { return; }
@@ -89,7 +89,7 @@ struct define_imp<Tuple, 1> {
static void pack(Packer& pk, Tuple const& t) {
pk.pack(std::get<0>(t));
}
static void unpack(msgpack::object o, Tuple& t) {
static void unpack(msgpack::object const& o, Tuple& t) {
const size_t size = o.via.array.size;
if(size <= 0) { return; }
o.via.array.ptr[0].convert(&std::get<0>(t));
@@ -112,7 +112,7 @@ struct define {
define_imp<tuple<Args&...>, sizeof...(Args)>::pack(pk, a);
}
void msgpack_unpack(msgpack::object o)
void msgpack_unpack(msgpack::object const& o)
{
if(o.type != type::ARRAY) { throw type_error(); }
@@ -139,7 +139,7 @@ struct define<> {
{
pk.pack_array(0);
}
void msgpack_unpack(msgpack::object o)
void msgpack_unpack(msgpack::object const& o)
{
if(o.type != type::ARRAY) { throw type_error(); }
}

6
cpp11/tuple.hpp
View File

@@ -138,7 +138,7 @@ const packer<Stream>& operator<< (
template <typename Tuple, std::size_t N>
struct Converter {
static void convert(
object o,
object const& o,
Tuple& v) {
Converter<Tuple, N-1>::convert(o, v);
o.via.array.ptr[N-1].convert<typename std::remove_reference<decltype(type::get<N-1>(v))>::type>(&type::get<N-1>(v));
@@ -148,7 +148,7 @@ struct Converter {
template <typename Tuple>
struct Converter<Tuple, 1> {
static void convert (
object o,
object const& o,
Tuple& v) {
o.via.array.ptr[0].convert<typename std::remove_reference<decltype(type::get<0>(v))>::type>(&type::get<0>(v));
}
@@ -156,7 +156,7 @@ struct Converter<Tuple, 1> {
template <typename... Args>
type::tuple<Args...>& operator>> (
object o,
object const& o,
type::tuple<Args...>& v) {
if(o.type != type::ARRAY) { throw type_error(); }
if(o.via.array.size < sizeof...(Args)) { throw type_error(); }