From 08ce2c98e0bdec3b62d6beb08393fdc40b5aafce Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 18 Apr 2017 10:14:26 +0100 Subject: [PATCH] Rename call_construct to construct_value --- .../boost/unordered/detail/implementation.hpp | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/include/boost/unordered/detail/implementation.hpp b/include/boost/unordered/detail/implementation.hpp index 09baab65..e49fe4d7 100644 --- a/include/boost/unordered/detail/implementation.hpp +++ b/include/boost/unordered/detail/implementation.hpp @@ -1255,7 +1255,7 @@ namespace detail { namespace func { //////////////////////////////////////////////////////////////////////////// -// call_construct +// construct_value // // Only use allocator_traits::construct, allocator_traits::destroy when full // C++11 support is available. @@ -1271,36 +1271,36 @@ namespace func { #elif !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) template -inline void call_construct(Alloc&, T* address, BOOST_FWD_REF(Args)... args) +inline void construct_value(Alloc&, T* address, BOOST_FWD_REF(Args)... args) { new ((void*)address) T(boost::forward(args)...); } #define BOOST_UNORDERED_CALL_CONSTRUCT0(Traits, alloc, address) \ - boost::unordered::detail::func::call_construct(alloc, address) + boost::unordered::detail::func::construct_value(alloc, address) #define BOOST_UNORDERED_CALL_CONSTRUCT1(Traits, alloc, address, a0) \ - boost::unordered::detail::func::call_construct(alloc, address, a0) + boost::unordered::detail::func::construct_value(alloc, address, a0) #define BOOST_UNORDERED_CALL_DESTROY(Traits, alloc, x) \ boost::unordered::detail::func::destroy(x) #else template -inline void call_construct(Alloc&, T* address) +inline void construct_value(Alloc&, T* address) { new ((void*)address) T(); } template -inline void call_construct(Alloc&, T* address, BOOST_FWD_REF(A0) a0) +inline void construct_value(Alloc&, T* address, BOOST_FWD_REF(A0) a0) { new ((void*)address) T(boost::forward(a0)); } #define BOOST_UNORDERED_CALL_CONSTRUCT0(Traits, alloc, address) \ - boost::unordered::detail::func::call_construct(alloc, address) + boost::unordered::detail::func::construct_value(alloc, address) #define BOOST_UNORDERED_CALL_CONSTRUCT1(Traits, alloc, address, a0) \ - boost::unordered::detail::func::call_construct(alloc, address, a0) + boost::unordered::detail::func::construct_value(alloc, address, a0) #define BOOST_UNORDERED_CALL_DESTROY(Traits, alloc, x) \ boost::unordered::detail::func::destroy(x) @@ -1793,11 +1793,11 @@ construct_node_pair(Alloc& alloc, BOOST_FWD_REF(Key) k) { node_constructor a(alloc); a.create_node(); - boost::unordered::detail::func::call_construct(alloc, + boost::unordered::detail::func::construct_value(alloc, boost::addressof(a.node_->value_ptr()->first), boost::forward(k)); BOOST_TRY { - boost::unordered::detail::func::call_construct( + boost::unordered::detail::func::construct_value( alloc, boost::addressof(a.node_->value_ptr()->second)); } BOOST_CATCH(...) @@ -1816,11 +1816,11 @@ construct_node_pair(Alloc& alloc, BOOST_FWD_REF(Key) k, BOOST_FWD_REF(Mapped) m) { node_constructor a(alloc); a.create_node(); - boost::unordered::detail::func::call_construct(alloc, + boost::unordered::detail::func::construct_value(alloc, boost::addressof(a.node_->value_ptr()->first), boost::forward(k)); BOOST_TRY { - boost::unordered::detail::func::call_construct(alloc, + boost::unordered::detail::func::construct_value(alloc, boost::addressof(a.node_->value_ptr()->second), boost::forward(m)); } @@ -1841,7 +1841,7 @@ construct_node_pair_from_args( { node_constructor a(alloc); a.create_node(); - boost::unordered::detail::func::call_construct(alloc, + boost::unordered::detail::func::construct_value(alloc, boost::addressof(a.node_->value_ptr()->first), boost::forward(k)); BOOST_TRY {