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

Remove alloc parameter from construct_value

Browse Source
This commit is contained in:
Daniel James
2017-04-18 10:14:26 +01:00
parent 3414e6628a
commit e0054c7dd0
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/boost/unordered/detail/implementation.hpp
View File

@ -1270,37 +1270,36 @@ namespace func {
#elif !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) #elif !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <typename Alloc, typename T, typename... Args> template <typename T, typename... Args>
inline void construct_value(Alloc&, T* address, BOOST_FWD_REF(Args)... args) inline void construct_value(T* address, BOOST_FWD_REF(Args)... args)
{ {
new ((void*)address) T(boost::forward<Args>(args)...); new ((void*)address) T(boost::forward<Args>(args)...);
} }
#define BOOST_UNORDERED_CALL_CONSTRUCT0(Traits, alloc, address) \ #define BOOST_UNORDERED_CALL_CONSTRUCT0(Traits, alloc, address) \
boost::unordered::detail::func::construct_value(alloc, address) boost::unordered::detail::func::construct_value(address)
#define BOOST_UNORDERED_CALL_CONSTRUCT1(Traits, alloc, address, a0) \ #define BOOST_UNORDERED_CALL_CONSTRUCT1(Traits, alloc, address, a0) \
boost::unordered::detail::func::construct_value(alloc, address, a0) boost::unordered::detail::func::construct_value(address, a0)
#define BOOST_UNORDERED_CALL_DESTROY(Traits, alloc, x) \ #define BOOST_UNORDERED_CALL_DESTROY(Traits, alloc, x) \
boost::unordered::detail::func::destroy(x) boost::unordered::detail::func::destroy(x)
#else #else
template <typename Alloc, typename T> template <typename T> inline void construct_value(T* address)
inline void construct_value(Alloc&, T* address)
{ {
new ((void*)address) T(); new ((void*)address) T();
} }
template <typename Alloc, typename T, typename A0> template <typename T, typename A0>
inline void construct_value(Alloc&, T* address, BOOST_FWD_REF(A0) a0) inline void construct_value(T* address, BOOST_FWD_REF(A0) a0)
{ {
new ((void*)address) T(boost::forward<A0>(a0)); new ((void*)address) T(boost::forward<A0>(a0));
} }
#define BOOST_UNORDERED_CALL_CONSTRUCT0(Traits, alloc, address) \ #define BOOST_UNORDERED_CALL_CONSTRUCT0(Traits, alloc, address) \
boost::unordered::detail::func::construct_value(alloc, address) boost::unordered::detail::func::construct_value(address)
#define BOOST_UNORDERED_CALL_CONSTRUCT1(Traits, alloc, address, a0) \ #define BOOST_UNORDERED_CALL_CONSTRUCT1(Traits, alloc, address, a0) \
boost::unordered::detail::func::construct_value(alloc, address, a0) boost::unordered::detail::func::construct_value(address, a0)
#define BOOST_UNORDERED_CALL_DESTROY(Traits, alloc, x) \ #define BOOST_UNORDERED_CALL_DESTROY(Traits, alloc, x) \
boost::unordered::detail::func::destroy(x) boost::unordered::detail::func::destroy(x)
@ -1796,12 +1795,12 @@ construct_node_pair(Alloc& alloc, BOOST_FWD_REF(Key) k)
{ {
node_constructor<Alloc> a(alloc); node_constructor<Alloc> a(alloc);
a.create_node(); a.create_node();
boost::unordered::detail::func::construct_value(alloc, boost::unordered::detail::func::construct_value(
boost::addressof(a.node_->value_ptr()->first), boost::forward<Key>(k)); boost::addressof(a.node_->value_ptr()->first), boost::forward<Key>(k));
BOOST_TRY BOOST_TRY
{ {
boost::unordered::detail::func::construct_value( boost::unordered::detail::func::construct_value(
alloc, boost::addressof(a.node_->value_ptr()->second)); boost::addressof(a.node_->value_ptr()->second));
} }
BOOST_CATCH(...) BOOST_CATCH(...)
{ {
@ -1819,11 +1818,11 @@ construct_node_pair(Alloc& alloc, BOOST_FWD_REF(Key) k, BOOST_FWD_REF(Mapped) m)
{ {
node_constructor<Alloc> a(alloc); node_constructor<Alloc> a(alloc);
a.create_node(); a.create_node();
boost::unordered::detail::func::construct_value(alloc, boost::unordered::detail::func::construct_value(
boost::addressof(a.node_->value_ptr()->first), boost::forward<Key>(k)); boost::addressof(a.node_->value_ptr()->first), boost::forward<Key>(k));
BOOST_TRY BOOST_TRY
{ {
boost::unordered::detail::func::construct_value(alloc, boost::unordered::detail::func::construct_value(
boost::addressof(a.node_->value_ptr()->second), boost::addressof(a.node_->value_ptr()->second),
boost::forward<Mapped>(m)); boost::forward<Mapped>(m));
} }
@ -1844,7 +1843,7 @@ construct_node_pair_from_args(
{ {
node_constructor<Alloc> a(alloc); node_constructor<Alloc> a(alloc);
a.create_node(); a.create_node();
boost::unordered::detail::func::construct_value(alloc, boost::unordered::detail::func::construct_value(
boost::addressof(a.node_->value_ptr()->first), boost::forward<Key>(k)); boost::addressof(a.node_->value_ptr()->first), boost::forward<Key>(k));
BOOST_TRY BOOST_TRY
{ {