feedc0de/boost_container
1
0
Fork 0
forked from boostorg/container
Code Pull Requests Activity

Support GCC's -Wconversion -Wfloat-conversion -Warith-conversion -Wsign-conversion warnings.

Browse Source
This commit is contained in:
Ion Gaztañaga
2021-10-16 15:57:47 +02:00
parent 883868e6b2
commit dad2cb2d02
42 changed files with 813 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/map_test.hpp
+6 -4
View File
@@ -108,17 +108,19 @@ int map_test_copyable(boost::container::dtl::true_type)
boostmap.clear();
boostmultimap.clear();
stdmultimap.clear();
//Now try from convertible pair
for(i = 0; i < MaxElem; ++i){
{
boostmap.insert(std::pair<unsigned, unsigned>(i, i));
boostmap.insert(std::pair<signed short, signed short>((signed short)i, (signed short)i));
stdmap.insert(StdPairType(i, i));
}
{
boostmultimap.insert(std::pair<unsigned, unsigned>(i, i));
boostmultimap.insert(std::pair<signed short, signed short>((signed short)i, (signed short)i));
stdmultimap.insert(StdPairType(i, i));
}
}
if(!CheckEqualContainers(boostmap, stdmap)) return 1;
if(!CheckEqualContainers(boostmultimap, stdmultimap)) return 1;
@@ -692,8 +694,8 @@ int map_test_insert2(MyBoostMap &boostmap, MyStdMap &stdmap, MyBoostMultiMap &bo
std::pair<typename MyStdMultiMap::iterator, typename MyStdMultiMap::iterator> sret =
stdmultimap.equal_range(stdmultimap.begin()->first);
if( boost::container::iterator_distance(bret.first, bret.second) !=
boost::container::iterator_distance(sret.first, sret.second) ){
if( boost::container::iterator_udistance(bret.first, bret.second) !=
boost::container::iterator_udistance(sret.first, sret.second) ){
return 1;
}
}