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

Fixed #128 ("moved from small_vector and static_vector calls destructor on elements in static part")

Browse Source
This commit is contained in:
Ion Gaztañaga
2020-07-12 13:48:38 +02:00
parent 069351adfc
commit 2d9d28b81e
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/container.qbk
View File

@@ -1321,6 +1321,7 @@ use [*Boost.Container]? There are several reasons for that:
* Fixed bugs/issues:
* [@https://github.com/boostorg/container/issues/126 GitHub #126: ['"flat_set.hpp and set.hpp in pmr have the same header guard"]].
* [@https://github.com/boostorg/container/issues/128 GitHub #128: ['"moved from small_vector and static_vector calls destructor on elements in static part"]].
* [@https://github.com/boostorg/container/issues/129 GitHub #129: ['"Alias templates for small_flat_[multi]{set|map} using small_vector as container"]].
* [@https://github.com/boostorg/container/pull/135 GitHub #135: ['"Missing BOOST_NORETURN for user defined functions"]].
* [@https://github.com/boostorg/container/pull/137 GitHub #137: ['"RandomAccessIterator + 0"]].

1
include/boost/container/small_vector.hpp
View File

@@ -460,6 +460,7 @@ class small_vector_base
this->assign( boost::make_move_iterator(boost::movelib::iterator_to_raw_pointer(x.begin()))
, boost::make_move_iterator(boost::movelib::iterator_to_raw_pointer(x.end ()))
);
x.clear();
}
}
#endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED

10
include/boost/container/vector.hpp
View File

@@ -591,6 +591,9 @@ struct vector_alloc_holder<Allocator, StoredSizeType, version_0>
{
::boost::container::uninitialized_move_alloc_n
(this->alloc(), boost::movelib::to_raw_pointer(holder.start()), m_size, boost::movelib::to_raw_pointer(this->start()));
::boost::container::destroy_alloc_n
(this->alloc(), boost::movelib::to_raw_pointer(holder.start()), m_size);
holder.m_size = 0;
}
template<class OtherAllocator, class OtherStoredSizeType, class OtherAllocatorVersion>
@@ -2385,6 +2388,9 @@ private:
const size_type other_sz = static_cast<size_type>(x.m_holder.m_size);
boost::container::move_assign_range_alloc_n(this->m_holder.alloc(), other_start, other_sz, this_start, this_sz);
this->m_holder.m_size = other_sz;
//Not emptying the source container seems to be confusing for users as drop-in
//replacement for non-static vectors, so clear it.
x.clear();
}
template<class OtherA>
@@ -2413,11 +2419,13 @@ private:
this->m_holder.deallocate(this->m_holder.m_start, this->m_holder.m_capacity);
this->m_holder.steal_resources(x.m_holder);
}
//Else do a one by one move
//Else do a one by one move. Also, clear the source as users find confusing
//elements are still alive in the source container.
else{
this->assign( boost::make_move_iterator(boost::movelib::iterator_to_raw_pointer(x.begin()))
, boost::make_move_iterator(boost::movelib::iterator_to_raw_pointer(x.end() ))
);
x.clear();
}
//Move allocator if needed
dtl::move_alloc(this_alloc, x_alloc, dtl::bool_<propagate_alloc>());

6
test/static_vector_test.cpp
View File

@@ -495,11 +495,9 @@ void test_swap_and_move_nd()
BOOST_TEST(v1.size() == N/2);
BOOST_TEST(s1.size() == N);
//iG moving does not imply emptying source
//BOOST_TEST(v2.size() == 0);
BOOST_TEST(v2.size() == 0);
BOOST_TEST(s2.size() == N);
//iG moving does not imply emptying source
//BOOST_TEST(v3.size() == 0);
BOOST_TEST(v3.size() == 0);
BOOST_TEST(s3.size() == N);
BOOST_TEST(v4.size() == N/2);
BOOST_TEST(s4.size() == N);