forked from boostorg/intrusive
no message
[SVN r38076]
This commit is contained in:
@@ -11,6 +11,7 @@
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <boost/intrusive/detail/config_begin.hpp>
|
||||
#include <boost/intrusive/unordered_set.hpp>
|
||||
#include <boost/intrusive/detail/pointer_to_other.hpp>
|
||||
#include "itestvalue.hpp"
|
||||
@@ -281,14 +282,14 @@ void test_unordered_multiset<ValueTraits>
|
||||
unordered_multiset_type testset1 (buckets1, BucketSize, values.begin(), values.end());
|
||||
unordered_multiset_type testset2 (buckets2, BucketSize);
|
||||
|
||||
testset2.clone_from(testset1, test::new_cloner(), test::delete_destroyer());
|
||||
testset2.clone_from(testset1, test::new_cloner(), test::delete_disposer());
|
||||
//Ordering is not guarantee in the cloning so insert data in a set and test
|
||||
std::multiset<typename ValueTraits::value_type>
|
||||
src(testset1.begin(), testset1.end());
|
||||
std::multiset<typename ValueTraits::value_type>
|
||||
dst(testset2.begin(), testset2.end());
|
||||
BOOST_TEST (src == dst);
|
||||
testset2.clear_and_destroy(test::delete_destroyer());
|
||||
testset2.clear_and_dispose(test::delete_disposer());
|
||||
BOOST_TEST (testset2.empty());
|
||||
}
|
||||
{
|
||||
@@ -298,14 +299,14 @@ void test_unordered_multiset<ValueTraits>
|
||||
unordered_multiset_type testset1 (buckets1, BucketSize*2, values.begin(), values.end());
|
||||
unordered_multiset_type testset2 (buckets2, BucketSize);
|
||||
|
||||
testset2.clone_from(testset1, test::new_cloner(), test::delete_destroyer());
|
||||
testset2.clone_from(testset1, test::new_cloner(), test::delete_disposer());
|
||||
//Ordering is not guarantee in the cloning so insert data in a set and test
|
||||
std::multiset<typename ValueTraits::value_type>
|
||||
src(testset1.begin(), testset1.end());
|
||||
std::multiset<typename ValueTraits::value_type>
|
||||
dst(testset2.begin(), testset2.end());
|
||||
BOOST_TEST (src == dst);
|
||||
testset2.clear_and_destroy(test::delete_destroyer());
|
||||
testset2.clear_and_dispose(test::delete_disposer());
|
||||
BOOST_TEST (testset2.empty());
|
||||
}
|
||||
{
|
||||
@@ -315,14 +316,14 @@ void test_unordered_multiset<ValueTraits>
|
||||
unordered_multiset_type testset1 (buckets1, BucketSize, values.begin(), values.end());
|
||||
unordered_multiset_type testset2 (buckets2, BucketSize*2);
|
||||
|
||||
testset2.clone_from(testset1, test::new_cloner(), test::delete_destroyer());
|
||||
testset2.clone_from(testset1, test::new_cloner(), test::delete_disposer());
|
||||
//Ordering is not guarantee in the cloning so insert data in a set and test
|
||||
std::multiset<typename ValueTraits::value_type>
|
||||
src(testset1.begin(), testset1.end());
|
||||
std::multiset<typename ValueTraits::value_type>
|
||||
dst(testset2.begin(), testset2.end());
|
||||
BOOST_TEST (src == dst);
|
||||
testset2.clear_and_destroy(test::delete_destroyer());
|
||||
testset2.clear_and_dispose(test::delete_disposer());
|
||||
BOOST_TEST (testset2.empty());
|
||||
}
|
||||
}
|
||||
@@ -375,6 +376,7 @@ class test_main_template<VoidPointer, false>
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
|
||||
/*
|
||||
//Explicit instantiations of non-counted classes
|
||||
template class boost::intrusive::unordered_multiset
|
||||
@@ -428,6 +430,7 @@ template class boost::intrusive::unordered_multiset
|
||||
, boost::hash<unordered_set_member_smart_t::value_type>
|
||||
, std::equal_to<unordered_set_member_smart_t::value_type>, true>;
|
||||
*/
|
||||
|
||||
int main( int, char* [] )
|
||||
{
|
||||
test_main_template<void*, false>()();
|
||||
@@ -436,3 +439,5 @@ int main( int, char* [] )
|
||||
test_main_template<boost::intrusive::smart_ptr<void>, true>()();
|
||||
return boost::report_errors();
|
||||
}
|
||||
|
||||
#include <boost/intrusive/detail/config_end.hpp>
|
||||
|
||||
Reference in New Issue
Block a user