From e217e72c22e08b8a73fa5513f7933fa261b47672 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Sun, 10 Aug 2014 23:23:52 +0900 Subject: [PATCH] Fixed msgpack::object type EXT comparison problem. Added msgpack::object type EXT ostream minimal output. --- include/msgpack/object.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/msgpack/object.hpp b/include/msgpack/object.hpp index f0790279..7a69f33a 100644 --- a/include/msgpack/object.hpp +++ b/include/msgpack/object.hpp @@ -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; case type::EXT: - return x.via.bin.size == y.via.bin.size && - memcmp(x.via.bin.ptr, y.via.bin.ptr, x.via.bin.size) == 0; + return x.via.ext.size == y.via.ext.size && + memcmp(x.via.ext.ptr, y.via.ext.ptr, x.via.ext.size) == 0; case type::ARRAY: 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) << '"'; break; + case type::EXT: + s << "EXT"; case type::ARRAY: s << "["; @@ -558,4 +560,3 @@ inline std::ostream& operator<< (std::ostream& s, const object& o) #include "msgpack/type.hpp" #endif /* msgpack/object.hpp */ -