Skip to content

Commit befc3cd

Browse files
redboltzredboltz
committed
Supressed C4309 on MSVC.
1 parent 2e2e93b commit befc3cd

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎test/msgpack_cpp11.cpp‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ TEST(MSGPACK_CHRONO, system_clock_32)
887887
msgpack::sbuffer sbuf;
888888
msgpack::pack(sbuf, val1);
889889
char packed[] = {
890-
static_cast<char>(0xd6),
890+
static_cast<char>(0xd6u),
891891
static_cast<char>(-1),
892892
static_cast<char>(0x12),
893893
static_cast<char>(0x34),
@@ -912,12 +912,12 @@ TEST(MSGPACK_CHRONO, system_clock_32_max)
912912
msgpack::sbuffer sbuf;
913913
msgpack::pack(sbuf, val1);
914914
char packed[] = {
915-
static_cast<char>(0xd6),
915+
static_cast<char>(0xd6u),
916916
static_cast<char>(-1),
917-
static_cast<char>(0xff),
918-
static_cast<char>(0xff),
919-
static_cast<char>(0xff),
920-
static_cast<char>(0xff)
917+
static_cast<char>(0xffu),
918+
static_cast<char>(0xffu),
919+
static_cast<char>(0xffu),
920+
static_cast<char>(0xffu)
921921
};
922922
EXPECT_EQ(memcmp(sbuf.data(), packed, sizeof(packed)), 0);
923923

@@ -963,28 +963,28 @@ TEST(MSGPACK_CHRONO, system_clock_64_max)
963963
msgpack::sbuffer sbuf;
964964
msgpack::pack(sbuf, val1);
965965
char packed_nano[] = {
966-
static_cast<char>(0xd7),
966+
static_cast<char>(0xd7u),
967967
static_cast<char>(-1),
968-
static_cast<char>(0xee), // 999,999,999 << 2
968+
static_cast<char>(0xeeu), // 999,999,999 << 2
969969
static_cast<char>(0x6b),
970970
static_cast<char>(0x27),
971-
static_cast<char>(0xfc),
972-
static_cast<char>(0xff), // 32 bit sec
973-
static_cast<char>(0xff),
974-
static_cast<char>(0xff),
975-
static_cast<char>(0xff)
971+
static_cast<char>(0xfcu),
972+
static_cast<char>(0xffu), // 32 bit sec
973+
static_cast<char>(0xffu),
974+
static_cast<char>(0xffu),
975+
static_cast<char>(0xffu)
976976
};
977977
char packed_micro[] = {
978-
static_cast<char>(0xd7),
978+
static_cast<char>(0xd7u),
979979
static_cast<char>(-1),
980-
static_cast<char>(0xee), // 999,999,000 << 2
980+
static_cast<char>(0xeeu), // 999,999,000 << 2
981981
static_cast<char>(0x6b),
982982
static_cast<char>(0x18),
983983
static_cast<char>(0x60),
984-
static_cast<char>(0xff), // 32 bit sec
985-
static_cast<char>(0xff),
986-
static_cast<char>(0xff),
987-
static_cast<char>(0xff)
984+
static_cast<char>(0xffu), // 32 bit sec
985+
static_cast<char>(0xffu),
986+
static_cast<char>(0xffu),
987+
static_cast<char>(0xffu)
988988
};
989989
if (std::chrono::system_clock::duration::period::ratio::den == 1000000000) {
990990
EXPECT_EQ(memcmp(sbuf.data(), packed_nano, sizeof(packed_nano)), 0);
@@ -1060,7 +1060,7 @@ TEST(MSGPACK_TIMESPEC, timespec_pack_convert_zero)
10601060

10611061
msgpack::pack(ss, val1);
10621062
std::string const& str = ss.str();
1063-
EXPECT_EQ(str.data()[0], static_cast<char>(0xd6));
1063+
EXPECT_EQ(str.data()[0], static_cast<char>(0xd6u));
10641064

10651065
msgpack::object_handle oh;
10661066
msgpack::unpack(oh, str.data(), str.size());
@@ -1086,7 +1086,7 @@ TEST(MSGPACK_TIMESPEC, timespec_pack_convert_32bit_sec)
10861086

10871087
msgpack::pack(ss, val1);
10881088
std::string const& str = ss.str();
1089-
EXPECT_EQ(str.data()[0], static_cast<char>(0xd6));
1089+
EXPECT_EQ(str.data()[0], static_cast<char>(0xd6u));
10901090

10911091
msgpack::object_handle oh;
10921092
msgpack::unpack(oh, str.data(), str.size());
@@ -1112,7 +1112,7 @@ TEST(MSGPACK_TIMESPEC, timespec_pack_convert_max_nano)
11121112

11131113
msgpack::pack(ss, val1);
11141114
std::string const& str = ss.str();
1115-
EXPECT_EQ(str.data()[0], static_cast<char>(0xd7));
1115+
EXPECT_EQ(str.data()[0], static_cast<char>(0xd7u));
11161116
msgpack::object_handle oh;
11171117
msgpack::unpack(oh, str.data(), str.size());
11181118
timespec val2 = oh.get().as<timespec>();
@@ -1138,7 +1138,7 @@ TEST(MSGPACK_TIMESPEC, timespec_pack_convert_34bit_sec_max_nano)
11381138

11391139
msgpack::pack(ss, val1);
11401140
std::string const& str = ss.str();
1141-
EXPECT_EQ(str.data()[0], static_cast<char>(0xd7));
1141+
EXPECT_EQ(str.data()[0], static_cast<char>(0xd7u));
11421142

11431143
msgpack::object_handle oh;
11441144
msgpack::unpack(oh, str.data(), str.size());
@@ -1166,7 +1166,7 @@ TEST(MSGPACK_TIMESPEC, timespec_pack_convert_35bit_sec_max_nano)
11661166

11671167
msgpack::pack(ss, val1);
11681168
std::string const& str = ss.str();
1169-
EXPECT_EQ(str.data()[0], static_cast<char>(0xc7));
1169+
EXPECT_EQ(str.data()[0], static_cast<char>(0xc7u));
11701170

11711171
msgpack::object_handle oh;
11721172
msgpack::unpack(oh, str.data(), str.size());
@@ -1193,7 +1193,7 @@ TEST(MSGPACK_TIMESPEC, timespec_pack_convert_64bit_sec_max_nano)
11931193

11941194
msgpack::pack(ss, val1);
11951195
std::string const& str = ss.str();
1196-
EXPECT_EQ(str.data()[0], static_cast<char>(0xc7));
1196+
EXPECT_EQ(str.data()[0], static_cast<char>(0xc7u));
11971197

11981198
msgpack::object_handle oh;
11991199
msgpack::unpack(oh, str.data(), str.size());

‎test/pack_unpack.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ TEST(unpack, int_off_larger_than_length)
528528
TEST(unpack, empty_array_fix)
529529
{
530530
std::string buf;
531-
buf.push_back(static_cast<char>(0x90));
531+
buf.push_back(static_cast<char>(0x90u));
532532
std::size_t off = 0;
533533

534534
msgpack::object_handle oh = msgpack::unpack(buf.data(), buf.size(), off);
@@ -540,7 +540,7 @@ TEST(unpack, empty_array_fix)
540540
TEST(unpack, empty_array_16)
541541
{
542542
std::string buf;
543-
buf.push_back(static_cast<char>(0xdc));
543+
buf.push_back(static_cast<char>(0xdcu));
544544
buf.push_back(static_cast<char>(0x00));
545545
buf.push_back(static_cast<char>(0x00));
546546
std::size_t off = 0;
@@ -554,7 +554,7 @@ TEST(unpack, empty_array_16)
554554
TEST(unpack, empty_array_32)
555555
{
556556
std::string buf;
557-
buf.push_back(static_cast<char>(0xdd));
557+
buf.push_back(static_cast<char>(0xddu));
558558
buf.push_back(static_cast<char>(0x00));
559559
buf.push_back(static_cast<char>(0x00));
560560
buf.push_back(static_cast<char>(0x00));
@@ -570,7 +570,7 @@ TEST(unpack, empty_array_32)
570570
TEST(unpack, empty_map_fix)
571571
{
572572
std::string buf;
573-
buf.push_back(static_cast<char>(0x80));
573+
buf.push_back(static_cast<char>(0x80u));
574574
std::size_t off = 0;
575575

576576
msgpack::object_handle oh = msgpack::unpack(buf.data(), buf.size(), off);
@@ -582,7 +582,7 @@ TEST(unpack, empty_map_fix)
582582
TEST(unpack, empty_map_16)
583583
{
584584
std::string buf;
585-
buf.push_back(static_cast<char>(0xde));
585+
buf.push_back(static_cast<char>(0xdeu));
586586
buf.push_back(static_cast<char>(0x00));
587587
buf.push_back(static_cast<char>(0x00));
588588
std::size_t off = 0;
@@ -596,7 +596,7 @@ TEST(unpack, empty_map_16)
596596
TEST(unpack, empty_map_32)
597597
{
598598
std::string buf;
599-
buf.push_back(static_cast<char>(0xdf));
599+
buf.push_back(static_cast<char>(0xdfu));
600600
buf.push_back(static_cast<char>(0x00));
601601
buf.push_back(static_cast<char>(0x00));
602602
buf.push_back(static_cast<char>(0x00));

0 commit comments

Comments
 (0)