Fixes #152 ("Tree-based containers have troubles with move-only types")

This commit is contained in:
Ion Gaztañaga committed 2020-10-31 23:09:52 +01:00
1 parent 38ea1d7294
commit d4c8bd70ea
4 files changed
+95 -40

No files matched your search

+47 -21
View File
@@ -112,7 +112,7 @@ int set_test_copyable(boost::container::dtl::true_type)
return 1;
}
{
//Now, test copy constructor
//Now, test copy constructor with allocator
MyBoostSet boostsetcopy(boostset, typename MyBoostSet::allocator_type());
MyStdSet stdsetcopy(stdset);
@@ -347,28 +347,54 @@ int set_test ()
return 1;
}
//Swapping test
MyBoostSet tmpboosteset2;
MyStdSet tmpstdset2;
MyBoostMultiSet tmpboostemultiset2;
MyStdMultiSet tmpstdmultiset2;
boostset.swap(tmpboosteset2);
stdset.swap(tmpstdset2);
boostmultiset.swap(tmpboostemultiset2);
stdmultiset.swap(tmpstdmultiset2);
boostset.swap(tmpboosteset2);
stdset.swap(tmpstdset2);
boostmultiset.swap(tmpboostemultiset2);
stdmultiset.swap(tmpstdmultiset2);
if(!CheckEqualContainers(boostset, stdset)){
std::cout << "Error in boostset.swap(tmpboosteset2)" << std::endl;
return 1;
}
if(!CheckEqualContainers(boostmultiset, stdmultiset)){
std::cout << "Error in boostmultiset.swap(tmpboostemultiset2)" << std::endl;
return 1;
{
//Swapping test
MyBoostSet tmpboosteset2;
MyStdSet tmpstdset2;
MyBoostMultiSet tmpboostemultiset2;
MyStdMultiSet tmpstdmultiset2;
boostset.swap(tmpboosteset2);
stdset.swap(tmpstdset2);
boostmultiset.swap(tmpboostemultiset2);
stdmultiset.swap(tmpstdmultiset2);
boostset.swap(tmpboosteset2);
stdset.swap(tmpstdset2);
boostmultiset.swap(tmpboostemultiset2);
stdmultiset.swap(tmpstdmultiset2);
if(!CheckEqualContainers(boostset, stdset)){
std::cout << "Error in boostset.swap(tmpboosteset2)" << std::endl;
return 1;
}
if(!CheckEqualContainers(boostmultiset, stdmultiset)){
std::cout << "Error in boostmultiset.swap(tmpboostemultiset2)" << std::endl;
return 1;
}
}
//move constructor/assignment
{
MyBoostSet tmpboosteset2(boost::move(boostset));
if(!CheckEqualContainers(tmpboosteset2, stdset)){
std::cout << "Error in boostset move constructor " << std::endl;
return 1;
}
MyBoostMultiSet tmpboostemultiset2(boost::move(boostmultiset));
if(!CheckEqualContainers(tmpboostemultiset2, stdmultiset)){
std::cout << "Error in boostmultiset move constructor" << std::endl;
return 1;
}
boostset = boost::move(tmpboosteset2);
if(!CheckEqualContainers(boostset, stdset)){
std::cout << "Error in boostset move assignment" << std::endl;
return 1;
}
boostmultiset = boost::move(tmpboostemultiset2);
if(!CheckEqualContainers(boostmultiset, stdmultiset)){
std::cout << "Error in boostmultiset move assignment" << std::endl;
return 1;
}
}
//Insertion from other container
//Initialize values
{