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

Add moved_value_from() to container policies, enabling proper move semantics for node-based containers in the case of unequal allocators

Browse Source
This commit is contained in:
Christian Mazakas
2023-01-11 14:37:45 -08:00
parent a3d4a078de
commit 7ce7ef5050
5 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/unordered/detail/foa.hpp
View File

@ -1255,7 +1255,7 @@ public:
* elements' values.
*/
x.for_all_elements([this](element_type* p){
unchecked_insert(type_policy::move(*p));
unchecked_insert(type_policy::moved_value_from(*p));
});
}
}
@ -1352,7 +1352,7 @@ public:
* elements' values.
*/
x.for_all_elements([this](element_type* p){
unchecked_insert(type_policy::move(*p));
unchecked_insert(type_policy::moved_value_from(*p));
});
}
}

5
include/boost/unordered/unordered_flat_map.hpp
View File

@ -60,6 +60,11 @@ namespace boost {
std::move(const_cast<raw_mapped_type&>(x.second))};
}
static moved_type moved_value_from(element_type& x)
{
return move(x);
}
template <class A>
static void construct(A& al, element_type* p, moved_type&& x)
{

5
include/boost/unordered/unordered_flat_set.hpp
View File

@ -45,6 +45,11 @@ namespace boost {
static element_type&& move(element_type& x) { return std::move(x); }
static element_type&& moved_value_from(element_type& x)
{
return move(x);
}
template <class A>
static void construct(A& al, element_type* p, element_type const& copy)
{

12
include/boost/unordered/unordered_node_map.hpp
View File

@ -46,12 +46,24 @@ namespace boost {
{
value_type* p;
/*
* we use a defined copy constructor here so the type is no longer
* trivially copy-constructible which inhibits our memcpy
* optimizations when copying the tables
*/
element_type() : p(nullptr) {}
element_type(element_type const& rhs) : p(rhs.p) {}
};
static value_type& value_from(element_type x) { return *(x.p); }
static std::pair<raw_key_type&&, raw_mapped_type&&> moved_value_from(
element_type& x)
{
return {std::move(const_cast<raw_key_type&>(x.p->first)),
std::move(const_cast<raw_mapped_type&>(x.p->second))};
}
template <class K, class V>
static raw_key_type const& extract(std::pair<K, V> const& kv)
{

5
include/boost/unordered/unordered_node_set.hpp
View File

@ -57,6 +57,11 @@ namespace boost {
static Key const& extract(element_type k) { return *k.p; }
static element_type&& move(element_type& x) { return std::move(x); }
static value_type&& moved_value_from(element_type& x)
{
return std::move(*x.p);
}
template <class A>
static void construct(A& al, element_type* p, element_type const& copy)
{