diff --git a/test/carray.cpp b/test/carray.cpp index 0c419fb0..9c7d1009 100644 --- a/test/carray.cpp +++ b/test/carray.cpp @@ -113,7 +113,7 @@ TEST(carray, pack_unpack_char_as_str) msgpack::pack(ss, v1); msgpack::object_handle oh = msgpack::unpack(ss.str().data(), ss.str().size()); EXPECT_EQ(oh.get().type, msgpack::type::STR); - EXPECT_EQ(oh.get().via.str.size, (size_t) 1); + EXPECT_EQ(oh.get().via.str.size, static_cast(1)); char v2[2] = { 2, 3 }; oh.get().convert(v2); @@ -143,7 +143,7 @@ TEST(carray, obj_with_zone_char_as_str) msgpack::object o(v1, z); EXPECT_EQ(o.type, msgpack::type::STR); - EXPECT_EQ(o.via.str.size, (size_t) 1); + EXPECT_EQ(o.via.str.size, static_cast(1)); char v2[2]; o.convert(v2); @@ -175,7 +175,7 @@ TEST(carray, pack_unpack_unsigned_char_as_bin) msgpack::pack(ss, v1); msgpack::object_handle oh = msgpack::unpack(ss.str().data(), ss.str().size()); EXPECT_EQ(oh.get().type, msgpack::type::BIN); - EXPECT_EQ(oh.get().via.bin.size, (size_t) 2); + EXPECT_EQ(oh.get().via.bin.size, static_cast(2)); unsigned char v2[2]; oh.get().convert(v2); @@ -205,7 +205,7 @@ TEST(carray, obj_with_zone_unsigned_char_as_bin) msgpack::object o(v1, z); EXPECT_EQ(o.type, msgpack::type::BIN); - EXPECT_EQ(o.via.bin.size, (size_t) 2); + EXPECT_EQ(o.via.bin.size, static_cast(2)); unsigned char v2[2]; o.convert(v2); diff --git a/test/iterator_cpp11.cpp b/test/iterator_cpp11.cpp index e06f5ca9..c5a925cd 100644 --- a/test/iterator_cpp11.cpp +++ b/test/iterator_cpp11.cpp @@ -32,7 +32,7 @@ TEST(iterator, vector) auto const& msgarr = oh.get().via.array; auto dist = std::distance(begin(msgarr), end(msgarr)); auto vecSize = vec.size(); - EXPECT_EQ((size_t) dist, vecSize); + EXPECT_EQ(static_cast(dist), vecSize); vec_type::const_iterator correct = std::begin(vec); for (auto const& obj : msgarr) { @@ -58,7 +58,7 @@ TEST(iterator, map) auto const& msgmap = oh.get().via.map; auto dist = std::distance(begin(msgmap), end(msgmap)); auto mapSize = map.size(); - EXPECT_EQ((size_t) dist, mapSize); + EXPECT_EQ(static_cast(dist), mapSize); for (auto const& kv : msgmap) { auto key = kv.key.as(); diff --git a/test/object.cpp b/test/object.cpp index 8dfc4a48..4bb4b8bd 100644 --- a/test/object.cpp +++ b/test/object.cpp @@ -431,7 +431,7 @@ TEST(object, pack_float) msgpack::pack(ss1, obj); std::stringstream ss2; msgpack::pack(ss2, 1.2F); - EXPECT_EQ((size_t) 5, ss1.str().size()); + EXPECT_EQ(static_cast(5), ss1.str().size()); EXPECT_EQ(ss1.str(), ss2.str()); } @@ -442,6 +442,6 @@ TEST(object, pack_double) msgpack::pack(ss1, obj); std::stringstream ss2; msgpack::pack(ss2, 1.2); - EXPECT_EQ((size_t) 9, ss1.str().size()); + EXPECT_EQ(static_cast(9), ss1.str().size()); EXPECT_EQ(ss1.str(), ss2.str()); } diff --git a/test/reference_wrapper_cpp11.cpp b/test/reference_wrapper_cpp11.cpp index 4bc4ae0e..46f32f15 100644 --- a/test/reference_wrapper_cpp11.cpp +++ b/test/reference_wrapper_cpp11.cpp @@ -42,7 +42,7 @@ TEST(MSGPACK_REFERENCE_WRAPPER, pack_vector) msgpack::pack(ss, val1); msgpack::object_handle oh = msgpack::unpack(ss.str().data(), ss.str().size()); std::vector val2 = oh.get().as>(); - EXPECT_EQ(val2.size(), (size_t) 1); + EXPECT_EQ(val2.size(), static_cast(1)); EXPECT_EQ(val1[0], val2[0]); } diff --git a/test/streaming_c.cpp b/test/streaming_c.cpp index 47ba34ba..50162afb 100644 --- a/test/streaming_c.cpp +++ b/test/streaming_c.cpp @@ -163,12 +163,12 @@ TEST(streaming, basic_with_size) bytes = 0; ret = msgpack_unpacker_next_with_size(unp, &result, &bytes); if (ret == MSGPACK_UNPACK_CONTINUE) { - EXPECT_GT(bytes, (size_t) 0); + EXPECT_GT(bytes, static_cast(0)); continue; } while (ret == MSGPACK_UNPACK_SUCCESS) { - EXPECT_GT(bytes, (size_t) 0); + EXPECT_GT(bytes, static_cast(0)); parsed += bytes; ret = msgpack_unpacker_next_with_size(unp, &result, &bytes); } diff --git a/test/user_class.cpp b/test/user_class.cpp index 5c23292c..76b2f63f 100644 --- a/test/user_class.cpp +++ b/test/user_class.cpp @@ -563,13 +563,13 @@ TEST(MSGPACK_NVP, combination) msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size()); msgpack::object obj = oh.get(); - EXPECT_EQ(obj.via.map.size, (size_t) 3); + EXPECT_EQ(obj.via.map.size, static_cast(3)); EXPECT_EQ(std::string(obj.via.map.ptr[0].key.via.str.ptr, obj.via.map.ptr[0].key.via.str.size), "ccc"); EXPECT_EQ(obj.via.map.ptr[0].val.via.i64, 3); EXPECT_EQ(std::string(obj.via.map.ptr[1].key.via.str.ptr, obj.via.map.ptr[1].key.via.str.size), "base"); - EXPECT_EQ(obj.via.map.ptr[1].val.via.map.size, (size_t) 2); + EXPECT_EQ(obj.via.map.ptr[1].val.via.map.size, static_cast(2)); EXPECT_EQ( std::string( obj.via.map.ptr[1].val.via.map.ptr[0].key.via.str.ptr, diff --git a/test/visitor.cpp b/test/visitor.cpp index 6a6cd9e8..2652b04d 100644 --- a/test/visitor.cpp +++ b/test/visitor.cpp @@ -99,8 +99,8 @@ TEST(visitor, json_like) struct parse_error_check_visitor : msgpack::v2::null_visitor { parse_error_check_visitor(bool& called):m_called(called) {} void parse_error(size_t parsed_offset, size_t error_offset) { - EXPECT_EQ((size_t) 1, parsed_offset); - EXPECT_EQ((size_t) 2, error_offset); + EXPECT_EQ(static_cast(1), parsed_offset); + EXPECT_EQ(static_cast(2), error_offset); m_called = true; } bool& m_called; @@ -120,8 +120,8 @@ TEST(visitor, parse_error) struct insuf_bytes_check_visitor : msgpack::v2::null_visitor { insuf_bytes_check_visitor(bool& called):m_called(called) {} void insufficient_bytes(size_t parsed_offset, size_t error_offset) { - EXPECT_EQ((size_t) 2, parsed_offset); - EXPECT_EQ((size_t) 3, error_offset); + EXPECT_EQ(static_cast(2), parsed_offset); + EXPECT_EQ(static_cast(3), error_offset); m_called = true; } bool& m_called;