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

Merge pull request #137 from redboltz/remove_tr1_from_test

Browse Source 
Removed wrong tr1:: from unordered containers.
This commit is contained in:
Takatoshi Kondo 2014-10-19 19:37:10 +09:00
commit 07e7ad6b7e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/object_with_zone.cpp
View File

@ -533,7 +533,7 @@ TEST(object_with_zone, unordered_multimap)
msgpack::object obj(v1, z); msgpack::object obj(v1, z);
test_t v2 = obj.as<test_t>(); test_t v2 = obj.as<test_t>();
vector<pair<int, int> > vec1, vec2; vector<pair<int, int> > vec1, vec2;
tr1::unordered_multimap<int, int>::const_iterator it; unordered_multimap<int, int>::const_iterator it;
for (it = v1.begin(); it != v1.end(); ++it) for (it = v1.begin(); it != v1.end(); ++it)
vec1.push_back(make_pair(it->first, it->second)); vec1.push_back(make_pair(it->first, it->second));
for (it = v2.begin(); it != v2.end(); ++it) for (it = v2.begin(); it != v2.end(); ++it)
@ -561,7 +561,7 @@ TEST(object_with_zone, unordered_set)
msgpack::object obj(v1, z); msgpack::object obj(v1, z);
test_t v2 = obj.as<test_t>(); test_t v2 = obj.as<test_t>();
EXPECT_EQ(v1.size(), v2.size()); EXPECT_EQ(v1.size(), v2.size());
tr1::unordered_set<int>::const_iterator it; unordered_set<int>::const_iterator it;
for (it = v1.begin(); it != v1.end(); ++it) for (it = v1.begin(); it != v1.end(); ++it)
EXPECT_TRUE(v2.find(*it) != v2.end()); EXPECT_TRUE(v2.find(*it) != v2.end());
} }
@ -581,7 +581,7 @@ TEST(object_with_zone, unordered_multiset)
msgpack::object obj(v1, z); msgpack::object obj(v1, z);
test_t v2 = obj.as<test_t>(); test_t v2 = obj.as<test_t>();
vector<int> vec1, vec2; vector<int> vec1, vec2;
tr1::unordered_multiset<int>::const_iterator it; unordered_multiset<int>::const_iterator it;
for (it = v1.begin(); it != v1.end(); ++it) for (it = v1.begin(); it != v1.end(); ++it)
vec1.push_back(*it); vec1.push_back(*it);
for (it = v2.begin(); it != v2.end(); ++it) for (it = v2.begin(); it != v2.end(); ++it)