boost_mirror/multi_index
1
0
Fork 0
mirror of https://github.com/boostorg/multi_index.git synced 2025-05-11 13:24:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed wrong copy construction as emplacement construction

Browse Source
This commit is contained in:
joaquintides 2018-12-31 09:48:09 +01:00
parent 131e3427ae
commit ac377a6e7d
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/boost/multi_index_container.hpp
View File

@ -558,13 +558,8 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS:
bfm_allocator::member,boost::addressof(x->value()),boost::move(v)); bfm_allocator::member,boost::addressof(x->value()),boost::move(v));
} }
template<BOOST_MULTI_INDEX_TEMPLATE_PARAM_PACK> BOOST_MULTI_INDEX_OVERLOADS_TO_VARTEMPL_EXTRA_ARG(
void construct_node(node_type* x,BOOST_MULTI_INDEX_FUNCTION_PARAM_PACK) void,construct_node,vartempl_construct_node_impl,node_type*,x)
{
node_alloc_traits::construct(
bfm_allocator::member,boost::addressof(x->value()),
BOOST_MULTI_INDEX_FORWARD_PARAM_PACK);
}
void destroy_node(node_type* x) void destroy_node(node_type* x)
{ {
@ -616,7 +611,7 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS:
{ {
node_type* x=allocate_node(); node_type* x=allocate_node();
BOOST_TRY{ BOOST_TRY{
construct_node(x,value_type(t)); construct_node(x,t);
BOOST_TRY{ BOOST_TRY{
node_type* res=super::insert_(x->value(),x,detail::emplaced_tag()); node_type* res=super::insert_(x->value(),x,detail::emplaced_tag());
if(res==x){ if(res==x){
@ -1002,6 +997,15 @@ BOOST_MULTI_INDEX_PROTECTED_IF_MEMBER_TEMPLATE_FRIENDS:
#endif #endif
private: private:
template<BOOST_MULTI_INDEX_TEMPLATE_PARAM_PACK>
void vartempl_construct_node_impl(
node_type* x,BOOST_MULTI_INDEX_FUNCTION_PARAM_PACK)
{
node_alloc_traits::construct(
bfm_allocator::member,boost::addressof(x->value()),
BOOST_MULTI_INDEX_FORWARD_PARAM_PACK);
}
size_type node_count; size_type node_count;
#if defined(BOOST_MULTI_INDEX_ENABLE_INVARIANT_CHECKING)&&\ #if defined(BOOST_MULTI_INDEX_ENABLE_INVARIANT_CHECKING)&&\