boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-03 14:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Typedef'ed allocator_arg_t as "const std::allocator_arg_t &" to improve interoperability between C++11 allocator-aware types.

Browse Source
This commit is contained in:
Ion Gaztañaga
2015-01-17 19:11:52 +01:00
parent 37db43b697
commit 7635eba375
4 changed files with 28 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/boost/container/detail/std_allocator_arg.hpp
View File

@@ -1,33 +0,0 @@
#ifndef BOOST_CONTAINER_DETAIL_ALLOCATOR_ARG_HPP
#define BOOST_CONTAINER_DETAIL_ALLOCATOR_ARG_HPP
///////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Ion Gaztanaga 2014-2015. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
// See http://www.boost.org/libs/container for documentation.
//
///////////////////////////////////////////////////////////////////////////////
#if defined(BOOST_HAS_PRAGMA_ONCE)
# pragma once
#endif
#include <boost/container/detail/std_fwd.hpp>
namespace boost { namespace container {
template<int Dummy = 0>
struct alloc_arg
{
static const std::allocator_arg_t &get() { return *palloc_arg; }
static std::allocator_arg_t *palloc_arg;
};
template<int Dummy>
std::allocator_arg_t *alloc_arg<Dummy>::palloc_arg;
}} //namespace boost { namespace container {
#endif //BOOST_CONTAINER_DETAIL_ALLOCATOR_ARG_HPP

60
include/boost/container/scoped_allocator.hpp
View File

@@ -31,7 +31,6 @@
#include <boost/container/detail/mpl.hpp> #include <boost/container/detail/mpl.hpp>
#include <boost/container/detail/pair.hpp> #include <boost/container/detail/pair.hpp>
#include <boost/container/detail/type_traits.hpp> #include <boost/container/detail/type_traits.hpp>
#include <boost/container/detail/std_allocator_arg.hpp>
#include <boost/move/adl_move_swap.hpp> #include <boost/move/adl_move_swap.hpp>
#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) #if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
@@ -136,10 +135,6 @@ template <class T>
struct constructible_with_allocator_prefix struct constructible_with_allocator_prefix
{ static const bool value = false; }; { static const bool value = false; };
template <class T>
struct constructible_with_std_allocator_prefix
{ static const bool value = false; };
#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
namespace container_detail { namespace container_detail {
@@ -297,11 +292,6 @@ namespace container_detail {
: is_constructible<T, allocator_arg_t, InnerAlloc, Args...> : is_constructible<T, allocator_arg_t, InnerAlloc, Args...>
{}; {};
template <class T, class InnerAlloc, class ...Args>
struct is_constructible_with_std_allocator_prefix
: is_constructible<T, const std::allocator_arg_t&, InnerAlloc, Args...>
{};
#else // #if !defined(BOOST_NO_SFINAE_EXPR) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) #else // #if !defined(BOOST_NO_SFINAE_EXPR) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
//Without advanced SFINAE expressions, we can't use is_constructible //Without advanced SFINAE expressions, we can't use is_constructible
@@ -314,11 +304,6 @@ namespace container_detail {
: constructible_with_allocator_prefix<T> : constructible_with_allocator_prefix<T>
{}; {};
template <class T, class InnerAlloc, class ...Args>
struct is_constructible_with_std_allocator_prefix
: constructible_with_std_allocator_prefix<T>
{};
template <class T, class InnerAlloc, class ...Args> template <class T, class InnerAlloc, class ...Args>
struct is_constructible_with_allocator_suffix struct is_constructible_with_allocator_suffix
: constructible_with_allocator_suffix<T> : constructible_with_allocator_suffix<T>
@@ -331,11 +316,6 @@ namespace container_detail {
: constructible_with_allocator_prefix<T> : constructible_with_allocator_prefix<T>
{}; {};
template <class T, class InnerAlloc, BOOST_MOVE_CLASSDFLT9>
struct is_constructible_with_std_allocator_prefix
: constructible_with_std_allocator_prefix<T>
{};
template <class T, class InnerAlloc, BOOST_MOVE_CLASSDFLT9> template <class T, class InnerAlloc, BOOST_MOVE_CLASSDFLT9>
struct is_constructible_with_allocator_suffix struct is_constructible_with_allocator_suffix
: constructible_with_allocator_suffix<T> : constructible_with_allocator_suffix<T>
@@ -354,27 +334,14 @@ template < typename OutermostAlloc
, class ...Args , class ...Args
> >
inline void dispatch_allocator_prefix_suffix inline void dispatch_allocator_prefix_suffix
( unsigned_<1> use_alloc_prefix, OutermostAlloc& outermost_alloc ( true_type use_alloc_prefix, OutermostAlloc& outermost_alloc
, InnerAlloc& inner_alloc, T* p, BOOST_FWD_REF(Args) ...args) , InnerAlloc& inner_alloc, T* p, BOOST_FWD_REF(Args) ...args)
{ {
(void)use_alloc_prefix; (void)use_alloc_prefix;
allocator_traits<OutermostAlloc>::construct allocator_traits<OutermostAlloc>::construct
( outermost_alloc, p, allocator_arg, inner_alloc, ::boost::forward<Args>(args)...); ( outermost_alloc, p, allocator_arg, inner_alloc, ::boost::forward<Args>(args)...);
} }
// std::allocator_arg_t
template < typename OutermostAlloc
, typename InnerAlloc
, typename T
, class ...Args
>
inline void dispatch_allocator_prefix_suffix
( unsigned_<2> use_alloc_prefix, OutermostAlloc& outermost_alloc
, InnerAlloc &inner_alloc, T* p, BOOST_FWD_REF(Args)...args)
{
(void)use_alloc_prefix;
allocator_traits<OutermostAlloc>::construct
( outermost_alloc, p, alloc_arg<>::get(), inner_alloc, ::boost::forward<Args>(args)...);
}
// allocator suffix // allocator suffix
template < typename OutermostAlloc template < typename OutermostAlloc
, typename InnerAlloc , typename InnerAlloc
@@ -382,7 +349,7 @@ template < typename OutermostAlloc
, class ...Args , class ...Args
> >
inline void dispatch_allocator_prefix_suffix inline void dispatch_allocator_prefix_suffix
( unsigned_<0> use_alloc_prefix, OutermostAlloc& outermost_alloc ( false_type use_alloc_prefix, OutermostAlloc& outermost_alloc
, InnerAlloc &inner_alloc, T* p, BOOST_FWD_REF(Args)...args) , InnerAlloc &inner_alloc, T* p, BOOST_FWD_REF(Args)...args)
{ {
(void)use_alloc_prefix; (void)use_alloc_prefix;
@@ -403,8 +370,7 @@ inline void dispatch_uses_allocator
//BOOST_STATIC_ASSERT((is_constructible_with_allocator_prefix<T, InnerAlloc, Args...>::value || //BOOST_STATIC_ASSERT((is_constructible_with_allocator_prefix<T, InnerAlloc, Args...>::value ||
// is_constructible_with_allocator_suffix<T, InnerAlloc, Args...>::value )); // is_constructible_with_allocator_suffix<T, InnerAlloc, Args...>::value ));
dispatch_allocator_prefix_suffix dispatch_allocator_prefix_suffix
( unsigned_< is_constructible_with_allocator_prefix<T, InnerAlloc, Args...>::value ? 1u : ( bool_< is_constructible_with_allocator_prefix<T, InnerAlloc, Args...>::value>()
(is_constructible_with_std_allocator_prefix<T, InnerAlloc, Args...>::value ? 2u : 0u) >()
, outermost_alloc, inner_alloc, p, ::boost::forward<Args>(args)...); , outermost_alloc, inner_alloc, p, ::boost::forward<Args>(args)...);
} }
@@ -429,7 +395,7 @@ inline void dispatch_uses_allocator
template < typename OutermostAlloc, typename InnerAlloc, typename T\ template < typename OutermostAlloc, typename InnerAlloc, typename T\
BOOST_MOVE_I##N BOOST_MOVE_CLASS##N > \ BOOST_MOVE_I##N BOOST_MOVE_CLASS##N > \
inline void dispatch_allocator_prefix_suffix\ inline void dispatch_allocator_prefix_suffix\
(unsigned_<1u> use_alloc_prefix, OutermostAlloc& outermost_alloc,\ (true_type use_alloc_prefix, OutermostAlloc& outermost_alloc,\
InnerAlloc& inner_alloc, T* p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ InnerAlloc& inner_alloc, T* p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
{\ {\
(void)use_alloc_prefix,\ (void)use_alloc_prefix,\
@@ -437,21 +403,10 @@ inline void dispatch_allocator_prefix_suffix\
(outermost_alloc, p, allocator_arg, inner_alloc BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\ (outermost_alloc, p, allocator_arg, inner_alloc BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
}\ }\
\ \
template < typename OutermostAlloc, typename InnerAlloc, typename T\
BOOST_MOVE_I##N BOOST_MOVE_CLASS##N > \
inline void dispatch_allocator_prefix_suffix\
(unsigned_<2u> use_alloc_prefix, OutermostAlloc& outermost_alloc,\
InnerAlloc& inner_alloc, T* p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
{\
(void)use_alloc_prefix,\
allocator_traits<OutermostAlloc>::construct\
(outermost_alloc, p, alloc_arg<>::get(), inner_alloc BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
}\
\
template < typename OutermostAlloc, typename InnerAlloc, typename T\ template < typename OutermostAlloc, typename InnerAlloc, typename T\
BOOST_MOVE_I##N BOOST_MOVE_CLASS##N >\ BOOST_MOVE_I##N BOOST_MOVE_CLASS##N >\
inline void dispatch_allocator_prefix_suffix\ inline void dispatch_allocator_prefix_suffix\
(unsigned_<0u> use_alloc_prefix, OutermostAlloc& outermost_alloc,\ (false_type use_alloc_prefix, OutermostAlloc& outermost_alloc,\
InnerAlloc& inner_alloc, T* p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\ InnerAlloc& inner_alloc, T* p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
{\ {\
(void)use_alloc_prefix;\ (void)use_alloc_prefix;\
@@ -467,8 +422,7 @@ inline void dispatch_uses_allocator\
{\ {\
(void)uses_allocator;\ (void)uses_allocator;\
dispatch_allocator_prefix_suffix\ dispatch_allocator_prefix_suffix\
( unsigned_< is_constructible_with_allocator_prefix<T, InnerAlloc BOOST_MOVE_I##N BOOST_MOVE_TARG##N>::value ? 1u :\ ( bool_< is_constructible_with_allocator_prefix<T, InnerAlloc BOOST_MOVE_I##N BOOST_MOVE_TARG##N>::value >()\
(is_constructible_with_std_allocator_prefix<T, InnerAlloc BOOST_MOVE_I##N BOOST_MOVE_TARG##N>::value ? 2u : 0u) >()\
, outermost_alloc, inner_alloc, p BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\ , outermost_alloc, inner_alloc, p BOOST_MOVE_I##N BOOST_MOVE_FWD##N);\
}\ }\
\ \

23
include/boost/container/scoped_allocator_fwd.hpp
View File

@@ -48,25 +48,35 @@ namespace boost { namespace container {
#endif // #if !defined(BOOST_CONTAINER_UNIMPLEMENTED_PACK_EXPANSION_TO_FIXED_LIST) #endif // #if !defined(BOOST_CONTAINER_UNIMPLEMENTED_PACK_EXPANSION_TO_FIXED_LIST)
#else // #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) #else // #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <typename OuterAlloc, BOOST_MOVE_CLASSDFLT9> template <typename OuterAlloc, BOOST_MOVE_CLASSDFLT9>
class scoped_allocator_adaptor; class scoped_allocator_adaptor;
#endif #endif
template <int Dummy = 0>
struct std_allocator_arg_holder
{
static ::std::allocator_arg_t *dummy;
};
template <int Dummy>
::std::allocator_arg_t *std_allocator_arg_holder<Dummy>::dummy;
#else //BOOST_CONTAINER_DOXYGEN_INVOKED
#endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED #endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
//! The allocator_arg_t struct is an empty structure type used as a unique type to //! The allocator_arg_t struct is an empty structure type used as a unique type to
//! disambiguate constructor and function overloading. Specifically, several types //! disambiguate constructor and function overloading. Specifically, several types
//! have constructors with allocator_arg_t as the first argument, immediately followed //! have constructors with allocator_arg_t as the first argument, immediately followed
//! by an argument of a type that satisfies Allocator requirements //! by an argument of a type that satisfies Allocator requirements
struct allocator_arg_t{}; typedef const std::allocator_arg_t & allocator_arg_t;
//! A instance of type allocator_arg_t //! A instance of type allocator_arg_t
//! //!
static const allocator_arg_t allocator_arg = allocator_arg_t(); static allocator_arg_t allocator_arg = BOOST_CONTAINER_DOC1ST(unspecified, *std_allocator_arg_holder<>::dummy);
template <class T> template <class T>
struct constructible_with_allocator_suffix; struct constructible_with_allocator_suffix;
@@ -74,9 +84,6 @@ struct constructible_with_allocator_suffix;
template <class T> template <class T>
struct constructible_with_allocator_prefix; struct constructible_with_allocator_prefix;
template <class T>
struct constructible_with_std_allocator_prefix;
template <typename T, typename Allocator> template <typename T, typename Allocator>
struct uses_allocator; struct uses_allocator;

246
test/scoped_allocator_adaptor_test.cpp
View File

@@ -117,7 +117,6 @@ struct mark_on_destructor
enum ConstructionTypeEnum enum ConstructionTypeEnum
{ {
ConstructiblePrefix, ConstructiblePrefix,
ConstructibleStdPrefix,
ConstructibleSuffix, ConstructibleSuffix,
NotUsesAllocator NotUsesAllocator
}; };
@@ -138,8 +137,6 @@ struct uses_allocator_base<ConstructibleSuffix, AllocatorTag>
typedef allocator_type allocator_constructor_type; typedef allocator_type allocator_constructor_type;
struct nat{}; struct nat{};
typedef nat allocator_arg_type; typedef nat allocator_arg_type;
struct nat2{};
typedef nat2 std_allocator_arg_type;
}; };
template<unsigned int AllocatorTag> template<unsigned int AllocatorTag>
@@ -148,18 +145,6 @@ struct uses_allocator_base<ConstructiblePrefix, AllocatorTag>
typedef test_allocator<int, AllocatorTag> allocator_type; typedef test_allocator<int, AllocatorTag> allocator_type;
typedef allocator_type allocator_constructor_type; typedef allocator_type allocator_constructor_type;
typedef allocator_arg_t allocator_arg_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> template<unsigned int AllocatorTag>
@@ -168,8 +153,6 @@ struct uses_allocator_base<NotUsesAllocator, AllocatorTag>
struct nat{}; struct nat{};
typedef nat allocator_constructor_type; typedef nat allocator_constructor_type;
typedef nat allocator_arg_type; typedef nat allocator_arg_type;
struct nat2{};
typedef nat2 std_allocator_arg_type;
}; };
template<ConstructionTypeEnum ConstructionType, unsigned int AllocatorTag> template<ConstructionTypeEnum ConstructionType, unsigned int AllocatorTag>
@@ -198,11 +181,6 @@ struct mark_on_scoped_allocation
: construction_type(ConstructiblePrefix), value(0) : 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 //1 user argument constructors
explicit mark_on_scoped_allocation(int i) explicit mark_on_scoped_allocation(int i)
: construction_type(NotUsesAllocator), value(i) : construction_type(NotUsesAllocator), value(i)
@@ -220,13 +198,6 @@ struct mark_on_scoped_allocation
: construction_type(ConstructiblePrefix), value(i) : 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 //Copy constructors
mark_on_scoped_allocation(const mark_on_scoped_allocation &other) mark_on_scoped_allocation(const mark_on_scoped_allocation &other)
: construction_type(NotUsesAllocator), value(other.value) : construction_type(NotUsesAllocator), value(other.value)
@@ -243,12 +214,6 @@ struct mark_on_scoped_allocation
: construction_type(ConstructiblePrefix), value(other.value) : 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 //Move constructors
mark_on_scoped_allocation(BOOST_RV_REF(mark_on_scoped_allocation) other) mark_on_scoped_allocation(BOOST_RV_REF(mark_on_scoped_allocation) other)
: construction_type(NotUsesAllocator), value(other.value) : construction_type(NotUsesAllocator), value(other.value)
@@ -265,12 +230,6 @@ struct mark_on_scoped_allocation
: construction_type(ConstructiblePrefix), value(other.value) : construction_type(ConstructiblePrefix), value(other.value)
{ other.value = 0; other.construction_type = ConstructiblePrefix; } { 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; ConstructionTypeEnum construction_type;
int value; int value;
}; };
@@ -285,13 +244,6 @@ struct constructible_with_allocator_prefix
static const bool value = true; 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> template<unsigned int AllocatorTag>
struct constructible_with_allocator_suffix struct constructible_with_allocator_suffix
< ::mark_on_scoped_allocation<ConstructibleSuffix, AllocatorTag> > < ::mark_on_scoped_allocation<ConstructibleSuffix, AllocatorTag> >
@@ -819,18 +771,12 @@ int main()
< ::mark_on_scoped_allocation<ConstructiblePrefix, 0> < ::mark_on_scoped_allocation<ConstructiblePrefix, 0>
, test_allocator<float, 0> , test_allocator<float, 0>
>::value )); >::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 BOOST_STATIC_ASSERT(( boost::container::uses_allocator
< ::mark_on_scoped_allocation<ConstructibleSuffix, 0> < ::mark_on_scoped_allocation<ConstructibleSuffix, 0>
, test_allocator<float, 0> , test_allocator<float, 0>
>::value )); >::value ));
BOOST_STATIC_ASSERT(( boost::container::constructible_with_allocator_prefix BOOST_STATIC_ASSERT(( boost::container::constructible_with_allocator_prefix
< ::mark_on_scoped_allocation<ConstructiblePrefix, 0> >::value )); < ::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 BOOST_STATIC_ASSERT(( boost::container::constructible_with_allocator_suffix
< ::mark_on_scoped_allocation<ConstructibleSuffix, 0> >::value )); < ::mark_on_scoped_allocation<ConstructibleSuffix, 0> >::value ));
@@ -878,18 +824,6 @@ int main()
} }
dummy.~MarkType(); 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 //Check construction with 1 user arguments
{ {
@@ -928,18 +862,6 @@ int main()
} }
dummy.~MarkType(); 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. //Then check scoped allocator with OuterAlloc and InnerAlloc.
@@ -985,18 +907,6 @@ int main()
} }
dummy.~MarkType(); 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 //Check construction with 1 user arguments
{ {
@@ -1035,18 +945,6 @@ int main()
} }
dummy.~MarkType(); 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();
}
} }
////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////
@@ -1114,18 +1012,6 @@ int main()
} }
dummy.~MarkType(); 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 //Check construction with 1 user arguments
{ {
@@ -1164,18 +1050,6 @@ int main()
} }
dummy.~MarkType(); 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. //Then check scoped allocator with OuterAlloc and InnerAlloc.
@@ -1245,18 +1119,6 @@ int main()
} }
dummy.~MarkType(); 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 //Check construction with 1 user arguments
{ {
@@ -1295,18 +1157,6 @@ int main()
} }
dummy.~MarkType(); 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();
}
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@@ -1370,21 +1220,6 @@ int main()
} }
dummy.~MarkTypePair(); 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 //Check construction with 1 user arguments for each pair
{ {
@@ -1432,21 +1267,6 @@ int main()
} }
dummy.~MarkTypePair(); 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 //Check construction with pair copy construction
{ {
typedef ::mark_on_scoped_allocation<NotUsesAllocator, 0> MarkType; typedef ::mark_on_scoped_allocation<NotUsesAllocator, 0> MarkType;
@@ -1493,21 +1313,6 @@ int main()
} }
dummy.~MarkTypePair(); 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 //Check construction with pair move construction
{ {
typedef ::mark_on_scoped_allocation<NotUsesAllocator, 0> MarkType; typedef ::mark_on_scoped_allocation<NotUsesAllocator, 0> MarkType;
@@ -1567,25 +1372,6 @@ int main()
} }
dummy.~MarkTypePair(); 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 //Check construction with related pair copy construction
{ {
typedef ::mark_on_scoped_allocation<NotUsesAllocator, 0> MarkType; typedef ::mark_on_scoped_allocation<NotUsesAllocator, 0> MarkType;
@@ -1635,22 +1421,6 @@ int main()
} }
dummy.~MarkTypePair(); 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 //Check construction with related pair move construction
{ {
typedef ::mark_on_scoped_allocation<NotUsesAllocator, 0> MarkType; typedef ::mark_on_scoped_allocation<NotUsesAllocator, 0> MarkType;
@@ -1700,22 +1470,6 @@ int main()
} }
dummy.~MarkTypePair(); 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();
}
} }
} }