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

Fixed #392

Browse Source 
Avoided the warning when `char` does not have sign using template lazy instantiation.
Removed redundant `inline`.
This commit is contained in:
Takatoshi Kondo 2016-01-13 15:31:36 +09:00
parent 96831350b8
commit 22fd249b12
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/msgpack/adaptor/int.hpp
View File

@ -27,7 +27,7 @@ namespace detail {
template <typename T> template <typename T>
struct convert_integer_sign<T, true> { struct convert_integer_sign<T, true> {
static inline T convert(msgpack::object const& o) { static T convert(msgpack::object const& o) {
if(o.type == msgpack::type::POSITIVE_INTEGER) { if(o.type == msgpack::type::POSITIVE_INTEGER) {
if(o.via.u64 > static_cast<uint64_t>(std::numeric_limits<T>::max())) if(o.via.u64 > static_cast<uint64_t>(std::numeric_limits<T>::max()))
{ throw msgpack::type_error(); } { throw msgpack::type_error(); }
@ -43,7 +43,7 @@ namespace detail {
template <typename T> template <typename T>
struct convert_integer_sign<T, false> { struct convert_integer_sign<T, false> {
static inline T convert(msgpack::object const& o) { static T convert(msgpack::object const& o) {
if(o.type == msgpack::type::POSITIVE_INTEGER) { if(o.type == msgpack::type::POSITIVE_INTEGER) {
if(o.via.u64 > static_cast<uint64_t>(std::numeric_limits<T>::max())) if(o.via.u64 > static_cast<uint64_t>(std::numeric_limits<T>::max()))
{ throw msgpack::type_error(); } { throw msgpack::type_error(); }
@ -69,7 +69,9 @@ namespace detail {
template <> template <>
struct object_char_sign<true> { struct object_char_sign<true> {
static inline void make(msgpack::object& o, char v) { template <typename T>
static typename msgpack::enable_if<msgpack::is_same<T, char>::value>::type
make(msgpack::object& o, T v) {
if (v < 0) { if (v < 0) {
o.type = msgpack::type::NEGATIVE_INTEGER; o.type = msgpack::type::NEGATIVE_INTEGER;
o.via.i64 = v; o.via.i64 = v;
@ -83,7 +85,7 @@ namespace detail {
template <> template <>
struct object_char_sign<false> { struct object_char_sign<false> {
static inline void make(msgpack::object& o, char v) { 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;
} }
}; };