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

Supported 'plain' char.

Browse Source 
msgpack used to only support signed char and unsigned char.
This commit is contained in:
Takatoshi Kondo
2013-10-30 16:04:23 +09:00
parent f187ae35d9
commit 293c839a22
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/msgpack/type/int.hpp
View File

@@ -63,7 +63,7 @@ namespace detail {
}; };
template <typename T> template <typename T>
static inline T convert_integer(object o) static inline T convert_integer(object const& o)
{ {
return detail::convert_integer_sign<T, is_signed<T>::value>::convert(o); return detail::convert_integer_sign<T, is_signed<T>::value>::convert(o);
} }
@@ -99,7 +99,7 @@ namespace detail {
struct object_char_sign<true> { struct object_char_sign<true> {
static inline void make(object& o, char v) { static inline void make(object& o, char v) {
v < 0 ? o.type = type::NEGATIVE_INTEGER, o.via.i64 = v v < 0 ? o.type = type::NEGATIVE_INTEGER, o.via.i64 = v
: o.type = type::POSITIVE_INTEGER, o.via.u64 = v; : o.type = type::POSITIVE_INTEGER, o.via.u64 = v;
} }
}; };
@@ -152,10 +152,12 @@ inline unsigned long& operator>> (object const& o, unsigned long& v)
inline unsigned long long& operator>> (object const& o, unsigned long long& v) inline unsigned long long& operator>> (object const& o, unsigned long long& v)
{ v = type::detail::convert_integer<unsigned long long>(o); return v; } { v = type::detail::convert_integer<unsigned long long>(o); return v; }
template <typename Stream> template <typename Stream>
inline packer<Stream>& operator<< (packer<Stream>& o, char v) inline packer<Stream>& operator<< (packer<Stream>& o, char v)
{ return type::detail::pack_char(o, v); } { return type::detail::pack_char(o, v); }
template <typename Stream> template <typename Stream>
inline packer<Stream>& operator<< (packer<Stream>& o, signed char v) inline packer<Stream>& operator<< (packer<Stream>& o, signed char v)
{ o.pack_int8(v); return o; } { o.pack_int8(v); return o; }
@@ -234,6 +236,7 @@ inline void operator<< (object& o, unsigned long long v)
{ o.type = type::POSITIVE_INTEGER, o.via.u64 = v; } { o.type = type::POSITIVE_INTEGER, o.via.u64 = v; }
inline void operator<< (object::with_zone& o, char v) inline void operator<< (object::with_zone& o, char v)
{ static_cast<object&>(o) << v; } { static_cast<object&>(o) << v; }