feedc0de/boost_container
1
0
Fork 0
forked from boostorg/container
Code Pull Requests Activity

Fixes Trac #13533: "Boost vector resize causes assert(false)"

Browse Source
This commit is contained in:
Ion Gaztañaga
2018-04-29 12:37:35 +02:00
parent b3eee90a81
commit 42c6be5887
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/boost/container/detail/advanced_insert_int.hpp
View File

@@ -125,8 +125,16 @@ struct insert_value_initialized_n_proxy
void uninitialized_copy_n_and_update(Allocator &a, Iterator p, size_type n) const
{ boost::container::uninitialized_value_init_alloc_n(a, n, p); }
void copy_n_and_update(Allocator &, Iterator, size_type) const
{ BOOST_ASSERT(false); }
void copy_n_and_update(Allocator &a, Iterator p, size_type n) const
{
for (; 0 < n; --n, ++p){
typename aligned_storage<sizeof(value_type), alignment_of<value_type>::value>::type stor;
value_type &v = *static_cast<value_type *>(static_cast<void *>(stor.data));
alloc_traits::construct(a, &v);
value_destructor<Allocator> on_exit(a, v); (void)on_exit;
*p = ::boost::move(v);
}
}
};
template<class Allocator, class Iterator>
@@ -139,8 +147,18 @@ struct insert_default_initialized_n_proxy
void uninitialized_copy_n_and_update(Allocator &a, Iterator p, size_type n) const
{ boost::container::uninitialized_default_init_alloc_n(a, n, p); }
void copy_n_and_update(Allocator &, Iterator, size_type) const
{ BOOST_ASSERT(false); }
void copy_n_and_update(Allocator &a, Iterator p, size_type n) const
{
if(!is_pod<value_type>::value){
for (; 0 < n; --n, ++p){
typename aligned_storage<sizeof(value_type), alignment_of<value_type>::value>::type stor;
value_type &v = *static_cast<value_type *>(static_cast<void *>(stor.data));
alloc_traits::construct(a, &v, default_init);
value_destructor<Allocator> on_exit(a, v); (void)on_exit;
*p = ::boost::move(v);
}
}
}
};
template<class Allocator, class Iterator>