From b13cb13efc61c9df9be39d361edfa195047c046d Mon Sep 17 00:00:00 2001 From: Nobuyuki Kubota Date: Mon, 10 Aug 2015 11:28:57 -0700 Subject: [PATCH] Fix compile errors on OS X due to signed-unsigned comparison in tests --- test/buffer.cpp | 8 ++++---- test/msgpack_basic.cpp | 10 ++++----- test/msgpack_c.cpp | 42 +++++++++++++++++++------------------- test/msgpack_container.cpp | 4 ++-- test/object.cpp | 4 ++-- test/object_with_zone.cpp | 8 ++++---- test/pack_unpack_c.cpp | 6 +++--- test/streaming_c.cpp | 12 +++++------ test/zone.cpp | 8 ++++---- 9 files changed, 51 insertions(+), 51 deletions(-) diff --git a/test/buffer.cpp b/test/buffer.cpp index f465a17b..e05f2ce3 100644 --- a/test/buffer.cpp +++ b/test/buffer.cpp @@ -13,7 +13,7 @@ TEST(buffer, sbuffer) sbuf.write("a", 1); sbuf.write("a", 1); - EXPECT_EQ(3, sbuf.size()); + EXPECT_EQ(3ul, sbuf.size()); EXPECT_TRUE( memcmp(sbuf.data(), "aaa", 3) == 0 ); sbuf.clear(); @@ -21,7 +21,7 @@ TEST(buffer, sbuffer) sbuf.write("a", 1); sbuf.write("a", 1); - EXPECT_EQ(3, sbuf.size()); + EXPECT_EQ(3ul, sbuf.size()); EXPECT_TRUE( memcmp(sbuf.data(), "aaa", 3) == 0 ); } @@ -41,7 +41,7 @@ TEST(buffer, vrefbuffer) sbuf.write((const char*)vec[i].iov_base, vec[i].iov_len); } - EXPECT_EQ(3, sbuf.size()); + EXPECT_EQ(3ul, sbuf.size()); EXPECT_TRUE( memcmp(sbuf.data(), "aaa", 3) == 0 ); @@ -58,7 +58,7 @@ TEST(buffer, vrefbuffer) sbuf.write((const char*)vec[i].iov_base, vec[i].iov_len); } - EXPECT_EQ(3, sbuf.size()); + EXPECT_EQ(3ul, sbuf.size()); EXPECT_TRUE( memcmp(sbuf.data(), "aaa", 3) == 0 ); } diff --git a/test/msgpack_basic.cpp b/test/msgpack_basic.cpp index e55e711f..770af6d5 100644 --- a/test/msgpack_basic.cpp +++ b/test/msgpack_basic.cpp @@ -310,7 +310,7 @@ TEST(MSGPACK, simple_buffer_fixext1) packer.pack_ext_body(buf, sizeof(buf)); msgpack::unpacked ret; msgpack::unpack(ret, sbuf.data(), sbuf.size()); - EXPECT_EQ(1, ret.get().via.ext.size); + EXPECT_EQ(1ul, ret.get().via.ext.size); EXPECT_EQ(1, ret.get().via.ext.type()); EXPECT_EQ(2, ret.get().via.ext.data()[0]); } @@ -325,7 +325,7 @@ TEST(MSGPACK, simple_buffer_fixext2) packer.pack_ext_body(buf, sizeof(buf)); msgpack::unpacked ret; msgpack::unpack(ret, sbuf.data(), sbuf.size()); - EXPECT_EQ(2, ret.get().via.ext.size); + EXPECT_EQ(2ul, ret.get().via.ext.size); EXPECT_EQ(0, ret.get().via.ext.type()); EXPECT_TRUE( std::equal(buf, buf + sizeof(buf), ret.get().via.ext.data())); @@ -341,7 +341,7 @@ TEST(MSGPACK, simple_buffer_fixext4) packer.pack_ext_body(buf, sizeof(buf)); msgpack::unpacked ret; msgpack::unpack(ret, sbuf.data(), sbuf.size()); - EXPECT_EQ(4, ret.get().via.ext.size); + EXPECT_EQ(4ul, ret.get().via.ext.size); EXPECT_EQ(1, ret.get().via.ext.type()); EXPECT_TRUE( std::equal(buf, buf + sizeof(buf), ret.get().via.ext.data())); @@ -357,7 +357,7 @@ TEST(MSGPACK, simple_buffer_fixext8) packer.pack_ext_body(buf, sizeof(buf)); msgpack::unpacked ret; msgpack::unpack(ret, sbuf.data(), sbuf.size()); - EXPECT_EQ(8, ret.get().via.ext.size); + EXPECT_EQ(8ul, ret.get().via.ext.size); EXPECT_EQ(1, ret.get().via.ext.type()); EXPECT_TRUE( std::equal(buf, buf + sizeof(buf), ret.get().via.ext.data())); @@ -373,7 +373,7 @@ TEST(MSGPACK, simple_buffer_fixext16) packer.pack_ext_body(buf, sizeof(buf)); msgpack::unpacked ret; msgpack::unpack(ret, sbuf.data(), sbuf.size()); - EXPECT_EQ(16, ret.get().via.ext.size); + EXPECT_EQ(16ul, ret.get().via.ext.size); EXPECT_EQ(1, ret.get().via.ext.type()); EXPECT_TRUE( std::equal(buf, buf + sizeof(buf), ret.get().via.ext.data())); diff --git a/test/msgpack_c.cpp b/test/msgpack_c.cpp index 36f4fa10..623db8be 100644 --- a/test/msgpack_c.cpp +++ b/test/msgpack_c.cpp @@ -45,7 +45,7 @@ const double kEPS = 1e-10; EXPECT_EQ(val, obj.via.i64); \ } else { \ EXPECT_EQ(MSGPACK_OBJECT_POSITIVE_INTEGER, obj.type); \ - EXPECT_EQ(val, obj.via.u64); \ + EXPECT_EQ(static_cast(val), obj.via.u64); \ } \ msgpack_zone_destroy(&z); \ msgpack_sbuffer_destroy(&sbuf); \ @@ -388,7 +388,7 @@ TEST(MSGPACKC, simple_buffer_fixext1) msgpack_unpack(sbuf.data, sbuf.size, NULL, &z, &obj); EXPECT_EQ(MSGPACK_UNPACK_SUCCESS, ret); EXPECT_EQ(MSGPACK_OBJECT_EXT, obj.type); - EXPECT_EQ(1, obj.via.ext.size); + EXPECT_EQ(1u, obj.via.ext.size); EXPECT_EQ(1, obj.via.ext.type); EXPECT_EQ(2, obj.via.ext.ptr[0]); msgpack_zone_destroy(&z); @@ -412,7 +412,7 @@ TEST(MSGPACKC, simple_buffer_fixext2) msgpack_unpack(sbuf.data, sbuf.size, NULL, &z, &obj); EXPECT_EQ(MSGPACK_UNPACK_SUCCESS, ret); EXPECT_EQ(MSGPACK_OBJECT_EXT, obj.type); - EXPECT_EQ(2, obj.via.ext.size); + EXPECT_EQ(2u, obj.via.ext.size); EXPECT_EQ(0, obj.via.ext.type); EXPECT_EQ(0, memcmp(buf, obj.via.ext.ptr, sizeof(buf))); msgpack_zone_destroy(&z); @@ -436,7 +436,7 @@ TEST(MSGPACKC, simple_buffer_fixext4) msgpack_unpack(sbuf.data, sbuf.size, NULL, &z, &obj); EXPECT_EQ(MSGPACK_UNPACK_SUCCESS, ret); EXPECT_EQ(MSGPACK_OBJECT_EXT, obj.type); - EXPECT_EQ(4, obj.via.ext.size); + EXPECT_EQ(4u, obj.via.ext.size); EXPECT_EQ(1, obj.via.ext.type); EXPECT_EQ(0, memcmp(buf, obj.via.ext.ptr, sizeof(buf))); msgpack_zone_destroy(&z); @@ -460,7 +460,7 @@ TEST(MSGPACKC, simple_buffer_fixext8) msgpack_unpack(sbuf.data, sbuf.size, NULL, &z, &obj); EXPECT_EQ(MSGPACK_UNPACK_SUCCESS, ret); EXPECT_EQ(MSGPACK_OBJECT_EXT, obj.type); - EXPECT_EQ(8, obj.via.ext.size); + EXPECT_EQ(8u, obj.via.ext.size); EXPECT_EQ(1, obj.via.ext.type); EXPECT_EQ(0, memcmp(buf, obj.via.ext.ptr, sizeof(buf))); msgpack_zone_destroy(&z); @@ -484,7 +484,7 @@ TEST(MSGPACKC, simple_buffer_fixext16) msgpack_unpack(sbuf.data, sbuf.size, NULL, &z, &obj); EXPECT_EQ(MSGPACK_UNPACK_SUCCESS, ret); EXPECT_EQ(MSGPACK_OBJECT_EXT, obj.type); - EXPECT_EQ(16, obj.via.ext.size); + EXPECT_EQ(16u, obj.via.ext.size); EXPECT_EQ(1, obj.via.ext.type); EXPECT_EQ(0, memcmp(buf, obj.via.ext.ptr, sizeof(buf))); msgpack_zone_destroy(&z); @@ -665,7 +665,7 @@ TEST(MSGPACKC, simple_buffer_array) break; case 3: EXPECT_EQ(MSGPACK_OBJECT_POSITIVE_INTEGER, o.type); - EXPECT_EQ(10, o.via.u64); + EXPECT_EQ(10u, o.via.u64); break; case 4: EXPECT_EQ(MSGPACK_OBJECT_NEGATIVE_INTEGER, o.type); @@ -713,7 +713,7 @@ TEST(MSGPACKC, simple_buffer_map) break; case 1: EXPECT_EQ(MSGPACK_OBJECT_POSITIVE_INTEGER, key.type); - EXPECT_EQ(10, key.via.u64); + EXPECT_EQ(10u, key.via.u64); EXPECT_EQ(MSGPACK_OBJECT_NEGATIVE_INTEGER, val.type); EXPECT_EQ(-10, val.via.i64); break; @@ -763,7 +763,7 @@ TEST(MSGPACKC, simple_buffer_str_fix_l) msgpack_packer_init(&pk, &sbuf, msgpack_sbuffer_write); msgpack_pack_str(&pk, str_size); msgpack_pack_str_body(&pk, str, str_size); - EXPECT_EQ(sbuf.size, 0x01); + EXPECT_EQ(sbuf.size, 0x01u); EXPECT_EQ(sbuf.data[0], static_cast(0xa0u)); msgpack_zone z; @@ -790,7 +790,7 @@ TEST(MSGPACKC, simple_buffer_str_fix_h) msgpack_packer_init(&pk, &sbuf, msgpack_sbuffer_write); msgpack_pack_str(&pk, str_size); msgpack_pack_str_body(&pk, str, str_size); - EXPECT_EQ(sbuf.size, 0x1f+1); + EXPECT_EQ(sbuf.size, 0x1f+1u); EXPECT_EQ(sbuf.data[0], static_cast(0xbfu)); msgpack_zone z; @@ -817,7 +817,7 @@ TEST(MSGPACKC, simple_buffer_str_8_l) msgpack_packer_init(&pk, &sbuf, msgpack_sbuffer_write); msgpack_pack_str(&pk, str_size); msgpack_pack_str_body(&pk, str, str_size); - EXPECT_EQ(sbuf.size, 0x1f+1+2); + EXPECT_EQ(sbuf.size, 0x1f+1+2u); EXPECT_EQ(sbuf.data[0], static_cast(0xd9u)); EXPECT_EQ(sbuf.data[1], static_cast(0x20u)); @@ -845,7 +845,7 @@ TEST(MSGPACKC, simple_buffer_str_8_h) msgpack_packer_init(&pk, &sbuf, msgpack_sbuffer_write); msgpack_pack_str(&pk, str_size); msgpack_pack_str_body(&pk, str, str_size); - EXPECT_EQ(sbuf.size, 0xff+2); + EXPECT_EQ(sbuf.size, 0xff+2u); EXPECT_EQ(sbuf.data[0], static_cast(0xd9u)); EXPECT_EQ(sbuf.data[1], static_cast(0xffu)); @@ -873,7 +873,7 @@ TEST(MSGPACKC, simple_buffer_str_16_l) msgpack_packer_init(&pk, &sbuf, msgpack_sbuffer_write); msgpack_pack_str(&pk, str_size); msgpack_pack_str_body(&pk, str, str_size); - EXPECT_EQ(sbuf.size, 0xff+1+3); + EXPECT_EQ(sbuf.size, 0xff+1+3u); EXPECT_EQ(sbuf.data[0], static_cast(0xdau)); EXPECT_EQ(sbuf.data[1], static_cast(0x01u)); EXPECT_EQ(sbuf.data[2], static_cast(0x00u)); @@ -902,7 +902,7 @@ TEST(MSGPACKC, simple_buffer_str_16_h) msgpack_packer_init(&pk, &sbuf, msgpack_sbuffer_write); msgpack_pack_str(&pk, str_size); msgpack_pack_str_body(&pk, str, str_size); - EXPECT_EQ(sbuf.size, 0xffff+3); + EXPECT_EQ(sbuf.size, 0xffff+3u); EXPECT_EQ(sbuf.data[0], static_cast(0xdau)); EXPECT_EQ(sbuf.data[1], static_cast(0xffu)); EXPECT_EQ(sbuf.data[2], static_cast(0xffu)); @@ -931,7 +931,7 @@ TEST(MSGPACKC, simple_buffer_str_32_l) msgpack_packer_init(&pk, &sbuf, msgpack_sbuffer_write); msgpack_pack_str(&pk, str_size); msgpack_pack_str_body(&pk, str, str_size); - EXPECT_EQ(sbuf.size, 0xffff+1+5); + EXPECT_EQ(sbuf.size, 0xffff+1+5u); EXPECT_EQ(sbuf.data[0], static_cast(0xdbu)); EXPECT_EQ(sbuf.data[1], static_cast(0x00u)); EXPECT_EQ(sbuf.data[2], static_cast(0x01u)); @@ -962,7 +962,7 @@ TEST(MSGPACKC, simple_buffer_v4raw_fix_l) msgpack_packer_init(&pk, &sbuf, msgpack_sbuffer_write); msgpack_pack_v4raw(&pk, str_size); msgpack_pack_v4raw_body(&pk, str, str_size); - EXPECT_EQ(sbuf.size, 0x01); + EXPECT_EQ(sbuf.size, 0x01u); EXPECT_EQ(sbuf.data[0], static_cast(0xa0u)); msgpack_zone z; @@ -989,7 +989,7 @@ TEST(MSGPACKC, simple_buffer_v4raw_fix_h) msgpack_packer_init(&pk, &sbuf, msgpack_sbuffer_write); msgpack_pack_v4raw(&pk, str_size); msgpack_pack_v4raw_body(&pk, str, str_size); - EXPECT_EQ(sbuf.size, 0x1f+1); + EXPECT_EQ(sbuf.size, 0x1f+1u); EXPECT_EQ(sbuf.data[0], static_cast(0xbfu)); msgpack_zone z; @@ -1016,7 +1016,7 @@ TEST(MSGPACKC, simple_buffer_v4raw_16_l) msgpack_packer_init(&pk, &sbuf, msgpack_sbuffer_write); msgpack_pack_v4raw(&pk, str_size); msgpack_pack_v4raw_body(&pk, str, str_size); - EXPECT_EQ(sbuf.size, 0x1f+1+3); + EXPECT_EQ(sbuf.size, 0x1f+1+3u); EXPECT_EQ(sbuf.data[0], static_cast(0xdau)); EXPECT_EQ(sbuf.data[1], static_cast(0x00u)); EXPECT_EQ(sbuf.data[2], static_cast(0x20u)); @@ -1045,7 +1045,7 @@ TEST(MSGPACKC, simple_buffer_v4raw_16_h) msgpack_packer_init(&pk, &sbuf, msgpack_sbuffer_write); msgpack_pack_v4raw(&pk, str_size); msgpack_pack_v4raw_body(&pk, str, str_size); - EXPECT_EQ(sbuf.size, 0xffff+3); + EXPECT_EQ(sbuf.size, 0xffff+3u); EXPECT_EQ(sbuf.data[0], static_cast(0xdau)); EXPECT_EQ(sbuf.data[1], static_cast(0xffu)); EXPECT_EQ(sbuf.data[2], static_cast(0xffu)); @@ -1074,7 +1074,7 @@ TEST(MSGPACKC, simple_buffer_v4raw_32_l) msgpack_packer_init(&pk, &sbuf, msgpack_sbuffer_write); msgpack_pack_v4raw(&pk, str_size); msgpack_pack_v4raw_body(&pk, str, str_size); - EXPECT_EQ(sbuf.size, 0xffff+1+5); + EXPECT_EQ(sbuf.size, 0xffff+1+5u); EXPECT_EQ(sbuf.data[0], static_cast(0xdbu)); EXPECT_EQ(sbuf.data[1], static_cast(0x00u)); EXPECT_EQ(sbuf.data[2], static_cast(0x01u)); @@ -1248,7 +1248,7 @@ TEST(MSGPACKC, unpack_array_uint64) ret = msgpack_unpack(buf, sizeof(buf), NULL, &z, &obj); EXPECT_EQ(MSGPACK_UNPACK_SUCCESS, ret); EXPECT_EQ(MSGPACK_OBJECT_ARRAY, obj.type); - EXPECT_EQ(1, obj.via.array.size); + EXPECT_EQ(1u, obj.via.array.size); EXPECT_EQ(MSGPACK_OBJECT_POSITIVE_INTEGER, obj.via.array.ptr[0].type); EXPECT_EQ(0xFFF0000000000001LL, obj.via.array.ptr[0].via.u64); msgpack_zone_destroy(&z); diff --git a/test/msgpack_container.cpp b/test/msgpack_container.cpp index f82687bd..158ed494 100644 --- a/test/msgpack_container.cpp +++ b/test/msgpack_container.cpp @@ -213,7 +213,7 @@ TEST(MSGPACK_TUPLE, simple_tuple) msgpack::unpack(ret, sbuf.data(), sbuf.size()); msgpack::type::tuple val2 = ret.get().as >(); - EXPECT_EQ(ret.get().via.array.size, 3); + EXPECT_EQ(ret.get().via.array.size, 3u); EXPECT_EQ(val1.get<0>(), val2.get<0>()); EXPECT_EQ(val1.get<1>(), val2.get<1>()); EXPECT_EQ(val1.get<2>(), val2.get<2>()); @@ -227,7 +227,7 @@ TEST(MSGPACK_TUPLE, simple_tuple_empty) msgpack::unpacked ret; msgpack::unpack(ret, sbuf.data(), sbuf.size()); ret.get().as >(); - EXPECT_EQ(ret.get().via.array.size, 0); + EXPECT_EQ(ret.get().via.array.size, 0u); } diff --git a/test/object.cpp b/test/object.cpp index ec271824..0bbb9c58 100644 --- a/test/object.cpp +++ b/test/object.cpp @@ -189,7 +189,7 @@ TEST(object, cross_zone_copy_ext) msgpack::object::with_zone obj2(z2); obj2 << obj1; - EXPECT_EQ(obj2.via.ext.size, 1); + EXPECT_EQ(obj2.via.ext.size, 1u); EXPECT_EQ(obj2.via.ext.ptr[0], 1); EXPECT_EQ(obj2.via.ext.ptr[1], 2); EXPECT_NE( @@ -211,7 +211,7 @@ TEST(object, cross_zone_copy_construct_ext) obj1.via.ext.size = 1; msgpack::object obj2(obj1, z2); - EXPECT_EQ(obj2.via.ext.size, 1); + EXPECT_EQ(obj2.via.ext.size, 1u); EXPECT_EQ(obj2.via.ext.ptr[0], 1); EXPECT_EQ(obj2.via.ext.ptr[1], 2); EXPECT_NE( diff --git a/test/object_with_zone.cpp b/test/object_with_zone.cpp index e7a254af..58a62404 100644 --- a/test/object_with_zone.cpp +++ b/test/object_with_zone.cpp @@ -147,7 +147,7 @@ TEST(object_with_zone, unsigned_int) msgpack::object obj(v, z); EXPECT_EQ(obj.as(), v); v = 2; - EXPECT_EQ(obj.as(), 1); + EXPECT_EQ(obj.as(), 1u); } TEST(object_with_zone, unsigned_long) @@ -157,7 +157,7 @@ TEST(object_with_zone, unsigned_long) msgpack::object obj(v, z); EXPECT_EQ(obj.as(), v); v = 2; - EXPECT_EQ(obj.as(), 1); + EXPECT_EQ(obj.as(), 1u); } TEST(object_with_zone, unsigned_long_long) @@ -167,7 +167,7 @@ TEST(object_with_zone, unsigned_long_long) msgpack::object obj(v, z); EXPECT_EQ(obj.as(), v); v = 2; - EXPECT_EQ(obj.as(), 1); + EXPECT_EQ(obj.as(), 1u); } // float @@ -427,7 +427,7 @@ TEST(object_with_zone, msgpack_tuple_empty) test_t v; msgpack::zone z; msgpack::object obj(v, z); - EXPECT_EQ(obj.via.array.size, 0); + EXPECT_EQ(obj.via.array.size, 0u); } // TR1 diff --git a/test/pack_unpack_c.cpp b/test/pack_unpack_c.cpp index 4c8b8547..82147290 100644 --- a/test/pack_unpack_c.cpp +++ b/test/pack_unpack_c.cpp @@ -49,17 +49,17 @@ TEST(unpack, sequence) success = msgpack_unpack_next(&msg, sbuf->data, sbuf->size, &offset); EXPECT_EQ(MSGPACK_UNPACK_SUCCESS, success); EXPECT_EQ(MSGPACK_OBJECT_POSITIVE_INTEGER, msg.data.type); - EXPECT_EQ(1, msg.data.via.u64); + EXPECT_EQ(1u, msg.data.via.u64); success = msgpack_unpack_next(&msg, sbuf->data, sbuf->size, &offset); EXPECT_EQ(MSGPACK_UNPACK_SUCCESS, success); EXPECT_EQ(MSGPACK_OBJECT_POSITIVE_INTEGER, msg.data.type); - EXPECT_EQ(2, msg.data.via.u64); + EXPECT_EQ(2u, msg.data.via.u64); success = msgpack_unpack_next(&msg, sbuf->data, sbuf->size, &offset); EXPECT_EQ(MSGPACK_UNPACK_SUCCESS, success); EXPECT_EQ(MSGPACK_OBJECT_POSITIVE_INTEGER, msg.data.type); - EXPECT_EQ(3, msg.data.via.u64); + EXPECT_EQ(3u, msg.data.via.u64); success = msgpack_unpack_next(&msg, sbuf->data, sbuf->size, &offset); EXPECT_EQ(MSGPACK_UNPACK_CONTINUE, success); diff --git a/test/streaming_c.cpp b/test/streaming_c.cpp index 0262239f..2fb4fe67 100644 --- a/test/streaming_c.cpp +++ b/test/streaming_c.cpp @@ -61,15 +61,15 @@ TEST(streaming, basic) switch(count++) { case 0: EXPECT_EQ(MSGPACK_OBJECT_POSITIVE_INTEGER, obj.type); - EXPECT_EQ(1, obj.via.u64); + EXPECT_EQ(1u, obj.via.u64); break; case 1: EXPECT_EQ(MSGPACK_OBJECT_POSITIVE_INTEGER, obj.type); - EXPECT_EQ(2, obj.via.u64); + EXPECT_EQ(2u, obj.via.u64); break; case 2: EXPECT_EQ(MSGPACK_OBJECT_POSITIVE_INTEGER, obj.type); - EXPECT_EQ(3, obj.via.u64); + EXPECT_EQ(3u, obj.via.u64); break; case 3: EXPECT_EQ(MSGPACK_OBJECT_STR, obj.type); @@ -77,7 +77,7 @@ TEST(streaming, basic) break; case 4: EXPECT_EQ(MSGPACK_OBJECT_ARRAY, obj.type); - EXPECT_EQ(1, obj.via.array.size); + EXPECT_EQ(1u, obj.via.array.size); e = obj.via.array.ptr[0]; EXPECT_EQ(MSGPACK_OBJECT_STR, e.type); EXPECT_EQ(std::string("str_data",8), std::string(e.via.str.ptr, e.via.str.size)); @@ -88,14 +88,14 @@ TEST(streaming, basic) break; case 6: EXPECT_EQ(MSGPACK_OBJECT_ARRAY, obj.type); - EXPECT_EQ(1, obj.via.array.size); + EXPECT_EQ(1u, obj.via.array.size); e = obj.via.array.ptr[0]; EXPECT_EQ(MSGPACK_OBJECT_BIN, e.type); EXPECT_EQ(std::string("bin_data",8), std::string(e.via.bin.ptr, e.via.bin.size)); break; case 7: EXPECT_EQ(MSGPACK_OBJECT_MAP, obj.type); - EXPECT_EQ(1, obj.via.map.size); + EXPECT_EQ(1u, obj.via.map.size); e = obj.via.map.ptr[0].key; EXPECT_EQ(MSGPACK_OBJECT_FLOAT, e.type); ASSERT_FLOAT_EQ(0.4f, static_cast(e.via.f64)); diff --git a/test/zone.cpp b/test/zone.cpp index 9a1b2015..8f6d3a81 100644 --- a/test/zone.cpp +++ b/test/zone.cpp @@ -5,11 +5,11 @@ TEST(zone, allocate_align) { msgpack::zone z; char* start = (char*)z.allocate_align(1); - EXPECT_EQ(reinterpret_cast(start) % sizeof(int), 0); + EXPECT_EQ(0ul, reinterpret_cast(start) % sizeof(int)); for (std::size_t s = 1; s < sizeof(int); ++s) { z.allocate_no_align(s); char* buf_a = (char*)z.allocate_align(1); - EXPECT_EQ(0, reinterpret_cast(buf_a) % sizeof(int)); + EXPECT_EQ(0ul, reinterpret_cast(buf_a) % sizeof(int)); } } @@ -18,11 +18,11 @@ TEST(zone, allocate_align_custom) msgpack::zone z; for (std::size_t align = 1; align < 64; ++align) { char* start = (char*)z.allocate_align(1, align); - EXPECT_EQ(reinterpret_cast(start) % align, 0); + EXPECT_EQ(0ul, reinterpret_cast(start) % align); for (std::size_t s = 1; s < align; ++s) { z.allocate_no_align(s); char* buf_a = (char*)z.allocate_align(1, align); - EXPECT_EQ(0, reinterpret_cast(buf_a) % align); + EXPECT_EQ(0ul, reinterpret_cast(buf_a) % align); } } }