mirror of
https://github.com/boostorg/unordered.git
synced 2025-07-29 19:07:15 +02:00
Remove BOOST_MOVABLE_BUT_NOT_COPYABLE
This commit is contained in:
@ -454,8 +454,6 @@ namespace boost {
|
||||
typename boost::allocator_void_pointer<Allocator>::type> >::
|
||||
type>
|
||||
{
|
||||
BOOST_MOVABLE_BUT_NOT_COPYABLE(grouped_bucket_array)
|
||||
|
||||
typedef typename boost::allocator_value_type<Allocator>::type
|
||||
allocator_value_type;
|
||||
typedef
|
||||
@ -569,6 +567,9 @@ namespace boost {
|
||||
|
||||
~grouped_bucket_array() { this->deallocate(); }
|
||||
|
||||
grouped_bucket_array(grouped_bucket_array const&) = delete;
|
||||
grouped_bucket_array& operator=(grouped_bucket_array const&) = delete;
|
||||
|
||||
grouped_bucket_array(grouped_bucket_array&& other) noexcept
|
||||
: empty_value<node_allocator_type>(
|
||||
empty_init_t(), other.get_node_allocator()),
|
||||
|
@ -415,8 +415,6 @@ namespace boost {
|
||||
|
||||
template <typename T> class optional
|
||||
{
|
||||
BOOST_MOVABLE_BUT_NOT_COPYABLE(optional)
|
||||
|
||||
boost::unordered::detail::value_base<T> value_;
|
||||
bool has_value_;
|
||||
|
||||
@ -440,6 +438,9 @@ namespace boost {
|
||||
public:
|
||||
optional() noexcept : has_value_(false) {}
|
||||
|
||||
optional(optional const&) = delete;
|
||||
optional& operator=(optional const&) = delete;
|
||||
|
||||
optional(optional<T>&& x) : has_value_(false)
|
||||
{
|
||||
if (x.has_value_) {
|
||||
|
@ -165,12 +165,12 @@ namespace test {
|
||||
|
||||
class movable1
|
||||
{
|
||||
BOOST_MOVABLE_BUT_NOT_COPYABLE(movable1)
|
||||
|
||||
public:
|
||||
movable1(constructor_param const&) {}
|
||||
movable1() {}
|
||||
explicit movable1(movable_init) {}
|
||||
movable1(movable1 const&) = delete;
|
||||
movable1& operator=(movable1 const&) = delete;
|
||||
movable1(movable1&&) {}
|
||||
movable1& operator=(movable1&&) { return *this; }
|
||||
~movable1() {}
|
||||
|
Reference in New Issue
Block a user