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

Merge branch 'fix_issue_226_author_fixed'

Browse Source 
Conflicts:
	include/msgpack/unpack.hpp
This commit is contained in:
Nobuyuki Kubota
2015-03-10 17:21:58 +09:00
parent 582fe38e78 8ad9ce059b
commit c1e9f92d7f
22 changed files with 283 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/object_with_zone.cpp
View File

@@ -322,7 +322,7 @@ TEST(object_without_zone, char_ptr)
TEST(object_with_zone, raw_ref)
{
string s = "abc";
msgpack::type::raw_ref v(s.data(), s.size());
msgpack::type::raw_ref v(s.data(), static_cast<uint32_t>(s.size()));
msgpack::zone z;
msgpack::object obj(v, z);
EXPECT_EQ(obj.as<msgpack::type::raw_ref>(), v);
@@ -336,7 +336,7 @@ TEST(object_with_zone, raw_ref)
TEST(object_without_zone, raw_ref)
{
string s = "abc";
msgpack::type::raw_ref v(s.data(), s.size());
msgpack::type::raw_ref v(s.data(), static_cast<uint32_t>(s.size()));
msgpack::zone z;
msgpack::object obj(v);
EXPECT_EQ(obj.as<msgpack::type::raw_ref>(), v);