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

Merge pull request #641 from redboltz/fix_640

Browse Source 
Fixed #640.
This commit is contained in:
Takatoshi Kondo 2017-11-04 15:43:02 +09:00 committed by GitHub
commit db6d4f2003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 95 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
include/msgpack/v1/adaptor/fixint.hpp
View File

@ -201,75 +201,91 @@ struct object<type::fix_int64> {
template <>
struct object<type::fix_uint8> {
void operator()(msgpack::object& o, type::fix_uint8 v) const
{ o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v.get(); }
void operator()(msgpack::object& o, type::fix_uint8 v) const {
o.type = msgpack::type::POSITIVE_INTEGER;
o.via.u64 = v.get();
}
};
template <>
struct object<type::fix_uint16> {
void operator()(msgpack::object& o, type::fix_uint16 v) const
{ o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v.get(); }
void operator()(msgpack::object& o, type::fix_uint16 v) const {
o.type = msgpack::type::POSITIVE_INTEGER;
o.via.u64 = v.get();
}
};
template <>
struct object<type::fix_uint32> {
void operator()(msgpack::object& o, type::fix_uint32 v) const
{ o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v.get(); }
void operator()(msgpack::object& o, type::fix_uint32 v) const {
o.type = msgpack::type::POSITIVE_INTEGER;
o.via.u64 = v.get();
}
};
template <>
struct object<type::fix_uint64> {
void operator()(msgpack::object& o, type::fix_uint64 v) const
{ o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v.get(); }
void operator()(msgpack::object& o, type::fix_uint64 v) const {
o.type = msgpack::type::POSITIVE_INTEGER;
o.via.u64 = v.get();
}
};
template <>
struct object_with_zone<type::fix_int8> {
void operator()(msgpack::object::with_zone& o, type::fix_int8 v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, type::fix_int8 v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<type::fix_int16> {
void operator()(msgpack::object::with_zone& o, type::fix_int16 v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, type::fix_int16 v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<type::fix_int32> {
void operator()(msgpack::object::with_zone& o, type::fix_int32 v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, type::fix_int32 v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<type::fix_int64> {
void operator()(msgpack::object::with_zone& o, type::fix_int64 v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, type::fix_int64 v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<type::fix_uint8> {
void operator()(msgpack::object::with_zone& o, type::fix_uint8 v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, type::fix_uint8 v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<type::fix_uint16> {
void operator()(msgpack::object::with_zone& o, type::fix_uint16 v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, type::fix_uint16 v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<type::fix_uint32> {
void operator()(msgpack::object::with_zone& o, type::fix_uint32 v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, type::fix_uint32 v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<type::fix_uint64> {
void operator()(msgpack::object::with_zone& o, type::fix_uint64 v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, type::fix_uint64 v) const {
static_cast<msgpack::object&>(o) << v;
}
};
} // namespace adaptor

88
include/msgpack/v1/adaptor/int.hpp
View File

@ -82,7 +82,8 @@ struct object_char_sign<true> {
template <>
struct object_char_sign<false> {
static void make(msgpack::object& o, char v) {
o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v;
o.type = msgpack::type::POSITIVE_INTEGER;
o.via.u64 = v;
}
};
@ -320,99 +321,120 @@ struct object<signed long long> {
template <>
struct object<unsigned char> {
void operator()(msgpack::object& o, unsigned char v) const
{ o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; }
void operator()(msgpack::object& o, unsigned char v) const {
o.type = msgpack::type::POSITIVE_INTEGER;
o.via.u64 = v;
}
};
template <>
struct object<unsigned short> {
void operator()(msgpack::object& o, unsigned short v) const
{ o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; }
void operator()(msgpack::object& o, unsigned short v) const {
o.type = msgpack::type::POSITIVE_INTEGER;
o.via.u64 = v;
}
};
template <>
struct object<unsigned int> {
void operator()(msgpack::object& o, unsigned int v) const
{ o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; }
void operator()(msgpack::object& o, unsigned int v) const {
o.type = msgpack::type::POSITIVE_INTEGER;
o.via.u64 = v;
}
};
template <>
struct object<unsigned long> {
void operator()(msgpack::object& o, unsigned long v) const
{ o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; }
void operator()(msgpack::object& o, unsigned long v) const {
o.type = msgpack::type::POSITIVE_INTEGER;
o.via.u64 = v;
}
};
template <>
struct object<unsigned long long> {
void operator()(msgpack::object& o, unsigned long long v) const
{ o.type = msgpack::type::POSITIVE_INTEGER, o.via.u64 = v; }
void operator()(msgpack::object& o, unsigned long long v) const {
o.type = msgpack::type::POSITIVE_INTEGER;
o.via.u64 = v;
}
};
template <>
struct object_with_zone<char> {
void operator()(msgpack::object::with_zone& o, char v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, char v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<signed char> {
void operator()(msgpack::object::with_zone& o, signed char v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, signed char v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<signed short> {
void operator()(msgpack::object::with_zone& o, signed short v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, signed short v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<signed int> {
void operator()(msgpack::object::with_zone& o, signed int v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, signed int v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<signed long> {
void operator()(msgpack::object::with_zone& o, signed long v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, signed long v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<signed long long> {
void operator()(msgpack::object::with_zone& o, const signed long long& v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, const signed long long& v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<unsigned char> {
void operator()(msgpack::object::with_zone& o, unsigned char v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, unsigned char v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<unsigned short> {
void operator()(msgpack::object::with_zone& o, unsigned short v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, unsigned short v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<unsigned int> {
void operator()(msgpack::object::with_zone& o, unsigned int v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, unsigned int v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<unsigned long> {
void operator()(msgpack::object::with_zone& o, unsigned long v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, unsigned long v) const {
static_cast<msgpack::object&>(o) << v;
}
};
template <>
struct object_with_zone<unsigned long long> {
void operator()(msgpack::object::with_zone& o, const unsigned long long& v) const
{ static_cast<msgpack::object&>(o) << v; }
void operator()(msgpack::object::with_zone& o, const unsigned long long& v) const {
static_cast<msgpack::object&>(o) << v;
}
};
} // namespace adaptor