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

Improve allocator propagation test with new constructors and refactor code to avoid too many wrappers.

Browse Source
This commit is contained in:
Ion Gaztañaga
2015-02-26 00:32:32 +01:00
parent 7160bea2aa
commit 6c5e527c60
14 changed files with 545 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/flat_map_test.cpp
+47 -35
View File
@@ -199,40 +199,6 @@ void test_move()
move_assign.swap(original);
}
template<class T, class Allocator>
class flat_map_propagate_test_wrapper
: public boost::container::flat_map
< T, T, std::less<T>
, typename boost::container::allocator_traits<Allocator>::template
portable_rebind_alloc< std::pair<T, T> >::type>
{
BOOST_COPYABLE_AND_MOVABLE(flat_map_propagate_test_wrapper)
typedef boost::container::flat_map
< T, T, std::less<T>
, typename boost::container::allocator_traits<Allocator>::template
portable_rebind_alloc< std::pair<T, T> >::type> Base;
public:
flat_map_propagate_test_wrapper()
: Base()
{}
flat_map_propagate_test_wrapper(const flat_map_propagate_test_wrapper &x)
: Base(x)
{}
flat_map_propagate_test_wrapper(BOOST_RV_REF(flat_map_propagate_test_wrapper) x)
: Base(boost::move(static_cast<Base&>(x)))
{}
flat_map_propagate_test_wrapper &operator=(BOOST_COPY_ASSIGN_REF(flat_map_propagate_test_wrapper) x)
{ this->Base::operator=(x); return *this; }
flat_map_propagate_test_wrapper &operator=(BOOST_RV_REF(flat_map_propagate_test_wrapper) x)
{ this->Base::operator=(boost::move(static_cast<Base&>(x))); return *this; }
void swap(flat_map_propagate_test_wrapper &x)
{ this->Base::swap(x); }
};
namespace boost{
namespace container {
@@ -347,6 +313,49 @@ struct GetAllocatorMap
};
};
struct boost_container_flat_map;
struct boost_container_flat_multimap;
namespace boost { namespace container { namespace test {
template<>
struct alloc_propagate_base<boost_container_flat_map>
{
template <class T, class Allocator>
struct apply
{
typedef typename boost::container::allocator_traits<Allocator>::
template portable_rebind_alloc<std::pair<T, T> >::type TypeAllocator;
typedef boost::container::flat_map<T, T, std::less<T>, TypeAllocator> type;
};
};
template<>
struct alloc_propagate_base<boost_container_flat_multimap>
{
template <class T, class Allocator>
struct apply
{
typedef typename boost::container::allocator_traits<Allocator>::
template portable_rebind_alloc<std::pair<T, T> >::type TypeAllocator;
typedef boost::container::flat_multimap<T, T, std::less<T>, TypeAllocator> type;
};
};
template <class Key, class T, class Compare, class Allocator>
struct get_real_stored_allocator<flat_map<Key, T, Compare, Allocator> >
{
typedef typename flat_map<Key, T, Compare, Allocator>::impl_stored_allocator_type type;
};
template <class Key, class T, class Compare, class Allocator>
struct get_real_stored_allocator<flat_multimap<Key, T, Compare, Allocator> >
{
typedef typename flat_multimap<Key, T, Compare, Allocator>::impl_stored_allocator_type type;
};
}}} //namespace boost::container::test
template<class VoidAllocator>
int test_map_variants()
{
@@ -516,7 +525,10 @@ int main()
////////////////////////////////////
// Allocator propagation testing
////////////////////////////////////
if(!boost::container::test::test_propagate_allocator<flat_map_propagate_test_wrapper>())
if(!boost::container::test::test_propagate_allocator<boost_container_flat_map>())
return 1;
if(!boost::container::test::test_propagate_allocator<boost_container_flat_multimap>())
return 1;
return 0;