Skip to content

Commit 9e4dfb2

Browse files
committed
Merge pull request #362 from nobu-k/osx-warning-fix
Fix some warnings on OS X
2 parents 9314232 + 356a5ea commit 9e4dfb2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

test/object_with_zone.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,7 @@ TEST(object_with_zone, forward_list)
908908
msgpack::object obj(v1, z);
909909
EXPECT_EQ(obj.as<forward_list<int> >(), v1);
910910
v1.front() = 42;
911-
EXPECT_EQ(obj.as<forward_list<int> >().front(), kElements - 1);
911+
EXPECT_EQ(obj.as<forward_list<int> >().front(), static_cast<int>(kElements - 1));
912912
}
913913
}
914914

test/pack_unpack.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ TEST(unpack, insufficient_bytes_ref)
332332
}
333333
catch (msgpack::insufficient_bytes const&) {
334334
EXPECT_TRUE(true);
335-
EXPECT_EQ(off, 0);
335+
EXPECT_EQ(off, 0u);
336336
}
337337
}
338338

@@ -350,7 +350,7 @@ TEST(unpack, insufficient_bytes_object_handle)
350350
}
351351
catch (msgpack::insufficient_bytes const&) {
352352
EXPECT_TRUE(true);
353-
EXPECT_EQ(off, 0);
353+
EXPECT_EQ(off, 0u);
354354
}
355355
}
356356

@@ -369,6 +369,6 @@ TEST(unpack, insufficient_bytes_zone)
369369
}
370370
catch (msgpack::insufficient_bytes const&) {
371371
EXPECT_TRUE(true);
372-
EXPECT_EQ(off, 0);
372+
EXPECT_EQ(off, 0u);
373373
}
374374
}

test/pack_unpack_c.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ TEST(pack, insufficient)
8383

8484
success = msgpack_unpack_next(&msg, sbuf->data, 1, &offset);
8585
EXPECT_EQ(MSGPACK_UNPACK_CONTINUE, success);
86-
EXPECT_EQ(0, offset);
86+
EXPECT_EQ(0u, offset);
8787

8888
msgpack_unpacked_destroy(&msg);
8989

0 commit comments

Comments
 (0)