//////////////////////////////////////////////////////////////////////////////
#include <boost/container/detail/config_begin.hpp>
+
#include <set>
+
#include <boost/container/flat_set.hpp>
+#include <boost/container/stable_vector.hpp>
+#include <boost/container/small_vector.hpp>
+#include <boost/container/deque.hpp>
+#include <boost/container/static_vector.hpp>
#include <boost/container/allocator.hpp>
+#include <boost/container/detail/container_or_allocator_rebind.hpp>
#include "print_container.hpp"
#include "dummy_test_allocator.hpp"
#include "propagate_allocator_test.hpp"
#include "emplace_test.hpp"
#include "container_common_tests.hpp"
-#include <vector>
-#include <boost/container/detail/flat_tree.hpp>
#include "../../intrusive/test/iterator_test.hpp"
using namespace boost::container;
template class flat_set
< test::movable_and_copyable_int
, std::less<test::movable_and_copyable_int>
- , allocator<test::movable_and_copyable_int>
+ , small_vector<test::movable_and_copyable_int, 10, allocator<test::movable_and_copyable_int> >
>;
//flat_multiset
template class flat_multiset
< test::movable_and_copyable_int
, std::less<test::movable_and_copyable_int>
- , test::simple_allocator<test::movable_and_copyable_int>
+ , stable_vector<test::movable_and_copyable_int, test::simple_allocator<test::movable_and_copyable_int> >
>;
template class flat_multiset
< test::movable_and_copyable_int
, std::less<test::movable_and_copyable_int>
- , allocator<test::movable_and_copyable_int>
- >;
-
-namespace container_detail {
-
-//Instantiate base class as previous instantiations don't instantiate inherited members
-template class flat_tree
- < test::movable_and_copyable_int
- , identity<test::movable_and_copyable_int>
- , std::less<test::movable_and_copyable_int>
- , test::simple_allocator<test::movable_and_copyable_int>
+ , deque<test::movable_and_copyable_int, test::simple_allocator< test::movable_and_copyable_int > >
>;
-template class flat_tree
+template class flat_multiset
< test::movable_and_copyable_int
- , identity<test::movable_and_copyable_int>
, std::less<test::movable_and_copyable_int>
- , allocator<test::movable_and_copyable_int>
+ , static_vector<test::movable_and_copyable_int, 10 >
>;
-} //container_detail {
-
//As flat container iterators are typedefs for vector::[const_]iterator,
//no need to explicit instantiate them
}} //boost::container
+
+#if (__cplusplus > 201103L)
+#include <vector>
+
+namespace boost{
+namespace container{
+
+template class flat_set
+ < test::movable_and_copyable_int
+ , std::less<test::movable_and_copyable_int>
+ , std::vector<test::movable_and_copyable_int>
+>;
+
+}} //boost::container
+
+#endif
+
//Test recursive structures
class recursive_flat_set
{
return true;
}
-}}}
+template< class RandomIt >
+void random_shuffle( RandomIt first, RandomIt last )
+{
+ typedef typename boost::container::iterator_traits<RandomIt>::difference_type difference_type;
+ difference_type n = last - first;
+ for (difference_type i = n-1; i > 0; --i) {
+ difference_type j = std::rand() % (i+1);
+ if(j != i) {
+ boost::adl_move_swap(first[i], first[j]);
+ }
+ }
+}
+bool flat_tree_extract_adopt_test()
+{
+ using namespace boost::container;
+ const std::size_t NumElements = 100;
-template<class VoidAllocator>
-struct GetAllocatorSet
+ //extract/adopt set
+ {
+ //Construction insertion
+ flat_set<int> fset;
+
+ for(std::size_t i = 0; i != NumElements; ++i){
+ fset.insert(static_cast<int>(i));
+ }
+
+ flat_set<int> fset_copy(fset);
+ flat_set<int>::sequence_type seq(fset.extract_sequence());
+ if(!fset.empty())
+ return false;
+ if(!CheckEqualContainers(seq, fset_copy))
+ return false;
+
+ seq.insert(seq.end(), fset_copy.begin(), fset_copy.end());
+ boost::container::test::random_shuffle(seq.begin(), seq.end());
+ fset.adopt_sequence(boost::move(seq));
+ if(!CheckEqualContainers(fset, fset_copy))
+ return false;
+ }
+
+ //extract/adopt set, ordered_unique_range
+ {
+ //Construction insertion
+ flat_set<int> fset;
+
+ for(std::size_t i = 0; i != NumElements; ++i){
+ fset.insert(static_cast<int>(i));
+ }
+
+ flat_set<int> fset_copy(fset);
+ flat_set<int>::sequence_type seq(fset.extract_sequence());
+ if(!fset.empty())
+ return false;
+ if(!CheckEqualContainers(seq, fset_copy))
+ return false;
+
+ fset.adopt_sequence(ordered_unique_range, boost::move(seq));
+ if(!CheckEqualContainers(fset, fset_copy))
+ return false;
+ }
+
+ //extract/adopt multiset
+ {
+ //Construction insertion
+ flat_multiset<int> fmset;
+
+ for(std::size_t i = 0; i != NumElements; ++i){
+ fmset.insert(static_cast<int>(i));
+ fmset.insert(static_cast<int>(i));
+ }
+
+ flat_multiset<int> fmset_copy(fmset);
+ flat_multiset<int>::sequence_type seq(fmset.extract_sequence());
+ if(!fmset.empty())
+ return false;
+ if(!CheckEqualContainers(seq, fmset_copy))
+ return false;
+
+ boost::container::test::random_shuffle(seq.begin(), seq.end());
+ fmset.adopt_sequence(boost::move(seq));
+ if(!CheckEqualContainers(fmset, fmset_copy))
+ return false;
+ }
+
+ //extract/adopt multiset, ordered_range
+ {
+ //Construction insertion
+ flat_multiset<int> fmset;
+
+ for(std::size_t i = 0; i != NumElements; ++i){
+ fmset.insert(static_cast<int>(i));
+ fmset.insert(static_cast<int>(i));
+ }
+
+ flat_multiset<int> fmset_copy(fmset);
+ flat_multiset<int>::sequence_type seq(fmset.extract_sequence());
+ if(!fmset.empty())
+ return false;
+ if(!CheckEqualContainers(seq, fmset_copy))
+ return false;
+
+ fmset.adopt_sequence(ordered_range, boost::move(seq));
+ if(!CheckEqualContainers(fmset, fmset_copy))
+ return false;
+ }
+
+ return true;
+}
+
+}}}
+
+template<class VoidAllocatorOrContainer>
+struct GetSetContainer
{
template<class ValueType>
struct apply
{
typedef flat_set < ValueType
, std::less<ValueType>
- , typename allocator_traits<VoidAllocator>
- ::template portable_rebind_alloc<ValueType>::type
+ , typename boost::container::container_detail::container_or_allocator_rebind<VoidAllocatorOrContainer, ValueType>::type
> set_type;
typedef flat_multiset < ValueType
, std::less<ValueType>
- , typename allocator_traits<VoidAllocator>
- ::template portable_rebind_alloc<ValueType>::type
+ , typename boost::container::container_detail::container_or_allocator_rebind<VoidAllocatorOrContainer, ValueType>::type
> multiset_type;
};
};
template<class VoidAllocator>
int test_set_variants()
{
- typedef typename GetAllocatorSet<VoidAllocator>::template apply<int>::set_type MySet;
- typedef typename GetAllocatorSet<VoidAllocator>::template apply<test::movable_int>::set_type MyMoveSet;
- typedef typename GetAllocatorSet<VoidAllocator>::template apply<test::movable_and_copyable_int>::set_type MyCopyMoveSet;
- typedef typename GetAllocatorSet<VoidAllocator>::template apply<test::copyable_int>::set_type MyCopySet;
+ typedef typename GetSetContainer<VoidAllocator>::template apply<int>::set_type MySet;
+ typedef typename GetSetContainer<VoidAllocator>::template apply<test::movable_int>::set_type MyMoveSet;
+ typedef typename GetSetContainer<VoidAllocator>::template apply<test::movable_and_copyable_int>::set_type MyCopyMoveSet;
+ typedef typename GetSetContainer<VoidAllocator>::template apply<test::copyable_int>::set_type MyCopySet;
- typedef typename GetAllocatorSet<VoidAllocator>::template apply<int>::multiset_type MyMultiSet;
- typedef typename GetAllocatorSet<VoidAllocator>::template apply<test::movable_int>::multiset_type MyMoveMultiSet;
- typedef typename GetAllocatorSet<VoidAllocator>::template apply<test::movable_and_copyable_int>::multiset_type MyCopyMoveMultiSet;
- typedef typename GetAllocatorSet<VoidAllocator>::template apply<test::copyable_int>::multiset_type MyCopyMultiSet;
+ typedef typename GetSetContainer<VoidAllocator>::template apply<int>::multiset_type MyMultiSet;
+ typedef typename GetSetContainer<VoidAllocator>::template apply<test::movable_int>::multiset_type MyMoveMultiSet;
+ typedef typename GetSetContainer<VoidAllocator>::template apply<test::movable_and_copyable_int>::multiset_type MyCopyMoveMultiSet;
+ typedef typename GetSetContainer<VoidAllocator>::template apply<test::copyable_int>::multiset_type MyCopyMultiSet;
typedef std::set<int> MyStdSet;
typedef std::multiset<int> MyStdMultiSet;
return 1;
}
+ ////////////////////////////////////
+ // Extract/Adopt test
+ ////////////////////////////////////
+ if(!flat_tree_extract_adopt_test()){
+ return 1;
+ }
+
+ if (!boost::container::test::instantiate_constructors<flat_set<int>, flat_multiset<int> >())
+ return 1;
+
////////////////////////////////////
// Testing allocator implementations
////////////////////////////////////
projects / ceph.git / blobdiff