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

Fix compilation with Gtest 1.8.0 and GCC 5.4.1

Browse Source
This commit is contained in:
Luiz Silva
2016-11-10 10:59:26 -02:00
parent 55b51c506f
commit 4a1db60af8
11 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/user_class.cpp
View File

@@ -563,13 +563,13 @@ TEST(MSGPACK_NVP, combination)
msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size());
msgpack::object obj = oh.get();
EXPECT_EQ(obj.via.map.size, 3);
EXPECT_EQ(obj.via.map.size, (size_t) 3);
EXPECT_EQ(std::string(obj.via.map.ptr[0].key.via.str.ptr, obj.via.map.ptr[0].key.via.str.size), "ccc");
EXPECT_EQ(obj.via.map.ptr[0].val.via.i64, 3);
EXPECT_EQ(std::string(obj.via.map.ptr[1].key.via.str.ptr, obj.via.map.ptr[1].key.via.str.size), "base");
EXPECT_EQ(obj.via.map.ptr[1].val.via.map.size, 2);
EXPECT_EQ(obj.via.map.ptr[1].val.via.map.size, (size_t) 2);
EXPECT_EQ(
std::string(
obj.via.map.ptr[1].val.via.map.ptr[0].key.via.str.ptr,