forked from boostorg/container
* Add missing extract() and insert(node_type) funtion to associative containers.
* Simplify select1st
This commit is contained in:
@@ -136,6 +136,114 @@ void test_move()
|
||||
move_assign.swap(original);
|
||||
}
|
||||
|
||||
bool node_type_test()
|
||||
{
|
||||
using namespace boost::container;
|
||||
{
|
||||
typedef set<test::movable_int> set_type;
|
||||
set_type src;
|
||||
{
|
||||
test::movable_int mv_1(1), mv_2(2), mv_3(3);
|
||||
src.emplace(boost::move(mv_1));
|
||||
src.emplace(boost::move(mv_2));
|
||||
src.emplace(boost::move(mv_3));
|
||||
}
|
||||
if(src.size() != 3)
|
||||
return false;
|
||||
|
||||
set_type dst;
|
||||
{
|
||||
test::movable_int mv_3(3);
|
||||
dst.emplace(boost::move(mv_3));
|
||||
}
|
||||
|
||||
if(dst.size() != 1)
|
||||
return false;
|
||||
|
||||
const test::movable_int mv_1(1);
|
||||
const test::movable_int mv_2(2);
|
||||
const test::movable_int mv_3(3);
|
||||
const test::movable_int mv_33(33);
|
||||
set_type::insert_return_type r;
|
||||
|
||||
r = dst.insert(src.extract(mv_33)); // Key version, try to insert empty node
|
||||
if(! (r.position == dst.end() && r.inserted == false && r.node.empty()) )
|
||||
return false;
|
||||
r = dst.insert(src.extract(src.find(mv_1))); // Iterator version, successful
|
||||
if(! (r.position == dst.find(mv_1) && r.inserted == true && r.node.empty()) )
|
||||
return false;
|
||||
r = dst.insert(dst.begin(), src.extract(mv_2)); // Key type version, successful
|
||||
if(! (r.position == dst.find(mv_2) && r.inserted == true && r.node.empty()) )
|
||||
return false;
|
||||
r = dst.insert(src.extract(mv_3)); // Key type version, unsuccessful
|
||||
|
||||
if(!src.empty())
|
||||
return false;
|
||||
if(dst.size() != 3)
|
||||
return false;
|
||||
if(! (r.position == dst.find(mv_3) && r.inserted == false && r.node.value() == mv_3) )
|
||||
return false;
|
||||
}
|
||||
|
||||
{
|
||||
typedef multiset<test::movable_int> multiset_type;
|
||||
multiset_type src;
|
||||
{
|
||||
test::movable_int mv_1(1), mv_2(2), mv_3(3), mv_3bis(3);
|
||||
src.emplace(boost::move(mv_1));
|
||||
src.emplace(boost::move(mv_2));
|
||||
src.emplace(boost::move(mv_3));
|
||||
src.emplace_hint(src.begin(), boost::move(mv_3bis));
|
||||
}
|
||||
if(src.size() != 4)
|
||||
return false;
|
||||
|
||||
multiset_type dst;
|
||||
{
|
||||
test::movable_int mv_3(3);
|
||||
dst.emplace(boost::move(mv_3));
|
||||
}
|
||||
|
||||
if(dst.size() != 1)
|
||||
return false;
|
||||
|
||||
const test::movable_int mv_1(1);
|
||||
const test::movable_int mv_2(2);
|
||||
const test::movable_int mv_3(3);
|
||||
const test::movable_int mv_4(4);
|
||||
multiset_type::iterator r;
|
||||
|
||||
multiset_type::node_type nt(src.extract(mv_3));
|
||||
r = dst.insert(dst.begin(), boost::move(nt));
|
||||
if(! (*r == mv_3 && dst.find(mv_3) == r && nt.empty()) )
|
||||
return false;
|
||||
|
||||
nt = src.extract(src.find(mv_1));
|
||||
r = dst.insert(boost::move(nt)); // Iterator version, successful
|
||||
if(! (*r == mv_1 && nt.empty()) )
|
||||
return false;
|
||||
|
||||
nt = src.extract(mv_2);
|
||||
r = dst.insert(boost::move(nt)); // Key type version, successful
|
||||
if(! (*r == mv_2 && nt.empty()) )
|
||||
return false;
|
||||
|
||||
r = dst.insert(src.extract(mv_3)); // Key type version, successful
|
||||
if(! (*r == mv_3 && r == --multiset_type::iterator(dst.upper_bound(mv_3)) && nt.empty()) )
|
||||
return false;
|
||||
|
||||
r = dst.insert(src.extract(mv_4)); // Key type version, unsuccessful
|
||||
if(! (r == dst.end()) )
|
||||
return false;
|
||||
|
||||
if(!src.empty())
|
||||
return false;
|
||||
if(dst.size() != 5)
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
struct boost_container_set;
|
||||
struct boost_container_multiset;
|
||||
|
||||
@@ -271,7 +379,6 @@ int main ()
|
||||
std::pair<int,int> p(0, 0);
|
||||
s.insert(p);
|
||||
s.emplace(p);
|
||||
return 0;
|
||||
}
|
||||
|
||||
////////////////////////////////////
|
||||
@@ -382,6 +489,13 @@ int main ()
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////
|
||||
// Node extraction/insertion testing functions
|
||||
////////////////////////////////////
|
||||
if(!node_type_test())
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user