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

Fixed msgpack::object type EXT comparison problem.

Browse Source 
Added msgpack::object type EXT ostream minimal output.
This commit is contained in:
Takatoshi Kondo 2014-08-10 23:23:52 +09:00
parent 0bc4b3f599
commit e217e72c22
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/msgpack/object.hpp
View File

@ -252,8 +252,8 @@ inline bool operator==(const object& x, const object& y)
memcmp(x.via.bin.ptr, y.via.bin.ptr, x.via.bin.size) == 0; memcmp(x.via.bin.ptr, y.via.bin.ptr, x.via.bin.size) == 0;
case type::EXT: case type::EXT:
return x.via.bin.size == y.via.bin.size && return x.via.ext.size == y.via.ext.size &&
memcmp(x.via.bin.ptr, y.via.bin.ptr, x.via.bin.size) == 0; memcmp(x.via.ext.ptr, y.via.ext.ptr, x.via.ext.size) == 0;
case type::ARRAY: case type::ARRAY:
if(x.via.array.size != y.via.array.size) { if(x.via.array.size != y.via.array.size) {
@ -517,6 +517,8 @@ inline std::ostream& operator<< (std::ostream& s, const object& o)
(s << '"').write(o.via.bin.ptr, o.via.bin.size) << '"'; (s << '"').write(o.via.bin.ptr, o.via.bin.size) << '"';
break; break;
case type::EXT:
s << "EXT";
case type::ARRAY: case type::ARRAY:
s << "["; s << "[";
@ -558,4 +560,3 @@ inline std::ostream& operator<< (std::ostream& s, const object& o)
#include "msgpack/type.hpp" #include "msgpack/type.hpp"
#endif /* msgpack/object.hpp */ #endif /* msgpack/object.hpp */