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

Replaced auto& with auto const& for msgpack::object.

Browse Source 
Replaced auto with auto const& for msgpack::object.
Avoided msgpack::object conversion in EXPECT_EQ.
This commit is contained in:
Takatoshi Kondo 2015-02-02 15:18:06 +09:00
parent 97886c50e7
commit ff86d61799
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/iterator_cpp11.cpp
View File

@ -29,15 +29,15 @@ TEST(iterator, vector)
msgpack::unpacked ret; msgpack::unpacked ret;
msgpack::unpack(ret, sbuf.data(), sbuf.size()); msgpack::unpack(ret, sbuf.data(), sbuf.size());
auto &msgarr = ret.get().via.array; auto const& msgarr = ret.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(dist, vecSize); EXPECT_EQ(dist, vecSize);
vec_type::iterator correct = std::begin(vec); vec_type::const_iterator correct = std::begin(vec);
for (auto i : msgarr) { for (auto const& obj : msgarr) {
auto u64 = *correct; auto u64 = *correct;
EXPECT_EQ(i, u64); EXPECT_EQ(obj.as<unsigned int>(), u64);
++correct; ++correct;
} }
} }
@ -55,15 +55,16 @@ TEST(iterator, map)
msgpack::unpacked ret; msgpack::unpacked ret;
msgpack::unpack(ret, sbuf.data(), sbuf.size()); msgpack::unpack(ret, sbuf.data(), sbuf.size());
auto &msgmap = ret.get().via.map; auto const& msgmap = ret.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(dist, mapSize); EXPECT_EQ(dist, mapSize);
for (auto kv : msgmap) { for (auto const& kv : msgmap) {
auto val = kv.val.via.u64; auto key = kv.key.as<unsigned int>();
auto correct = map[kv.key.via.u64]; auto val = kv.val.as<unsigned int>();
EXPECT_EQ(val, correct); auto correct = map[key];
EXPECT_EQ(val, correct);
} }
} }