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

Remove BOOST_MOVABLE_BUT_NOT_COPYABLE

Browse Source
This commit is contained in:
Christian Mazakas
2023-08-31 14:02:19 -07:00
parent c6aa90651c
commit bce9b5927a
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/unordered/detail/fca.hpp
View File

@ -454,8 +454,6 @@ namespace boost {
typename boost::allocator_void_pointer<Allocator>::type> >:: typename boost::allocator_void_pointer<Allocator>::type> >::
type> type>
{ {
BOOST_MOVABLE_BUT_NOT_COPYABLE(grouped_bucket_array)
typedef typename boost::allocator_value_type<Allocator>::type typedef typename boost::allocator_value_type<Allocator>::type
allocator_value_type; allocator_value_type;
typedef typedef
@ -569,6 +567,9 @@ namespace boost {
~grouped_bucket_array() { this->deallocate(); } ~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 grouped_bucket_array(grouped_bucket_array&& other) noexcept
: empty_value<node_allocator_type>( : empty_value<node_allocator_type>(
empty_init_t(), other.get_node_allocator()), empty_init_t(), other.get_node_allocator()),

5
include/boost/unordered/detail/implementation.hpp
View File

@ -415,8 +415,6 @@ namespace boost {
template <typename T> class optional template <typename T> class optional
{ {
BOOST_MOVABLE_BUT_NOT_COPYABLE(optional)
boost::unordered::detail::value_base<T> value_; boost::unordered::detail::value_base<T> value_;
bool has_value_; bool has_value_;
@ -440,6 +438,9 @@ namespace boost {
public: public:
optional() noexcept : has_value_(false) {} optional() noexcept : has_value_(false) {}
optional(optional const&) = delete;
optional& operator=(optional const&) = delete;
optional(optional<T>&& x) : has_value_(false) optional(optional<T>&& x) : has_value_(false)
{ {
if (x.has_value_) { if (x.has_value_) {

4
test/objects/minimal.hpp
View File

@ -165,12 +165,12 @@ namespace test {
class movable1 class movable1
{ {
BOOST_MOVABLE_BUT_NOT_COPYABLE(movable1)
public: public:
movable1(constructor_param const&) {} movable1(constructor_param const&) {}
movable1() {} movable1() {}
explicit movable1(movable_init) {} explicit movable1(movable_init) {}
movable1(movable1 const&) = delete;
movable1& operator=(movable1 const&) = delete;
movable1(movable1&&) {} movable1(movable1&&) {}
movable1& operator=(movable1&&) { return *this; } movable1& operator=(movable1&&) { return *this; }
~movable1() {} ~movable1() {}