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

Support types with std::allocator_arg_at with boost::container::scoped_allocator_adaptor

Browse Source
This commit is contained in:
Ion Gaztañaga
2015-01-11 23:50:58 +01:00
parent a322203a89
commit 69324174c7
8 changed files with 373 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/scoped_allocator_adaptor_test.cpp
+251 -1
View File
@@ -9,11 +9,15 @@
//////////////////////////////////////////////////////////////////////////////
#include <boost/container/detail/config_begin.hpp>
#include <boost/container/scoped_allocator_fwd.hpp>
#include <cstddef>
// container/detail
#include <boost/container/detail/mpl.hpp>
// move
#include <boost/move/utility_core.hpp>
#include <boost/move/adl_move_swap.hpp>
// std
#include <memory>
#include <cstddef>
using namespace boost::container;
@@ -113,6 +117,7 @@ struct mark_on_destructor
enum ConstructionTypeEnum
{
ConstructiblePrefix,
ConstructibleStdPrefix,
ConstructibleSuffix,
NotUsesAllocator
};
@@ -133,6 +138,8 @@ struct uses_allocator_base<ConstructibleSuffix, AllocatorTag>
typedef allocator_type allocator_constructor_type;
struct nat{};
typedef nat allocator_arg_type;
struct nat2{};
typedef nat2 std_allocator_arg_type;
};
template<unsigned int AllocatorTag>
@@ -141,6 +148,18 @@ struct uses_allocator_base<ConstructiblePrefix, AllocatorTag>
typedef test_allocator<int, AllocatorTag> allocator_type;
typedef allocator_type allocator_constructor_type;
typedef allocator_arg_t allocator_arg_type;
struct nat{};
typedef nat std_allocator_arg_type;
};
template<unsigned int AllocatorTag>
struct uses_allocator_base<ConstructibleStdPrefix, AllocatorTag>
{
typedef test_allocator<int, AllocatorTag> allocator_type;
typedef allocator_type allocator_constructor_type;
struct nat{};
typedef nat allocator_arg_type;
typedef const std::allocator_arg_t& std_allocator_arg_type;
};
template<unsigned int AllocatorTag>
@@ -149,6 +168,8 @@ struct uses_allocator_base<NotUsesAllocator, AllocatorTag>
struct nat{};
typedef nat allocator_constructor_type;
typedef nat allocator_arg_type;
struct nat2{};
typedef nat2 std_allocator_arg_type;
};
template<ConstructionTypeEnum ConstructionType, unsigned int AllocatorTag>
@@ -177,6 +198,11 @@ struct mark_on_scoped_allocation
: construction_type(ConstructiblePrefix), value(0)
{}
explicit mark_on_scoped_allocation
(typename base_type::std_allocator_arg_type, typename base_type::allocator_constructor_type)
: construction_type(ConstructibleStdPrefix), value(0)
{}
//1 user argument constructors
explicit mark_on_scoped_allocation(int i)
: construction_type(NotUsesAllocator), value(i)
@@ -194,6 +220,13 @@ struct mark_on_scoped_allocation
: construction_type(ConstructiblePrefix), value(i)
{}
mark_on_scoped_allocation
( typename base_type::std_allocator_arg_type
, typename base_type::allocator_constructor_type
, int i)
: construction_type(ConstructibleStdPrefix), value(i)
{}
//Copy constructors
mark_on_scoped_allocation(const mark_on_scoped_allocation &other)
: construction_type(NotUsesAllocator), value(other.value)
@@ -210,6 +243,12 @@ struct mark_on_scoped_allocation
: construction_type(ConstructiblePrefix), value(other.value)
{}
mark_on_scoped_allocation( typename base_type::std_allocator_arg_type
, typename base_type::allocator_constructor_type
, const mark_on_scoped_allocation &other)
: construction_type(ConstructibleStdPrefix), value(other.value)
{}
//Move constructors
mark_on_scoped_allocation(BOOST_RV_REF(mark_on_scoped_allocation) other)
: construction_type(NotUsesAllocator), value(other.value)
@@ -226,6 +265,12 @@ struct mark_on_scoped_allocation
: construction_type(ConstructiblePrefix), value(other.value)
{ other.value = 0; other.construction_type = ConstructiblePrefix; }
mark_on_scoped_allocation( typename base_type::std_allocator_arg_type
, typename base_type::allocator_constructor_type
, BOOST_RV_REF(mark_on_scoped_allocation) other)
: construction_type(ConstructibleStdPrefix), value(other.value)
{ other.value = 0; other.construction_type = ConstructibleStdPrefix; }
ConstructionTypeEnum construction_type;
int value;
};
@@ -240,6 +285,13 @@ struct constructible_with_allocator_prefix
static const bool value = true;
};
template<unsigned int AllocatorTag>
struct constructible_with_std_allocator_prefix
< ::mark_on_scoped_allocation<ConstructibleStdPrefix, AllocatorTag> >
{
static const bool value = true;
};
template<unsigned int AllocatorTag>
struct constructible_with_allocator_suffix
< ::mark_on_scoped_allocation<ConstructibleSuffix, AllocatorTag> >
@@ -767,12 +819,18 @@ int main()
< ::mark_on_scoped_allocation<ConstructiblePrefix, 0>
, test_allocator<float, 0>
>::value ));
BOOST_STATIC_ASSERT(( boost::container::uses_allocator
< ::mark_on_scoped_allocation<ConstructibleStdPrefix, 0>
, test_allocator<float, 0>
>::value ));
BOOST_STATIC_ASSERT(( boost::container::uses_allocator
< ::mark_on_scoped_allocation<ConstructibleSuffix, 0>
, test_allocator<float, 0>
>::value ));
BOOST_STATIC_ASSERT(( boost::container::constructible_with_allocator_prefix
< ::mark_on_scoped_allocation<ConstructiblePrefix, 0> >::value ));
BOOST_STATIC_ASSERT(( boost::container::constructible_with_std_allocator_prefix
< ::mark_on_scoped_allocation<ConstructibleStdPrefix, 0> >::value ));
BOOST_STATIC_ASSERT(( boost::container::constructible_with_allocator_suffix
< ::mark_on_scoped_allocation<ConstructibleSuffix, 0> >::value ));
@@ -820,6 +878,18 @@ int main()
}
dummy.~MarkType();
}
{
typedef ::mark_on_scoped_allocation<ConstructibleStdPrefix, 0> MarkType;
MarkType dummy;
dummy.~MarkType();
s0i.construct(&dummy);
if(dummy.construction_type != ConstructibleStdPrefix ||
dummy.value != 0){
dummy.~MarkType();
return 1;
}
dummy.~MarkType();
}
//Check construction with 1 user arguments
{
@@ -858,6 +928,18 @@ int main()
}
dummy.~MarkType();
}
{
typedef ::mark_on_scoped_allocation<ConstructibleStdPrefix, 0> MarkType;
MarkType dummy;
dummy.~MarkType();
s0i.construct(&dummy, 3);
if(dummy.construction_type != ConstructibleStdPrefix ||
dummy.value != 3){
dummy.~MarkType();
return 1;
}
dummy.~MarkType();
}
}
////////////////////////////////////////////////////////////
//Then check scoped allocator with OuterAlloc and InnerAlloc.
@@ -903,6 +985,18 @@ int main()
}
dummy.~MarkType();
}
{
typedef ::mark_on_scoped_allocation<ConstructibleStdPrefix, 1> MarkType;
MarkType dummy;
dummy.~MarkType();
s1i.construct(&dummy);
if(dummy.construction_type != ConstructibleStdPrefix ||
dummy.value != 0){
dummy.~MarkType();
return 1;
}
dummy.~MarkType();
}
//Check construction with 1 user arguments
{
@@ -941,6 +1035,18 @@ int main()
}
dummy.~MarkType();
}
{
typedef ::mark_on_scoped_allocation<ConstructibleStdPrefix, 1> MarkType;
MarkType dummy;
dummy.~MarkType();
s1i.construct(&dummy, 3);
if(dummy.construction_type != ConstructibleStdPrefix ||
dummy.value != 3){
dummy.~MarkType();
return 1;
}
dummy.~MarkType();
}
}
//////////////////////////////////////////////////////////////////////////////////
@@ -1008,6 +1114,18 @@ int main()
}
dummy.~MarkType();
}
{
typedef ::mark_on_scoped_allocation<ConstructibleStdPrefix, 10> MarkType;
MarkType dummy;
dummy.~MarkType();
ssro0i.construct(&dummy);
if(dummy.construction_type != ConstructibleStdPrefix ||
dummy.value != 0){
dummy.~MarkType();
return 1;
}
dummy.~MarkType();
}
//Check construction with 1 user arguments
{
@@ -1046,6 +1164,18 @@ int main()
}
dummy.~MarkType();
}
{
typedef ::mark_on_scoped_allocation<ConstructibleStdPrefix, 10> MarkType;
MarkType dummy;
dummy.~MarkType();
ssro0i.construct(&dummy, 3);
if(dummy.construction_type != ConstructibleStdPrefix ||
dummy.value != 3){
dummy.~MarkType();
return 1;
}
dummy.~MarkType();
}
}
////////////////////////////////////////////////////////////
//Then check scoped allocator with OuterAlloc and InnerAlloc.
@@ -1115,6 +1245,18 @@ int main()
}
dummy.~MarkType();
}
{
typedef ::mark_on_scoped_allocation<ConstructibleStdPrefix, 10> MarkType;
MarkType dummy;
dummy.~MarkType();
ssro1i.construct(&dummy);
if(dummy.construction_type != NotUsesAllocator ||
dummy.value != 0){
dummy.~MarkType();
return 1;
}
dummy.~MarkType();
}
//Check construction with 1 user arguments
{
@@ -1153,6 +1295,18 @@ int main()
}
dummy.~MarkType();
}
{
typedef ::mark_on_scoped_allocation<ConstructibleStdPrefix, 10> MarkType;
MarkType dummy;
dummy.~MarkType();
ssro1i.construct(&dummy, 3);
if(dummy.construction_type != NotUsesAllocator ||
dummy.value != 3){
dummy.~MarkType();
return 1;
}
dummy.~MarkType();
}
}
////////////////////////////////////////////////////////////
@@ -1216,6 +1370,21 @@ int main()
}
dummy.~MarkTypePair();
}
{
typedef ::mark_on_scoped_allocation<ConstructibleStdPrefix, 0> MarkType;
typedef pair<MarkType, MarkType> MarkTypePair;
MarkTypePair dummy;
dummy.~MarkTypePair();
s0i.construct(&dummy);
if(dummy.first.construction_type != ConstructibleStdPrefix ||
dummy.second.construction_type != ConstructibleStdPrefix ||
dummy.first.value != 0 ||
dummy.second.value != 0 ){
dummy.~MarkTypePair();
return 1;
}
dummy.~MarkTypePair();
}
//Check construction with 1 user arguments for each pair
{
@@ -1263,6 +1432,21 @@ int main()
}
dummy.~MarkTypePair();
}
{
typedef ::mark_on_scoped_allocation<ConstructibleStdPrefix, 0> MarkType;
typedef pair<MarkType, MarkType> MarkTypePair;
MarkTypePair dummy;
dummy.~MarkTypePair();
s0i.construct(&dummy, 2, 2);
if(dummy.first.construction_type != ConstructibleStdPrefix ||
dummy.second.construction_type != ConstructibleStdPrefix ||
dummy.first.value != 2 ||
dummy.second.value != 2 ){
dummy.~MarkTypePair();
return 1;
}
dummy.~MarkTypePair();
}
//Check construction with pair copy construction
{
typedef ::mark_on_scoped_allocation<NotUsesAllocator, 0> MarkType;
@@ -1309,6 +1493,21 @@ int main()
}
dummy.~MarkTypePair();
}
{
typedef ::mark_on_scoped_allocation<ConstructibleStdPrefix, 0> MarkType;
typedef pair<MarkType, MarkType> MarkTypePair;
MarkTypePair dummy, dummy2(2, 2);
dummy.~MarkTypePair();
s0i.construct(&dummy, dummy2);
if(dummy.first.construction_type != ConstructibleStdPrefix ||
dummy.second.construction_type != ConstructibleStdPrefix ||
dummy.first.value != 2 ||
dummy.second.value != 2 ){
dummy.~MarkTypePair();
return 1;
}
dummy.~MarkTypePair();
}
//Check construction with pair move construction
{
typedef ::mark_on_scoped_allocation<NotUsesAllocator, 0> MarkType;
@@ -1368,6 +1567,25 @@ int main()
}
dummy.~MarkTypePair();
}
{
typedef ::mark_on_scoped_allocation<ConstructibleStdPrefix, 0> MarkType;
typedef pair<MarkType, MarkType> MarkTypePair;
MarkTypePair dummy, dummy2(2, 2);
dummy.~MarkTypePair();
s0i.construct(&dummy, ::boost::move(dummy2));
if(dummy.first.construction_type != ConstructibleStdPrefix ||
dummy.second.construction_type != ConstructibleStdPrefix ||
dummy.first.value != 2 ||
dummy.second.value != 2 ||
dummy2.first.construction_type != ConstructibleStdPrefix ||
dummy2.second.construction_type != ConstructibleStdPrefix ||
dummy2.first.value != 0 ||
dummy2.second.value != 0 ){
dummy2.~MarkTypePair();
return 1;
}
dummy.~MarkTypePair();
}
//Check construction with related pair copy construction
{
typedef ::mark_on_scoped_allocation<NotUsesAllocator, 0> MarkType;
@@ -1417,6 +1635,22 @@ int main()
}
dummy.~MarkTypePair();
}
{
typedef ::mark_on_scoped_allocation<ConstructibleStdPrefix, 0> MarkType;
typedef pair<MarkType, MarkType> MarkTypePair;
MarkTypePair dummy;
pair<int, int> dummy2(2, 2);
dummy.~MarkTypePair();
s0i.construct(&dummy, dummy2);
if(dummy.first.construction_type != ConstructibleStdPrefix ||
dummy.second.construction_type != ConstructibleStdPrefix ||
dummy.first.value != 2 ||
dummy.second.value != 2 ){
dummy.~MarkTypePair();
return 1;
}
dummy.~MarkTypePair();
}
//Check construction with related pair move construction
{
typedef ::mark_on_scoped_allocation<NotUsesAllocator, 0> MarkType;
@@ -1466,6 +1700,22 @@ int main()
}
dummy.~MarkTypePair();
}
{
typedef ::mark_on_scoped_allocation<ConstructibleStdPrefix, 0> MarkType;
typedef pair<MarkType, MarkType> MarkTypePair;
MarkTypePair dummy;
pair<int, int> dummy2(2, 2);
dummy.~MarkTypePair();
s0i.construct(&dummy, ::boost::move(dummy2));
if(dummy.first.construction_type != ConstructibleStdPrefix ||
dummy.second.construction_type != ConstructibleStdPrefix ||
dummy.first.value != 2 ||
dummy.second.value != 2 ){
dummy.~MarkTypePair();
return 1;
}
dummy.~MarkTypePair();
}
}
}