@@ -45,7 +45,7 @@ const double kEPS = 1e-10;
4545 EXPECT_EQ (val, obj.via .i64 ); \
4646 } else { \
4747 EXPECT_EQ (MSGPACK_OBJECT_POSITIVE_INTEGER, obj.type ); \
48- EXPECT_EQ (val, obj.via .u64 ); \
48+ EXPECT_EQ (static_cast < uint64_t >( val) , obj.via .u64 ); \
4949 } \
5050 msgpack_zone_destroy (&z); \
5151 msgpack_sbuffer_destroy (&sbuf); \
@@ -388,7 +388,7 @@ TEST(MSGPACKC, simple_buffer_fixext1)
388388 msgpack_unpack (sbuf.data , sbuf.size , NULL , &z, &obj);
389389 EXPECT_EQ (MSGPACK_UNPACK_SUCCESS, ret);
390390 EXPECT_EQ (MSGPACK_OBJECT_EXT, obj.type );
391- EXPECT_EQ (1 , obj.via .ext .size );
391+ EXPECT_EQ (1u , obj.via .ext .size );
392392 EXPECT_EQ (1 , obj.via .ext .type );
393393 EXPECT_EQ (2 , obj.via .ext .ptr [0 ]);
394394 msgpack_zone_destroy (&z);
@@ -412,7 +412,7 @@ TEST(MSGPACKC, simple_buffer_fixext2)
412412 msgpack_unpack (sbuf.data , sbuf.size , NULL , &z, &obj);
413413 EXPECT_EQ (MSGPACK_UNPACK_SUCCESS, ret);
414414 EXPECT_EQ (MSGPACK_OBJECT_EXT, obj.type );
415- EXPECT_EQ (2 , obj.via .ext .size );
415+ EXPECT_EQ (2u , obj.via .ext .size );
416416 EXPECT_EQ (0 , obj.via .ext .type );
417417 EXPECT_EQ (0 , memcmp (buf, obj.via .ext .ptr , sizeof (buf)));
418418 msgpack_zone_destroy (&z);
@@ -436,7 +436,7 @@ TEST(MSGPACKC, simple_buffer_fixext4)
436436 msgpack_unpack (sbuf.data , sbuf.size , NULL , &z, &obj);
437437 EXPECT_EQ (MSGPACK_UNPACK_SUCCESS, ret);
438438 EXPECT_EQ (MSGPACK_OBJECT_EXT, obj.type );
439- EXPECT_EQ (4 , obj.via .ext .size );
439+ EXPECT_EQ (4u , obj.via .ext .size );
440440 EXPECT_EQ (1 , obj.via .ext .type );
441441 EXPECT_EQ (0 , memcmp (buf, obj.via .ext .ptr , sizeof (buf)));
442442 msgpack_zone_destroy (&z);
@@ -460,7 +460,7 @@ TEST(MSGPACKC, simple_buffer_fixext8)
460460 msgpack_unpack (sbuf.data , sbuf.size , NULL , &z, &obj);
461461 EXPECT_EQ (MSGPACK_UNPACK_SUCCESS, ret);
462462 EXPECT_EQ (MSGPACK_OBJECT_EXT, obj.type );
463- EXPECT_EQ (8 , obj.via .ext .size );
463+ EXPECT_EQ (8u , obj.via .ext .size );
464464 EXPECT_EQ (1 , obj.via .ext .type );
465465 EXPECT_EQ (0 , memcmp (buf, obj.via .ext .ptr , sizeof (buf)));
466466 msgpack_zone_destroy (&z);
@@ -484,7 +484,7 @@ TEST(MSGPACKC, simple_buffer_fixext16)
484484 msgpack_unpack (sbuf.data , sbuf.size , NULL , &z, &obj);
485485 EXPECT_EQ (MSGPACK_UNPACK_SUCCESS, ret);
486486 EXPECT_EQ (MSGPACK_OBJECT_EXT, obj.type );
487- EXPECT_EQ (16 , obj.via .ext .size );
487+ EXPECT_EQ (16u , obj.via .ext .size );
488488 EXPECT_EQ (1 , obj.via .ext .type );
489489 EXPECT_EQ (0 , memcmp (buf, obj.via .ext .ptr , sizeof (buf)));
490490 msgpack_zone_destroy (&z);
@@ -665,7 +665,7 @@ TEST(MSGPACKC, simple_buffer_array)
665665 break ;
666666 case 3 :
667667 EXPECT_EQ (MSGPACK_OBJECT_POSITIVE_INTEGER, o.type );
668- EXPECT_EQ (10 , o.via .u64 );
668+ EXPECT_EQ (10u , o.via .u64 );
669669 break ;
670670 case 4 :
671671 EXPECT_EQ (MSGPACK_OBJECT_NEGATIVE_INTEGER, o.type );
@@ -713,7 +713,7 @@ TEST(MSGPACKC, simple_buffer_map)
713713 break ;
714714 case 1 :
715715 EXPECT_EQ (MSGPACK_OBJECT_POSITIVE_INTEGER, key.type );
716- EXPECT_EQ (10 , key.via .u64 );
716+ EXPECT_EQ (10u , key.via .u64 );
717717 EXPECT_EQ (MSGPACK_OBJECT_NEGATIVE_INTEGER, val.type );
718718 EXPECT_EQ (-10 , val.via .i64 );
719719 break ;
@@ -763,7 +763,7 @@ TEST(MSGPACKC, simple_buffer_str_fix_l)
763763 msgpack_packer_init (&pk, &sbuf, msgpack_sbuffer_write);
764764 msgpack_pack_str (&pk, str_size);
765765 msgpack_pack_str_body (&pk, str, str_size);
766- EXPECT_EQ (sbuf.size , 0x01 );
766+ EXPECT_EQ (sbuf.size , 0x01u );
767767 EXPECT_EQ (sbuf.data [0 ], static_cast <char >(0xa0u ));
768768
769769 msgpack_zone z;
@@ -790,7 +790,7 @@ TEST(MSGPACKC, simple_buffer_str_fix_h)
790790 msgpack_packer_init (&pk, &sbuf, msgpack_sbuffer_write);
791791 msgpack_pack_str (&pk, str_size);
792792 msgpack_pack_str_body (&pk, str, str_size);
793- EXPECT_EQ (sbuf.size , 0x1f +1 );
793+ EXPECT_EQ (sbuf.size , 0x1f +1u );
794794 EXPECT_EQ (sbuf.data [0 ], static_cast <char >(0xbfu ));
795795
796796 msgpack_zone z;
@@ -817,7 +817,7 @@ TEST(MSGPACKC, simple_buffer_str_8_l)
817817 msgpack_packer_init (&pk, &sbuf, msgpack_sbuffer_write);
818818 msgpack_pack_str (&pk, str_size);
819819 msgpack_pack_str_body (&pk, str, str_size);
820- EXPECT_EQ (sbuf.size , 0x1f +1 +2 );
820+ EXPECT_EQ (sbuf.size , 0x1f +1 +2u );
821821 EXPECT_EQ (sbuf.data [0 ], static_cast <char >(0xd9u ));
822822 EXPECT_EQ (sbuf.data [1 ], static_cast <char >(0x20u ));
823823
@@ -845,7 +845,7 @@ TEST(MSGPACKC, simple_buffer_str_8_h)
845845 msgpack_packer_init (&pk, &sbuf, msgpack_sbuffer_write);
846846 msgpack_pack_str (&pk, str_size);
847847 msgpack_pack_str_body (&pk, str, str_size);
848- EXPECT_EQ (sbuf.size , 0xff +2 );
848+ EXPECT_EQ (sbuf.size , 0xff +2u );
849849 EXPECT_EQ (sbuf.data [0 ], static_cast <char >(0xd9u ));
850850 EXPECT_EQ (sbuf.data [1 ], static_cast <char >(0xffu ));
851851
@@ -873,7 +873,7 @@ TEST(MSGPACKC, simple_buffer_str_16_l)
873873 msgpack_packer_init (&pk, &sbuf, msgpack_sbuffer_write);
874874 msgpack_pack_str (&pk, str_size);
875875 msgpack_pack_str_body (&pk, str, str_size);
876- EXPECT_EQ (sbuf.size , 0xff +1 +3 );
876+ EXPECT_EQ (sbuf.size , 0xff +1 +3u );
877877 EXPECT_EQ (sbuf.data [0 ], static_cast <char >(0xdau ));
878878 EXPECT_EQ (sbuf.data [1 ], static_cast <char >(0x01u ));
879879 EXPECT_EQ (sbuf.data [2 ], static_cast <char >(0x00u ));
@@ -902,7 +902,7 @@ TEST(MSGPACKC, simple_buffer_str_16_h)
902902 msgpack_packer_init (&pk, &sbuf, msgpack_sbuffer_write);
903903 msgpack_pack_str (&pk, str_size);
904904 msgpack_pack_str_body (&pk, str, str_size);
905- EXPECT_EQ (sbuf.size , 0xffff +3 );
905+ EXPECT_EQ (sbuf.size , 0xffff +3u );
906906 EXPECT_EQ (sbuf.data [0 ], static_cast <char >(0xdau ));
907907 EXPECT_EQ (sbuf.data [1 ], static_cast <char >(0xffu ));
908908 EXPECT_EQ (sbuf.data [2 ], static_cast <char >(0xffu ));
@@ -931,7 +931,7 @@ TEST(MSGPACKC, simple_buffer_str_32_l)
931931 msgpack_packer_init (&pk, &sbuf, msgpack_sbuffer_write);
932932 msgpack_pack_str (&pk, str_size);
933933 msgpack_pack_str_body (&pk, str, str_size);
934- EXPECT_EQ (sbuf.size , 0xffff +1 +5 );
934+ EXPECT_EQ (sbuf.size , 0xffff +1 +5u );
935935 EXPECT_EQ (sbuf.data [0 ], static_cast <char >(0xdbu ));
936936 EXPECT_EQ (sbuf.data [1 ], static_cast <char >(0x00u ));
937937 EXPECT_EQ (sbuf.data [2 ], static_cast <char >(0x01u ));
@@ -962,7 +962,7 @@ TEST(MSGPACKC, simple_buffer_v4raw_fix_l)
962962 msgpack_packer_init (&pk, &sbuf, msgpack_sbuffer_write);
963963 msgpack_pack_v4raw (&pk, str_size);
964964 msgpack_pack_v4raw_body (&pk, str, str_size);
965- EXPECT_EQ (sbuf.size , 0x01 );
965+ EXPECT_EQ (sbuf.size , 0x01u );
966966 EXPECT_EQ (sbuf.data [0 ], static_cast <char >(0xa0u ));
967967
968968 msgpack_zone z;
@@ -989,7 +989,7 @@ TEST(MSGPACKC, simple_buffer_v4raw_fix_h)
989989 msgpack_packer_init (&pk, &sbuf, msgpack_sbuffer_write);
990990 msgpack_pack_v4raw (&pk, str_size);
991991 msgpack_pack_v4raw_body (&pk, str, str_size);
992- EXPECT_EQ (sbuf.size , 0x1f +1 );
992+ EXPECT_EQ (sbuf.size , 0x1f +1u );
993993 EXPECT_EQ (sbuf.data [0 ], static_cast <char >(0xbfu ));
994994
995995 msgpack_zone z;
@@ -1016,7 +1016,7 @@ TEST(MSGPACKC, simple_buffer_v4raw_16_l)
10161016 msgpack_packer_init (&pk, &sbuf, msgpack_sbuffer_write);
10171017 msgpack_pack_v4raw (&pk, str_size);
10181018 msgpack_pack_v4raw_body (&pk, str, str_size);
1019- EXPECT_EQ (sbuf.size , 0x1f +1 +3 );
1019+ EXPECT_EQ (sbuf.size , 0x1f +1 +3u );
10201020 EXPECT_EQ (sbuf.data [0 ], static_cast <char >(0xdau ));
10211021 EXPECT_EQ (sbuf.data [1 ], static_cast <char >(0x00u ));
10221022 EXPECT_EQ (sbuf.data [2 ], static_cast <char >(0x20u ));
@@ -1045,7 +1045,7 @@ TEST(MSGPACKC, simple_buffer_v4raw_16_h)
10451045 msgpack_packer_init (&pk, &sbuf, msgpack_sbuffer_write);
10461046 msgpack_pack_v4raw (&pk, str_size);
10471047 msgpack_pack_v4raw_body (&pk, str, str_size);
1048- EXPECT_EQ (sbuf.size , 0xffff +3 );
1048+ EXPECT_EQ (sbuf.size , 0xffff +3u );
10491049 EXPECT_EQ (sbuf.data [0 ], static_cast <char >(0xdau ));
10501050 EXPECT_EQ (sbuf.data [1 ], static_cast <char >(0xffu ));
10511051 EXPECT_EQ (sbuf.data [2 ], static_cast <char >(0xffu ));
@@ -1074,7 +1074,7 @@ TEST(MSGPACKC, simple_buffer_v4raw_32_l)
10741074 msgpack_packer_init (&pk, &sbuf, msgpack_sbuffer_write);
10751075 msgpack_pack_v4raw (&pk, str_size);
10761076 msgpack_pack_v4raw_body (&pk, str, str_size);
1077- EXPECT_EQ (sbuf.size , 0xffff +1 +5 );
1077+ EXPECT_EQ (sbuf.size , 0xffff +1 +5u );
10781078 EXPECT_EQ (sbuf.data [0 ], static_cast <char >(0xdbu ));
10791079 EXPECT_EQ (sbuf.data [1 ], static_cast <char >(0x00u ));
10801080 EXPECT_EQ (sbuf.data [2 ], static_cast <char >(0x01u ));
@@ -1248,7 +1248,7 @@ TEST(MSGPACKC, unpack_array_uint64)
12481248 ret = msgpack_unpack (buf, sizeof (buf), NULL , &z, &obj);
12491249 EXPECT_EQ (MSGPACK_UNPACK_SUCCESS, ret);
12501250 EXPECT_EQ (MSGPACK_OBJECT_ARRAY, obj.type );
1251- EXPECT_EQ (1 , obj.via .array .size );
1251+ EXPECT_EQ (1u , obj.via .array .size );
12521252 EXPECT_EQ (MSGPACK_OBJECT_POSITIVE_INTEGER, obj.via .array .ptr [0 ].type );
12531253 EXPECT_EQ (0xFFF0000000000001LL , obj.via .array .ptr [0 ].via .u64 );
12541254 msgpack_zone_destroy (&z);
0 commit comments