boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-31 11:57:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Unordered: allocator_helpers cleanup.

Browse Source 
[SVN r78370]
This commit is contained in:
Daniel James
2012-05-07 18:10:27 +00:00
parent 39aed02e32
commit 6604abe600
1 changed files with 218 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

224
include/boost/unordered/detail/allocator_helpers.hpp
View File

@ -19,8 +19,15 @@
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include <boost/utility/addressof.hpp> #include <boost/utility/addressof.hpp>
#if !defined(BOOST_UNORDERED_USE_ALLOCATOR_TRAITS) ////////////////////////////////////////////////////////////////////////////////
//
// Pick which version of allocator_traits to use
//
// 0 = Own partial implementation
// 1 = std::allocator_traits
// 2 = boost::container::allocator_traits
#if !defined(BOOST_UNORDERED_USE_ALLOCATOR_TRAITS)
# if defined(__GXX_EXPERIMENTAL_CXX0X__) && \ # if defined(__GXX_EXPERIMENTAL_CXX0X__) && \
(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
# define BOOST_UNORDERED_USE_ALLOCATOR_TRAITS 1 # define BOOST_UNORDERED_USE_ALLOCATOR_TRAITS 1
@ -39,24 +46,15 @@
# define BOOST_UNORDERED_USE_ALLOCATOR_TRAITS 0 # define BOOST_UNORDERED_USE_ALLOCATOR_TRAITS 0
#endif #endif
#if BOOST_UNORDERED_USE_ALLOCATOR_TRAITS == 0 ////////////////////////////////////////////////////////////////////////////////
# include <boost/limits.hpp> //
# include <boost/utility/enable_if.hpp> // Some utilities for implementing allocator_traits, but useful elsewhere so
# include <boost/pointer_to_other.hpp> // they're always defined.
# if defined(BOOST_NO_SFINAE_EXPR)
# include <boost/type_traits/is_same.hpp>
# endif
#elif BOOST_UNORDERED_USE_ALLOCATOR_TRAITS == 1
# include <memory>
#elif BOOST_UNORDERED_USE_ALLOCATOR_TRAITS == 2
# include <boost/container/allocator_traits.hpp>
#endif
#if !defined(BOOST_NO_0X_HDR_TYPE_TRAITS) #if !defined(BOOST_NO_0X_HDR_TYPE_TRAITS)
# include <type_traits> # include <type_traits>
#endif #endif
namespace boost { namespace unordered { namespace detail { namespace boost { namespace unordered { namespace detail {
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@ -99,6 +97,13 @@ namespace boost { namespace unordered { namespace detail {
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Expression test mechanism // Expression test mechanism
//
// When SFINAE expressions are available, define
// BOOST_UNORDERED_HAS_FUNCTION which can check if a function call is
// supported by a class, otherwise define BOOST_UNORDERED_HAS_MEMBER which
// can detect if a class has the specified member, but not that it has the
// correct type, this is good enough for a passable impression of
// allocator_traits.
#if !defined(BOOST_NO_SFINAE_EXPR) #if !defined(BOOST_NO_SFINAE_EXPR)
@ -172,38 +177,22 @@ namespace boost { namespace unordered { namespace detail {
#endif #endif
//////////////////////////////////////////////////////////////////////////// }}}
////////////////////////////////////////////////////////////////////////////////
//
// Allocator traits // Allocator traits
//
// First our implementation, then later light wrappers around the alternatives
#if BOOST_UNORDERED_USE_ALLOCATOR_TRAITS == 1 #if BOOST_UNORDERED_USE_ALLOCATOR_TRAITS == 0
#define BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT 1 # include <boost/limits.hpp>
# include <boost/utility/enable_if.hpp>
template <typename Alloc> # include <boost/pointer_to_other.hpp>
struct allocator_traits : std::allocator_traits<Alloc> {}; # if defined(BOOST_NO_SFINAE_EXPR)
# include <boost/type_traits/is_same.hpp>
template <typename Alloc, typename T> # endif
struct rebind_wrap
{
typedef typename std::allocator_traits<Alloc>::
template rebind_alloc<T> type;
};
#elif BOOST_UNORDERED_USE_ALLOCATOR_TRAITS == 2
#define BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT 0
template <typename Alloc>
struct allocator_traits :
boost::container::allocator_traits<Alloc> {};
template <typename Alloc, typename T>
struct rebind_wrap :
boost::container::allocator_traits<Alloc>::
template portable_rebind_alloc<T>
{};
#else
# if defined(BOOST_UNORDERED_VARIADIC_MOVE) && \ # if defined(BOOST_UNORDERED_VARIADIC_MOVE) && \
!defined(BOOST_NO_SFINAE_EXPR) !defined(BOOST_NO_SFINAE_EXPR)
@ -212,12 +201,13 @@ namespace boost { namespace unordered { namespace detail {
# define BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT 0 # define BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT 0
# endif # endif
namespace boost { namespace unordered { namespace detail {
// TODO: Does this match std::allocator_traits<Alloc>::rebind_alloc<T>? // TODO: Does this match std::allocator_traits<Alloc>::rebind_alloc<T>?
template <typename Alloc, typename T> template <typename Alloc, typename T>
struct rebind_wrap struct rebind_wrap
{ {
typedef typename Alloc::BOOST_NESTED_TEMPLATE rebind<T>::other typedef typename Alloc::BOOST_NESTED_TEMPLATE rebind<T>::other type;
type;
}; };
# if defined(BOOST_MSVC) && BOOST_MSVC <= 1400 # if defined(BOOST_MSVC) && BOOST_MSVC <= 1400
@ -283,6 +273,7 @@ namespace boost { namespace unordered { namespace detail {
BOOST_UNORDERED_DEFAULT_TYPE_TMPLT(propagate_on_container_swap); BOOST_UNORDERED_DEFAULT_TYPE_TMPLT(propagate_on_container_swap);
# if !defined(BOOST_NO_SFINAE_EXPR) # if !defined(BOOST_NO_SFINAE_EXPR)
template <typename T> template <typename T>
BOOST_UNORDERED_HAS_FUNCTION( BOOST_UNORDERED_HAS_FUNCTION(
select_on_container_copy_construction, U const, (), 0 select_on_container_copy_construction, U const, (), 0
@ -294,26 +285,32 @@ namespace boost { namespace unordered { namespace detail {
); );
# if defined(BOOST_UNORDERED_VARIADIC_MOVE) # if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template <typename T, typename ValueType, typename... Args> template <typename T, typename ValueType, typename... Args>
BOOST_UNORDERED_HAS_FUNCTION( BOOST_UNORDERED_HAS_FUNCTION(
construct, U, ( construct, U, (
boost::unordered::detail::make<ValueType*>(), boost::unordered::detail::make<ValueType*>(),
boost::unordered::detail::make<Args const>()...), 2 boost::unordered::detail::make<Args const>()...), 2
); );
# else # else
template <typename T, typename ValueType> template <typename T, typename ValueType>
BOOST_UNORDERED_HAS_FUNCTION( BOOST_UNORDERED_HAS_FUNCTION(
construct, U, ( construct, U, (
boost::unordered::detail::make<ValueType*>(), boost::unordered::detail::make<ValueType*>(),
boost::unordered::detail::make<ValueType const>()), 2 boost::unordered::detail::make<ValueType const>()), 2
); );
# endif # endif
template <typename T, typename ValueType> template <typename T, typename ValueType>
BOOST_UNORDERED_HAS_FUNCTION( BOOST_UNORDERED_HAS_FUNCTION(
destroy, U, (boost::unordered::detail::make<ValueType*>()), 1 destroy, U, (boost::unordered::detail::make<ValueType*>()), 1
); );
# else # else
template <typename T> template <typename T>
BOOST_UNORDERED_HAS_MEMBER(select_on_container_copy_construction); BOOST_UNORDERED_HAS_MEMBER(select_on_container_copy_construction);
@ -325,6 +322,7 @@ namespace boost { namespace unordered { namespace detail {
template <typename T, typename ValueType> template <typename T, typename ValueType>
BOOST_UNORDERED_HAS_MEMBER(destroy); BOOST_UNORDERED_HAS_MEMBER(destroy);
# endif # endif
template <typename Alloc> template <typename Alloc>
@ -427,6 +425,22 @@ namespace boost { namespace unordered { namespace detail {
new ((void*) p) T(boost::forward<Args>(x)...); new ((void*) p) T(boost::forward<Args>(x)...);
} }
template <typename T>
static typename boost::enable_if_c<
boost::unordered::detail::has_destroy<Alloc, T>::value>::type
destroy(Alloc& a, T* p)
{
a.destroy(p);
}
template <typename T>
static typename boost::disable_if_c<
boost::unordered::detail::has_destroy<Alloc, T>::value>::type
destroy(Alloc&, T* p)
{
boost::unordered::detail::destroy(p);
}
# elif !defined(BOOST_NO_SFINAE_EXPR) # elif !defined(BOOST_NO_SFINAE_EXPR)
template <typename T> template <typename T>
@ -445,31 +459,6 @@ namespace boost { namespace unordered { namespace detail {
new ((void*) p) T(x); new ((void*) p) T(x);
} }
#else
// If we don't have SFINAE expressions, only construct the type
// that matches the allocator.
template <typename T>
static typename boost::enable_if_c<
boost::unordered::detail::has_construct<Alloc, T>::value &&
boost::is_same<T, value_type>::value
>::type
construct(Alloc& a, T* p, T const& x)
{
a.construct(p, x);
}
template <typename T>
static typename boost::disable_if_c<
boost::unordered::detail::has_construct<Alloc, T>::value &&
boost::is_same<T, value_type>::value
>::type
construct(Alloc&, T* p, T const& x)
{
new ((void*) p) T(x);
}
# endif # endif
# if BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT # if BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT
@ -490,26 +479,31 @@ namespace boost { namespace unordered { namespace detail {
boost::unordered::detail::destroy(p); boost::unordered::detail::destroy(p);
} }
#elif !defined(BOOST_NO_SFINAE_EXPR) # else
// If we don't have SFINAE expressions, only call construct the type
// that matches the allocator.
template <typename T> template <typename T>
static typename boost::enable_if_c< static typename boost::enable_if_c<
boost::unordered::detail::has_destroy<Alloc, T>::value>::type boost::unordered::detail::has_construct<Alloc, T>::value &&
destroy(Alloc& a, T* p) boost::is_same<T, value_type>::value
>::type
construct(Alloc& a, T* p, T const& x)
{ {
a.destroy(p); a.construct(p, x);
} }
template <typename T> template <typename T>
static typename boost::disable_if_c< static typename boost::disable_if_c<
boost::unordered::detail::has_destroy<Alloc, T>::value>::type boost::unordered::detail::has_construct<Alloc, T>::value &&
destroy(Alloc&, T* p) boost::is_same<T, value_type>::value
>::type
construct(Alloc&, T* p, T const& x)
{ {
boost::unordered::detail::destroy(p); new ((void*) p) T(x);
} }
#else
template <typename T> template <typename T>
static typename boost::enable_if_c< static typename boost::enable_if_c<
boost::unordered::detail::has_destroy<Alloc, T>::value && boost::unordered::detail::has_destroy<Alloc, T>::value &&
@ -557,13 +551,78 @@ namespace boost { namespace unordered { namespace detail {
Alloc,propagate_on_container_swap,false_type) Alloc,propagate_on_container_swap,false_type)
propagate_on_container_swap; propagate_on_container_swap;
}; };
}}}
# undef BOOST_UNORDERED_DEFAULT_TYPE_TMPLT # undef BOOST_UNORDERED_DEFAULT_TYPE_TMPLT
# undef BOOST_UNORDERED_DEFAULT_TYPE # undef BOOST_UNORDERED_DEFAULT_TYPE
////////////////////////////////////////////////////////////////////////////////
//
// std::allocator_traits
#elif BOOST_UNORDERED_USE_ALLOCATOR_TRAITS == 1
# include <memory>
# define BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT 1
namespace boost { namespace unordered { namespace detail {
template <typename Alloc>
struct allocator_traits : std::allocator_traits<Alloc> {};
template <typename Alloc, typename T>
struct rebind_wrap
{
typedef typename std::allocator_traits<Alloc>::
template rebind_alloc<T> type;
};
}}}
////////////////////////////////////////////////////////////////////////////////
//
// boost::container::allocator_traits
#elif BOOST_UNORDERED_USE_ALLOCATOR_TRAITS == 2
# include <boost/container/allocator_traits.hpp>
# define BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT 0
namespace boost { namespace unordered { namespace detail {
template <typename Alloc>
struct allocator_traits :
boost::container::allocator_traits<Alloc> {};
template <typename Alloc, typename T>
struct rebind_wrap :
boost::container::allocator_traits<Alloc>::
template portable_rebind_alloc<T>
{};
}}}
#else
#error "Invalid BOOST_UNORDERED_USE_ALLOCATOR_TRAITS value."
#endif #endif
////////////////////////////////////////////////////////////////////////////////
//
// Some helper functions for allocating & constructing
namespace boost { namespace unordered { namespace detail {
////////////////////////////////////////////////////////////////////////////
//
// construct_node/destroy_node
//
// Construct a node using the best available method.
#if BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT #if BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT
template <typename Alloc, typename T, BOOST_UNORDERED_EMPLACE_TEMPLATE> template <typename Alloc, typename T, BOOST_UNORDERED_EMPLACE_TEMPLATE>
inline void construct_node(Alloc& a, T* p, BOOST_UNORDERED_EMPLACE_ARGS) inline void construct_node(Alloc& a, T* p, BOOST_UNORDERED_EMPLACE_ARGS)
{ {
@ -576,7 +635,9 @@ namespace boost { namespace unordered { namespace detail {
{ {
boost::unordered::detail::allocator_traits<Alloc>::destroy(a, p); boost::unordered::detail::allocator_traits<Alloc>::destroy(a, p);
} }
#else #else
template <typename Alloc, typename T, BOOST_UNORDERED_EMPLACE_TEMPLATE> template <typename Alloc, typename T, BOOST_UNORDERED_EMPLACE_TEMPLATE>
inline void construct_node(Alloc& a, T* p, BOOST_UNORDERED_EMPLACE_ARGS) inline void construct_node(Alloc& a, T* p, BOOST_UNORDERED_EMPLACE_ARGS)
{ {
@ -596,8 +657,11 @@ namespace boost { namespace unordered { namespace detail {
boost::unordered::detail::destroy(p->value_ptr()); boost::unordered::detail::destroy(p->value_ptr());
boost::unordered::detail::allocator_traits<Alloc>::destroy(a, p); boost::unordered::detail::allocator_traits<Alloc>::destroy(a, p);
} }
#endif #endif
////////////////////////////////////////////////////////////////////////////
//
// array_constructor // array_constructor
// //
// Allocate and construct an array in an exception safe manner, and // Allocate and construct an array in an exception safe manner, and
@ -653,7 +717,9 @@ namespace boost { namespace unordered { namespace detail {
ptr_ = pointer(); ptr_ = pointer();
return p; return p;
} }
private: private:
array_constructor(array_constructor const&); array_constructor(array_constructor const&);
array_constructor& operator=(array_constructor const&); array_constructor& operator=(array_constructor const&);
}; };