Merge pull request #362 from nobu-k/osx-warning-fix

Fix some warnings on OS X
This commit is contained in:
Takatoshi Kondo 2015-09-04 19:07:32 +09:00
commit 9e4dfb2484
3 changed files with 5 additions and 5 deletions

View File

@ -908,7 +908,7 @@ TEST(object_with_zone, forward_list)
msgpack::object obj(v1, z); msgpack::object obj(v1, z);
EXPECT_EQ(obj.as<forward_list<int> >(), v1); EXPECT_EQ(obj.as<forward_list<int> >(), v1);
v1.front() = 42; v1.front() = 42;
EXPECT_EQ(obj.as<forward_list<int> >().front(), kElements - 1); EXPECT_EQ(obj.as<forward_list<int> >().front(), static_cast<int>(kElements - 1));
} }
} }

View File

@ -332,7 +332,7 @@ TEST(unpack, insufficient_bytes_ref)
} }
catch (msgpack::insufficient_bytes const&) { catch (msgpack::insufficient_bytes const&) {
EXPECT_TRUE(true); EXPECT_TRUE(true);
EXPECT_EQ(off, 0); EXPECT_EQ(off, 0u);
} }
} }
@ -350,7 +350,7 @@ TEST(unpack, insufficient_bytes_object_handle)
} }
catch (msgpack::insufficient_bytes const&) { catch (msgpack::insufficient_bytes const&) {
EXPECT_TRUE(true); EXPECT_TRUE(true);
EXPECT_EQ(off, 0); EXPECT_EQ(off, 0u);
} }
} }
@ -369,6 +369,6 @@ TEST(unpack, insufficient_bytes_zone)
} }
catch (msgpack::insufficient_bytes const&) { catch (msgpack::insufficient_bytes const&) {
EXPECT_TRUE(true); EXPECT_TRUE(true);
EXPECT_EQ(off, 0); EXPECT_EQ(off, 0u);
} }
} }

View File

@ -83,7 +83,7 @@ TEST(pack, insufficient)
success = msgpack_unpack_next(&msg, sbuf->data, 1, &offset); success = msgpack_unpack_next(&msg, sbuf->data, 1, &offset);
EXPECT_EQ(MSGPACK_UNPACK_CONTINUE, success); EXPECT_EQ(MSGPACK_UNPACK_CONTINUE, success);
EXPECT_EQ(0, offset); EXPECT_EQ(0u, offset);
msgpack_unpacked_destroy(&msg); msgpack_unpacked_destroy(&msg);