feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Unordered: Rejig some of the emplace_args macro code. Refs #6784

Browse Source 
This is a bit cleaner and will hopefully fix the Sun problems.

[SVN r77972]
This commit is contained in:
Daniel James
2012-04-14 17:32:28 +00:00
parent 030fd55d02
commit d5230a874b
1 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
include/boost/unordered/detail/emplace_args.hpp
View File

@ -160,9 +160,9 @@ BOOST_PP_REPEAT_FROM_TO(1, BOOST_UNORDERED_EMPLACE_LIMIT, BOOST_UNORDERED_EARGS,
// //
// Used for piecewise construction. // Used for piecewise construction.
#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x590) #if !defined(__SUNPRO_CC)
#define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(n, namespace_) \ # define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(n, namespace_) \
template<typename T> \ template<typename T> \
void construct_from_tuple(T* ptr, namespace_::tuple<>) \ void construct_from_tuple(T* ptr, namespace_::tuple<>) \
{ \ { \
@ -172,7 +172,7 @@ BOOST_PP_REPEAT_FROM_TO(1, BOOST_UNORDERED_EMPLACE_LIMIT, BOOST_UNORDERED_EARGS,
BOOST_PP_REPEAT_FROM_TO(1, n, \ BOOST_PP_REPEAT_FROM_TO(1, n, \
BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL, namespace_) BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL, namespace_)
#define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL(z, n, namespace_) \ # define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL(z, n, namespace_) \
template<typename T, BOOST_PP_ENUM_PARAMS_Z(z, n, typename A)> \ template<typename T, BOOST_PP_ENUM_PARAMS_Z(z, n, typename A)> \
void construct_from_tuple(T* ptr, \ void construct_from_tuple(T* ptr, \
namespace_::tuple<BOOST_PP_ENUM_PARAMS_Z(z, n, A)> const& x) \ namespace_::tuple<BOOST_PP_ENUM_PARAMS_Z(z, n, A)> const& x) \
@ -182,32 +182,26 @@ BOOST_PP_REPEAT_FROM_TO(1, BOOST_UNORDERED_EMPLACE_LIMIT, BOOST_UNORDERED_EARGS,
); \ ); \
} }
#define BOOST_UNORDERED_GET_TUPLE_ARG(z, n, namespace_) \ # define BOOST_UNORDERED_GET_TUPLE_ARG(z, n, namespace_) \
namespace_::get<n>(x) namespace_::get<n>(x)
BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, boost)
#if !defined(BOOST_NO_0X_HDR_TUPLE)
BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std)
#endif
#undef BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE
#undef BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL
#undef BOOST_UNORDERED_GET_TUPLE_ARG
#else #else
template <int N> struct length {}; template <int N> struct length {};
template<typename T> # define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(n, namespace_) \
void construct_from_tuple_impl( template<typename T> \
boost::unordered::detail::length<0>, T* ptr, void construct_from_tuple_impl( \
boost::tuple<>) boost::unordered::detail::length<0>, T* ptr, \
{ namespace_::tuple<>) \
new ((void*) ptr) T(); { \
} new ((void*) ptr) T(); \
} \
\
BOOST_PP_REPEAT_FROM_TO(1, n, \
BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL, namespace_)
#define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL(z, n, _) \ # define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL(z, n, namespace_) \
template<typename T, BOOST_PP_ENUM_PARAMS_Z(z, n, typename A)> \ template<typename T, BOOST_PP_ENUM_PARAMS_Z(z, n, typename A)> \
void construct_from_tuple_impl( \ void construct_from_tuple_impl( \
boost::unordered::detail::length<n>, T* ptr, \ boost::unordered::detail::length<n>, T* ptr, \
@ -218,11 +212,22 @@ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std)
); \ ); \
} }
#define BOOST_UNORDERED_GET_TUPLE_ARG(z, n, _) \ # define BOOST_UNORDERED_GET_TUPLE_ARG(z, n, namespace_) \
boost::get<n>(x) namespace_::get<n>(x)
BOOST_PP_REPEAT_FROM_TO(1, 10, \ #endif
BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL, _)
BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, boost)
#if !defined(__SUNPRO_CC) && !defined(BOOST_NO_0X_HDR_TUPLE)
BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std)
#endif
#undef BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE
#undef BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL
#undef BOOST_UNORDERED_GET_TUPLE_ARG
#if defined(__SUNPRO_CC)
template <typename T, typename Tuple> template <typename T, typename Tuple>
void construct_from_tuple(T* ptr, Tuple const& x) void construct_from_tuple(T* ptr, Tuple const& x)
@ -233,9 +238,6 @@ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std)
ptr, x); ptr, x);
} }
#undef BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL
#undef BOOST_UNORDERED_GET_TUPLE_ARG
#endif #endif
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////