mirror of
https://github.com/boostorg/unordered.git
synced 2025-11-02 16:51:39 +01:00
complied with https://github.com/boostorg/core/commit/5f6fe65
This commit is contained in:
@@ -120,12 +120,12 @@ to normal separate chaining implementations.
|
||||
#include <boost/core/allocator_access.hpp>
|
||||
#include <boost/core/bit.hpp>
|
||||
#include <boost/core/empty_value.hpp>
|
||||
#include <boost/core/invoke_swap.hpp>
|
||||
#include <boost/core/no_exceptions_support.hpp>
|
||||
#include <boost/core/serialization.hpp>
|
||||
#include <boost/cstdint.hpp>
|
||||
#include <boost/move/core.hpp>
|
||||
#include <boost/move/utility_core.hpp>
|
||||
#include <boost/swap.hpp>
|
||||
#include <boost/type_traits/aligned_storage.hpp>
|
||||
#include <boost/type_traits/alignment_of.hpp>
|
||||
|
||||
@@ -651,7 +651,7 @@ namespace boost {
|
||||
bool b = boost::allocator_propagate_on_container_swap<
|
||||
allocator_type>::type::value;
|
||||
if (b) {
|
||||
boost::swap(get_node_allocator(), other.get_node_allocator());
|
||||
boost::core::invoke_swap(get_node_allocator(), other.get_node_allocator());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
#include <boost/assert.hpp>
|
||||
#include <boost/core/allocator_traits.hpp>
|
||||
#include <boost/core/bit.hpp>
|
||||
#include <boost/core/invoke_swap.hpp>
|
||||
#include <boost/core/no_exceptions_support.hpp>
|
||||
#include <boost/core/pointer_traits.hpp>
|
||||
#include <boost/core/serialization.hpp>
|
||||
@@ -30,7 +31,6 @@
|
||||
#include <boost/preprocessor/repetition/repeat_from_to.hpp>
|
||||
#include <boost/preprocessor/seq/enum.hpp>
|
||||
#include <boost/preprocessor/seq/size.hpp>
|
||||
#include <boost/swap.hpp>
|
||||
#include <boost/throw_exception.hpp>
|
||||
#include <boost/tuple/tuple.hpp>
|
||||
#include <boost/type_traits/add_lvalue_reference.hpp>
|
||||
@@ -260,8 +260,8 @@ namespace boost {
|
||||
|
||||
void swap(compressed& x)
|
||||
{
|
||||
boost::swap(first(), x.first());
|
||||
boost::swap(second(), x.second());
|
||||
boost::core::invoke_swap(first(), x.first());
|
||||
boost::core::invoke_swap(second(), x.second());
|
||||
}
|
||||
|
||||
private:
|
||||
@@ -644,7 +644,7 @@ namespace boost {
|
||||
move(x);
|
||||
}
|
||||
} else if (has_value_) {
|
||||
boost::swap(value_.value(), x.value_.value());
|
||||
boost::core::invoke_swap(value_.value(), x.value_.value());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2089,7 +2089,7 @@ namespace boost {
|
||||
x.switch_functions();
|
||||
|
||||
buckets_.swap(x.buckets_);
|
||||
boost::swap(size_, x.size_);
|
||||
boost::core::invoke_swap(size_, x.size_);
|
||||
std::swap(mlf_, x.mlf_);
|
||||
std::swap(max_load_, x.max_load_);
|
||||
}
|
||||
@@ -2098,7 +2098,7 @@ namespace boost {
|
||||
void swap(table& x, true_type)
|
||||
{
|
||||
buckets_.swap(x.buckets_);
|
||||
boost::swap(size_, x.size_);
|
||||
boost::core::invoke_swap(size_, x.size_);
|
||||
std::swap(mlf_, x.mlf_);
|
||||
std::swap(max_load_, x.max_load_);
|
||||
this->current_functions().swap(x.current_functions());
|
||||
|
||||
@@ -2980,9 +2980,9 @@ namespace boost {
|
||||
if (boost::allocator_propagate_on_container_swap<
|
||||
value_allocator>::type::value ||
|
||||
!alloc_.has_value() || !n.alloc_.has_value()) {
|
||||
boost::swap(alloc_, n.alloc_);
|
||||
boost::core::invoke_swap(alloc_, n.alloc_);
|
||||
}
|
||||
boost::swap(ptr_, n.ptr_);
|
||||
boost::core::invoke_swap(ptr_, n.ptr_);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -3029,9 +3029,9 @@ namespace boost {
|
||||
void swap(insert_return_type_map<Iter, NodeType>& x,
|
||||
insert_return_type_map<Iter, NodeType>& y)
|
||||
{
|
||||
boost::swap(x.node, y.node);
|
||||
boost::swap(x.inserted, y.inserted);
|
||||
boost::swap(x.position, y.position);
|
||||
boost::core::invoke_swap(x.node, y.node);
|
||||
boost::core::invoke_swap(x.inserted, y.inserted);
|
||||
boost::core::invoke_swap(x.position, y.position);
|
||||
}
|
||||
} // namespace unordered
|
||||
|
||||
|
||||
@@ -2327,9 +2327,9 @@ namespace boost {
|
||||
alloc_ == n.alloc_);
|
||||
if (value_allocator_traits::propagate_on_container_swap::value ||
|
||||
!alloc_.has_value() || !n.alloc_.has_value()) {
|
||||
boost::swap(alloc_, n.alloc_);
|
||||
boost::core::invoke_swap(alloc_, n.alloc_);
|
||||
}
|
||||
boost::swap(ptr_, n.ptr_);
|
||||
boost::core::invoke_swap(ptr_, n.ptr_);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -2376,9 +2376,9 @@ namespace boost {
|
||||
void swap(
|
||||
insert_return_type_set<Iter, NodeType>& x, insert_return_type_set<Iter, NodeType>& y)
|
||||
{
|
||||
boost::swap(x.node, y.node);
|
||||
boost::swap(x.inserted, y.inserted);
|
||||
boost::swap(x.position, y.position);
|
||||
boost::core::invoke_swap(x.node, y.node);
|
||||
boost::core::invoke_swap(x.inserted, y.inserted);
|
||||
boost::core::invoke_swap(x.position, y.position);
|
||||
}
|
||||
} // namespace unordered
|
||||
|
||||
|
||||
Reference in New Issue
Block a user