generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-07-03 01:05:22 +02:00
Code Issues Projects Releases Wiki Activity

Replace c-Style cast with static_cast

Browse Source
This commit is contained in:
Luiz Silva 2016-11-16 11:00:28 -02:00
parent 4a1db60af8
commit 04b549a46b
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/carray.cpp
View File

@ -113,7 +113,7 @@ TEST(carray, pack_unpack_char_as_str)
msgpack::pack(ss, v1); msgpack::pack(ss, v1);
msgpack::object_handle oh = msgpack::unpack(ss.str().data(), ss.str().size()); msgpack::object_handle oh = msgpack::unpack(ss.str().data(), ss.str().size());
EXPECT_EQ(oh.get().type, msgpack::type::STR); 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<size_t>(1));
char v2[2] = { 2, 3 }; char v2[2] = { 2, 3 };
oh.get().convert(v2); oh.get().convert(v2);
@ -143,7 +143,7 @@ TEST(carray, obj_with_zone_char_as_str)
msgpack::object o(v1, z); msgpack::object o(v1, z);
EXPECT_EQ(o.type, msgpack::type::STR); EXPECT_EQ(o.type, msgpack::type::STR);
EXPECT_EQ(o.via.str.size, (size_t) 1); EXPECT_EQ(o.via.str.size, static_cast<size_t>(1));
char v2[2]; char v2[2];
o.convert(v2); o.convert(v2);
@ -175,7 +175,7 @@ TEST(carray, pack_unpack_unsigned_char_as_bin)
msgpack::pack(ss, v1); msgpack::pack(ss, v1);
msgpack::object_handle oh = msgpack::unpack(ss.str().data(), ss.str().size()); msgpack::object_handle oh = msgpack::unpack(ss.str().data(), ss.str().size());
EXPECT_EQ(oh.get().type, msgpack::type::BIN); 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<size_t>(2));
unsigned char v2[2]; unsigned char v2[2];
oh.get().convert(v2); oh.get().convert(v2);
@ -205,7 +205,7 @@ TEST(carray, obj_with_zone_unsigned_char_as_bin)
msgpack::object o(v1, z); msgpack::object o(v1, z);
EXPECT_EQ(o.type, msgpack::type::BIN); EXPECT_EQ(o.type, msgpack::type::BIN);
EXPECT_EQ(o.via.bin.size, (size_t) 2); EXPECT_EQ(o.via.bin.size, static_cast<size_t>(2));
unsigned char v2[2]; unsigned char v2[2];
o.convert(v2); o.convert(v2);

4
test/iterator_cpp11.cpp
View File

@ -32,7 +32,7 @@ TEST(iterator, vector)
auto const& msgarr = oh.get().via.array; auto const& msgarr = oh.get().via.array;
auto dist = std::distance(begin(msgarr), end(msgarr)); auto dist = std::distance(begin(msgarr), end(msgarr));
auto vecSize = vec.size(); auto vecSize = vec.size();
EXPECT_EQ((size_t) dist, vecSize); EXPECT_EQ(static_cast<size_t>(dist), vecSize);
vec_type::const_iterator correct = std::begin(vec); vec_type::const_iterator correct = std::begin(vec);
for (auto const& obj : msgarr) { for (auto const& obj : msgarr) {
@ -58,7 +58,7 @@ TEST(iterator, map)
auto const& msgmap = oh.get().via.map; auto const& msgmap = oh.get().via.map;
auto dist = std::distance(begin(msgmap), end(msgmap)); auto dist = std::distance(begin(msgmap), end(msgmap));
auto mapSize = map.size(); auto mapSize = map.size();
EXPECT_EQ((size_t) dist, mapSize); EXPECT_EQ(static_cast<size_t>(dist), mapSize);
for (auto const& kv : msgmap) { for (auto const& kv : msgmap) {
auto key = kv.key.as<unsigned int>(); auto key = kv.key.as<unsigned int>();

4
test/object.cpp
View File

@ -431,7 +431,7 @@ TEST(object, pack_float)
msgpack::pack(ss1, obj); msgpack::pack(ss1, obj);
std::stringstream ss2; std::stringstream ss2;
msgpack::pack(ss2, 1.2F); msgpack::pack(ss2, 1.2F);
EXPECT_EQ((size_t) 5, ss1.str().size()); EXPECT_EQ(static_cast<size_t>(5), ss1.str().size());
EXPECT_EQ(ss1.str(), ss2.str()); EXPECT_EQ(ss1.str(), ss2.str());
} }
@ -442,6 +442,6 @@ TEST(object, pack_double)
msgpack::pack(ss1, obj); msgpack::pack(ss1, obj);
std::stringstream ss2; std::stringstream ss2;
msgpack::pack(ss2, 1.2); msgpack::pack(ss2, 1.2);
EXPECT_EQ((size_t) 9, ss1.str().size()); EXPECT_EQ(static_cast<size_t>(9), ss1.str().size());
EXPECT_EQ(ss1.str(), ss2.str()); EXPECT_EQ(ss1.str(), ss2.str());
} }

2
test/reference_wrapper_cpp11.cpp
View File

@ -42,7 +42,7 @@ TEST(MSGPACK_REFERENCE_WRAPPER, pack_vector)
msgpack::pack(ss, val1); msgpack::pack(ss, val1);
msgpack::object_handle oh = msgpack::unpack(ss.str().data(), ss.str().size()); msgpack::object_handle oh = msgpack::unpack(ss.str().data(), ss.str().size());
std::vector<int> val2 = oh.get().as<std::vector<int>>(); std::vector<int> val2 = oh.get().as<std::vector<int>>();
EXPECT_EQ(val2.size(), (size_t) 1); EXPECT_EQ(val2.size(), static_cast<size_t>(1));
EXPECT_EQ(val1[0], val2[0]); EXPECT_EQ(val1[0], val2[0]);
} }

4
test/streaming_c.cpp
View File

@ -163,12 +163,12 @@ TEST(streaming, basic_with_size)
bytes = 0; bytes = 0;
ret = msgpack_unpacker_next_with_size(unp, &result, &bytes); ret = msgpack_unpacker_next_with_size(unp, &result, &bytes);
if (ret == MSGPACK_UNPACK_CONTINUE) { if (ret == MSGPACK_UNPACK_CONTINUE) {
EXPECT_GT(bytes, (size_t) 0); EXPECT_GT(bytes, static_cast<size_t>(0));
continue; continue;
} }
while (ret == MSGPACK_UNPACK_SUCCESS) { while (ret == MSGPACK_UNPACK_SUCCESS) {
EXPECT_GT(bytes, (size_t) 0); EXPECT_GT(bytes, static_cast<size_t>(0));
parsed += bytes; parsed += bytes;
ret = msgpack_unpacker_next_with_size(unp, &result, &bytes); ret = msgpack_unpacker_next_with_size(unp, &result, &bytes);
} }

4
test/user_class.cpp
View File

@ -563,13 +563,13 @@ TEST(MSGPACK_NVP, combination)
msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size()); msgpack::object_handle oh = msgpack::unpack(sbuf.data(), sbuf.size());
msgpack::object obj = oh.get(); msgpack::object obj = oh.get();
EXPECT_EQ(obj.via.map.size, (size_t) 3); EXPECT_EQ(obj.via.map.size, static_cast<size_t>(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(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(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(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<size_t>(2));
EXPECT_EQ( EXPECT_EQ(
std::string( std::string(
obj.via.map.ptr[1].val.via.map.ptr[0].key.via.str.ptr, obj.via.map.ptr[1].val.via.map.ptr[0].key.via.str.ptr,

8
test/visitor.cpp
View File

@ -99,8 +99,8 @@ TEST(visitor, json_like)
struct parse_error_check_visitor : msgpack::v2::null_visitor { struct parse_error_check_visitor : msgpack::v2::null_visitor {
parse_error_check_visitor(bool& called):m_called(called) {} parse_error_check_visitor(bool& called):m_called(called) {}
void parse_error(size_t parsed_offset, size_t error_offset) { void parse_error(size_t parsed_offset, size_t error_offset) {
EXPECT_EQ((size_t) 1, parsed_offset); EXPECT_EQ(static_cast<size_t>(1), parsed_offset);
EXPECT_EQ((size_t) 2, error_offset); EXPECT_EQ(static_cast<size_t>(2), error_offset);
m_called = true; m_called = true;
} }
bool& m_called; bool& m_called;
@ -120,8 +120,8 @@ TEST(visitor, parse_error)
struct insuf_bytes_check_visitor : msgpack::v2::null_visitor { struct insuf_bytes_check_visitor : msgpack::v2::null_visitor {
insuf_bytes_check_visitor(bool& called):m_called(called) {} insuf_bytes_check_visitor(bool& called):m_called(called) {}
void insufficient_bytes(size_t parsed_offset, size_t error_offset) { void insufficient_bytes(size_t parsed_offset, size_t error_offset) {
EXPECT_EQ((size_t) 2, parsed_offset); EXPECT_EQ(static_cast<size_t>(2), parsed_offset);
EXPECT_EQ((size_t) 3, error_offset); EXPECT_EQ(static_cast<size_t>(3), error_offset);
m_called = true; m_called = true;
} }
bool& m_called; bool& m_called;