diff --git a/src/msgpack/type/fixint.hpp b/src/msgpack/type/fixint.hpp index ebe2696f..38633c66 100644 --- a/src/msgpack/type/fixint.hpp +++ b/src/msgpack/type/fixint.hpp @@ -115,16 +115,61 @@ inline packer& operator<< (packer& o, const type::fix_uint64& v) inline void operator<< (object& o, type::fix_int8 v) - { v.get() < 0 ? o.type = type::NEGATIVE_INTEGER, o.via.i64 = v.get() : o.type = type::POSITIVE_INTEGER, o.via.u64 = v.get(); } + { + if ( v.get() < 0 ) + { + o.type = type::NEGATIVE_INTEGER ; + o.via.i64 = v.get() ; + } + else + { + o.type = type::POSITIVE_INTEGER ; + o.via.u64 = v.get() ; + } + } inline void operator<< (object& o, type::fix_int16 v) - { v.get() < 0 ? o.type = type::NEGATIVE_INTEGER, o.via.i64 = v.get() : o.type = type::POSITIVE_INTEGER, o.via.u64 = v.get(); } + { + if ( v.get() < 0 ) + { + o.type = type::NEGATIVE_INTEGER ; + o.via.i64 = v.get() ; + } + else + { + o.type = type::POSITIVE_INTEGER ; + o.via.u64 = v.get() ; + } + } inline void operator<< (object& o, type::fix_int32 v) - { v.get() < 0 ? o.type = type::NEGATIVE_INTEGER, o.via.i64 = v.get() : o.type = type::POSITIVE_INTEGER, o.via.u64 = v.get(); } + { + if ( v.get() < 0 ) + { + o.type = type::NEGATIVE_INTEGER ; + o.via.i64 = v.get() ; + } + else + { + o.type = type::POSITIVE_INTEGER ; + o.via.u64 = v.get() ; + } + } inline void operator<< (object& o, type::fix_int64 v) - { v.get() < 0 ? o.type = type::NEGATIVE_INTEGER, o.via.i64 = v.get() : o.type = type::POSITIVE_INTEGER, o.via.u64 = v.get(); } + { + if( v.get() < 0 ) + { + o.type = type::NEGATIVE_INTEGER ; + o.via.i64 = v.get() ; + } + else + { + o.type = type::POSITIVE_INTEGER ; + o.via.u64 = v.get() ; + } + } + inline void operator<< (object& o, type::fix_uint8 v) diff --git a/src/msgpack/type/int.hpp b/src/msgpack/type/int.hpp index 6a1477ee..103fea7d 100644 --- a/src/msgpack/type/int.hpp +++ b/src/msgpack/type/int.hpp @@ -98,8 +98,16 @@ namespace detail { template <> struct object_char_sign { static inline void make(object& o, char v) { - v < 0 ? o.type = type::NEGATIVE_INTEGER, o.via.i64 = v - : o.type = type::POSITIVE_INTEGER, o.via.u64 = v; + if( v < 0 ) + { + o.type = type::NEGATIVE_INTEGER ; + o.via.i64 = v ; + } + else + { + o.type = type::POSITIVE_INTEGER ; + o.via.u64 = v ; + } } }; @@ -203,19 +211,74 @@ inline void operator<< (object& o, char v) inline void operator<< (object& o, signed char v) - { v < 0 ? o.type = type::NEGATIVE_INTEGER, o.via.i64 = v : o.type = type::POSITIVE_INTEGER, o.via.u64 = v; } + { + if( v < 0 ) + { + o.type = type::NEGATIVE_INTEGER ; + o.via.i64 = v; + } + else + { + o.type = type::POSITIVE_INTEGER ; + o.via.u64 = v ; + } + } inline void operator<< (object& o, signed short v) - { v < 0 ? o.type = type::NEGATIVE_INTEGER, o.via.i64 = v : o.type = type::POSITIVE_INTEGER, o.via.u64 = v; } + { + if(v < 0 ) + { + o.type = type::NEGATIVE_INTEGER ; + o.via.i64 = v ; + } + else + { + o.type = type::POSITIVE_INTEGER ; + o.via.u64 = v; + } + } inline void operator<< (object& o, signed int v) - { v < 0 ? o.type = type::NEGATIVE_INTEGER, o.via.i64 = v : o.type = type::POSITIVE_INTEGER, o.via.u64 = v; } + { + if( v < 0 ) + { + o.type = type::NEGATIVE_INTEGER ; + o.via.i64 = v ; + } + else + { + o.type = type::POSITIVE_INTEGER ; + o.via.u64 = v ; + } + } inline void operator<< (object& o, signed long v) - { v < 0 ? o.type = type::NEGATIVE_INTEGER, o.via.i64 = v : o.type = type::POSITIVE_INTEGER, o.via.u64 = v; } + { + if( v < 0 ) + { + o.type = type::NEGATIVE_INTEGER ; + o.via.i64 = v ; + } + else + { + o.type = type::POSITIVE_INTEGER ; + o.via.u64 = v ; + } + } inline void operator<< (object& o, signed long long v) - { v < 0 ? o.type = type::NEGATIVE_INTEGER, o.via.i64 = v : o.type = type::POSITIVE_INTEGER, o.via.u64 = v; } + { + if( v < 0 ) + { + o.type = type::NEGATIVE_INTEGER ; + o.via.i64 = v ; + } + else + { + o.type = type::POSITIVE_INTEGER ; + o.via.u64 = v ; + } + } inline void operator<< (object& o, unsigned char v)