mirror of
https://github.com/boostorg/unordered.git
synced 2025-10-25 13:51:45 +02:00
asserted allocator equality on unordered_node_(map|set)::merge and updated docs
This commit is contained in:
@@ -529,6 +529,7 @@ namespace boost {
|
||||
unordered_node_map<key_type, mapped_type, H2, P2, allocator_type>&
|
||||
source)
|
||||
{
|
||||
BOOST_ASSERT(get_allocator() == source.get_allocator());
|
||||
table_.merge(source.table_);
|
||||
}
|
||||
|
||||
@@ -537,6 +538,7 @@ namespace boost {
|
||||
unordered_node_map<key_type, mapped_type, H2, P2, allocator_type>&&
|
||||
source)
|
||||
{
|
||||
BOOST_ASSERT(get_allocator() == source.get_allocator());
|
||||
table_.merge(std::move(source.table_));
|
||||
}
|
||||
|
||||
|
||||
@@ -415,12 +415,14 @@ namespace boost {
|
||||
template <class H2, class P2>
|
||||
void merge(unordered_node_set<key_type, H2, P2, allocator_type>& source)
|
||||
{
|
||||
BOOST_ASSERT(get_allocator() == source.get_allocator());
|
||||
table_.merge(source.table_);
|
||||
}
|
||||
|
||||
template <class H2, class P2>
|
||||
void merge(unordered_node_set<key_type, H2, P2, allocator_type>&& source)
|
||||
{
|
||||
BOOST_ASSERT(get_allocator() == source.get_allocator());
|
||||
table_.merge(std::move(source.table_));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user