Drop misleading HPX_MOVABLE_ONLY

Fix misuses, remove redundant uses
STEllAR-GROUP · May 27, 2017 · b92bfed · b92bfed
1 parent 847d58f
commit b92bfed
Show file tree

Hide file tree

Showing 50 changed files with 17 additions and 133 deletions.
diff --git a/examples/1d_stencil/1d_stencil_4.cpp b/examples/1d_stencil/1d_stencil_4.cpp
@@ -79,8 +79,6 @@ struct partition_data
 private:
     std::unique_ptr<double[]> data_;
     std::size_t size_;
-
-    HPX_MOVABLE_ONLY(partition_data);
 };
 
 std::ostream& operator<<(std::ostream& os, partition_data const& c)

diff --git a/examples/1d_stencil/1d_stencil_4_throttle.cpp b/examples/1d_stencil/1d_stencil_4_throttle.cpp
@@ -149,8 +149,6 @@ struct partition_data
 private:
     std::unique_ptr<double[]> data_;
     std::size_t size_;
-
-    HPX_MOVABLE_ONLY(partition_data);
 };
 
 std::ostream& operator<<(std::ostream& os, partition_data const& c)

diff --git a/examples/quickstart/safe_object.cpp b/examples/quickstart/safe_object.cpp
@@ -19,9 +19,6 @@
 template <typename T>
 struct safe_object
 {
-private:
-    HPX_MOVABLE_ONLY(safe_object);
-
 public:
     safe_object()
       : data_(hpx::get_os_thread_count())

diff --git a/examples/transpose/transpose_await.cpp b/examples/transpose/transpose_await.cpp
@@ -112,8 +112,6 @@ struct sub_block
     std::uint64_t size_;
     double * data_;
     mode mode_;
-
-    HPX_MOVABLE_ONLY(sub_block);
 };
 
 struct block_component

diff --git a/examples/transpose/transpose_block.cpp b/examples/transpose/transpose_block.cpp
@@ -113,8 +113,6 @@ struct sub_block
     std::uint64_t size_;
     double * data_;
     mode mode_;
-
-    HPX_MOVABLE_ONLY(sub_block);
 };
 
 struct block_component

diff --git a/examples/transpose/transpose_block_numa.cpp b/examples/transpose/transpose_block_numa.cpp
@@ -126,8 +126,6 @@ struct sub_block
     std::uint64_t size_;
     double * data_;
     mode mode_;
-
-    HPX_MOVABLE_ONLY(sub_block);
 };
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/hpx/components/iostreams/ostream.hpp b/hpx/components/iostreams/ostream.hpp
@@ -164,7 +164,7 @@ namespace hpx { namespace iostreams
         typedef BOOST_IOSTREAMS_BASIC_OSTREAM(Char, stream_traits_type) std_stream_type;
         typedef detail::buffer::mutex_type mutex_type;
 
-        HPX_MOVABLE_ONLY(ostream);
+        HPX_NON_COPYABLE(ostream);
 
     private:
         using detail::buffer::mtx_;

diff --git a/hpx/components/process/util/windows/child.hpp b/hpx/components/process/util/windows/child.hpp
@@ -23,8 +23,6 @@ namespace hpx { namespace components { namespace process { namespace windows {
 
 class child
 {
-    HPX_MOVABLE_ONLY(child);
-
 public:
     PROCESS_INFORMATION proc_info;
 

diff --git a/hpx/config/emulate_deleted.hpp b/hpx/config/emulate_deleted.hpp
@@ -31,9 +31,4 @@
     HPX_DELETE_MOVE_ASSIGN(cls)                                               \
 /**/
 
-#define HPX_MOVABLE_ONLY(cls)                                                 \
-    HPX_DELETE_COPY_CTOR(cls);                                                \
-    HPX_DELETE_COPY_ASSIGN(cls)                                               \
-/**/
-
 #endif
diff --git a/hpx/lcos/detail/future_data.hpp b/hpx/lcos/detail/future_data.hpp
@@ -195,11 +195,8 @@ namespace detail
 
     ///////////////////////////////////////////////////////////////////////////
     template <typename F1, typename F2>
-    class compose_cb_impl
+    struct compose_cb_impl
     {
-        HPX_MOVABLE_ONLY(compose_cb_impl);
-
-    public:
         template <typename A1, typename A2>
         compose_cb_impl(A1 && f1, A2 && f2)
           : f1_(std::forward<A1>(f1))

diff --git a/hpx/lcos/detail/promise_base.hpp b/hpx/lcos/detail/promise_base.hpp
@@ -161,8 +161,6 @@ namespace lcos {
         class promise_base
           : public hpx::lcos::local::detail::promise_base<Result, SharedState>
         {
-            HPX_MOVABLE_ONLY(promise_base);
-
             typedef hpx::lcos::local::detail::promise_base<
                     Result, SharedState
                 > base_type;

diff --git a/hpx/lcos/future.hpp b/hpx/lcos/future.hpp
@@ -799,8 +799,6 @@ namespace hpx { namespace lcos
     template <typename R>
     class future : public detail::future_base<future<R>, R>
     {
-        HPX_MOVABLE_ONLY(future);
-
         typedef detail::future_base<future<R>, R> base_type;
 
     public:

diff --git a/hpx/lcos/future_wait.hpp b/hpx/lcos/future_wait.hpp
@@ -52,9 +52,6 @@ namespace hpx { namespace lcos
         template <typename Future, typename F>
         struct wait_each
         {
-        private:
-            HPX_MOVABLE_ONLY(wait_each);
-
         protected:
             void on_future_ready_(threads::thread_id_type const& id)
             {

diff --git a/hpx/lcos/local/and_gate.hpp b/hpx/lcos/local/and_gate.hpp
@@ -33,7 +33,6 @@ namespace hpx { namespace lcos { namespace local
         typedef Mutex mutex_type;
 
     private:
-        HPX_MOVABLE_ONLY(base_and_gate);
         typedef std::list<conditional_trigger*> condition_list_type;
 
     public:
@@ -305,7 +304,6 @@ namespace hpx { namespace lcos { namespace local
     struct and_gate : public base_and_gate<no_mutex>
     {
     private:
-        HPX_MOVABLE_ONLY(and_gate);
         typedef base_and_gate<no_mutex> base_type;
 
     public:

diff --git a/hpx/lcos/local/conditional_trigger.hpp b/hpx/lcos/local/conditional_trigger.hpp
@@ -21,9 +21,6 @@ namespace hpx { namespace lcos { namespace local
     ///////////////////////////////////////////////////////////////////////////
     struct conditional_trigger
     {
-    private:
-        HPX_MOVABLE_ONLY(conditional_trigger);
-
     public:
         conditional_trigger()
         {

diff --git a/hpx/lcos/local/futures_factory.hpp b/hpx/lcos/local/futures_factory.hpp
@@ -295,9 +295,6 @@ namespace hpx { namespace lcos { namespace local
     protected:
         typedef lcos::detail::task_base<Result> task_impl_type;
 
-    private:
-        HPX_MOVABLE_ONLY(futures_factory);
-
     public:
         // construction and destruction
         futures_factory()

diff --git a/hpx/lcos/local/packaged_task.hpp b/hpx/lcos/local/packaged_task.hpp
@@ -30,8 +30,6 @@ namespace hpx { namespace lcos { namespace local
     template <typename R, typename ...Ts>
     class packaged_task<R(Ts...)>
     {
-        HPX_MOVABLE_ONLY(packaged_task);
-
         typedef util::unique_function_nonser<R(Ts...)> function_type;
 
     public:

diff --git a/hpx/lcos/local/promise.hpp b/hpx/lcos/local/promise.hpp
@@ -29,8 +29,6 @@ namespace hpx { namespace lcos { namespace local
             typename SharedState = lcos::detail::future_data<R>>
         class promise_base
         {
-            HPX_MOVABLE_ONLY(promise_base);
-
             typedef SharedState shared_state_type;
             typedef typename shared_state_type::init_no_addref init_no_addref;
 
@@ -213,8 +211,6 @@ namespace hpx { namespace lcos { namespace local
     template <typename R>
     class promise : public detail::promise_base<R>
     {
-        HPX_MOVABLE_ONLY(promise);
-
         typedef detail::promise_base<R> base_type;
 
     public:
@@ -329,8 +325,6 @@ namespace hpx { namespace lcos { namespace local
     template <typename R>
     class promise<R&> : public detail::promise_base<R&>
     {
-        HPX_MOVABLE_ONLY(promise);
-
         typedef detail::promise_base<R&> base_type;
 
     public:
@@ -427,8 +421,6 @@ namespace hpx { namespace lcos { namespace local
     template <>
     class promise<void> : public detail::promise_base<void>
     {
-        HPX_MOVABLE_ONLY(promise);
-
         typedef detail::promise_base<void> base_type;
 
     public:

diff --git a/hpx/lcos/local/receive_buffer.hpp b/hpx/lcos/local/receive_buffer.hpp
@@ -90,9 +90,6 @@ namespace hpx { namespace lcos { namespace local
             iterator it_;
         };
 
-    private:
-        HPX_MOVABLE_ONLY(receive_buffer);
-
     public:
         receive_buffer() {}
 
@@ -306,9 +303,6 @@ namespace hpx { namespace lcos { namespace local
             iterator it_;
         };
 
-    private:
-        HPX_MOVABLE_ONLY(receive_buffer);
-
     public:
         receive_buffer() {}
 

diff --git a/hpx/lcos/local/trigger.hpp b/hpx/lcos/local/trigger.hpp
@@ -32,7 +32,6 @@ namespace hpx { namespace lcos { namespace local
         typedef Mutex mutex_type;
 
     private:
-        HPX_MOVABLE_ONLY(base_trigger);
         typedef std::list<conditional_trigger*> condition_list_type;
 
     public:
@@ -221,7 +220,6 @@ namespace hpx { namespace lcos { namespace local
     struct trigger : public base_trigger<no_mutex>
     {
     private:
-        HPX_MOVABLE_ONLY(trigger);
         typedef base_trigger<no_mutex> base_type;
 
     public:

diff --git a/hpx/lcos/promise.hpp b/hpx/lcos/promise.hpp
@@ -63,8 +63,6 @@ namespace lcos {
       : public detail::promise_base<
             Result, RemoteResult, detail::promise_data<Result> >
     {
-        HPX_MOVABLE_ONLY(promise);
-
         typedef detail::promise_base<
                 Result, RemoteResult, detail::promise_data<Result>
            > base_type;
@@ -153,8 +151,6 @@ namespace lcos {
       : public detail::promise_base<
             void, hpx::util::unused_type, detail::promise_data<void> >
     {
-        HPX_MOVABLE_ONLY(promise);
-
         typedef detail::promise_base<
                 void, hpx::util::unused_type, detail::promise_data<void>
             > base_type;

diff --git a/hpx/plugins/parcel/coalescing_counter_registry.hpp b/hpx/plugins/parcel/coalescing_counter_registry.hpp
@@ -29,7 +29,7 @@ namespace hpx { namespace plugins { namespace parcel
     {
         typedef hpx::lcos::local::spinlock mutex_type;
 
-        HPX_MOVABLE_ONLY(coalescing_counter_registry);
+        HPX_NON_COPYABLE(coalescing_counter_registry);
 
     public:
         coalescing_counter_registry() {}

diff --git a/hpx/plugins/parcelport/mpi/mpi_environment.hpp b/hpx/plugins/parcelport/mpi/mpi_environment.hpp
@@ -45,7 +45,7 @@ namespace hpx { namespace util
             scoped_lock();
             ~scoped_lock();
             void unlock();
-            HPX_MOVABLE_ONLY(scoped_lock);
+            HPX_NON_COPYABLE(scoped_lock);
         };
 
         struct scoped_try_lock
@@ -54,7 +54,7 @@ namespace hpx { namespace util
             ~scoped_try_lock();
             void unlock();
             bool locked;
-            HPX_MOVABLE_ONLY(scoped_try_lock);
+            HPX_NON_COPYABLE(scoped_try_lock);
         };
 
         typedef hpx::lcos::local::spinlock mutex_type;

diff --git a/hpx/runtime/actions/basic_action.hpp b/hpx/runtime/actions/basic_action.hpp
@@ -69,8 +69,6 @@ namespace hpx { namespace actions
         template <typename Action, typename F, typename ...Ts>
         struct continuation_thread_function
         {
-            HPX_MOVABLE_ONLY(continuation_thread_function);
-
         public:
             typedef typename Action::continuation_type
                 continuation_type;

diff --git a/hpx/runtime/actions/continuation.hpp b/hpx/runtime/actions/continuation.hpp
@@ -92,8 +92,6 @@ namespace hpx { namespace actions
     struct typed_continuation<Result, Result> : continuation
     {
     private:
-        HPX_MOVABLE_ONLY(typed_continuation);
-
         typedef util::unique_function<
                 void(naming::id_type, Result)
             > function_type;
@@ -215,8 +213,6 @@ namespace hpx { namespace actions
     struct typed_continuation : typed_continuation<RemoteResult>
     {
     private:
-        HPX_MOVABLE_ONLY(typed_continuation);
-
         typedef typed_continuation<RemoteResult> base_type;
         typedef util::unique_function<
                 void(naming::id_type, RemoteResult)
@@ -327,8 +323,6 @@ namespace hpx { namespace actions
     struct typed_continuation<void, util::unused_type> : continuation
     {
     private:
-        HPX_MOVABLE_ONLY(typed_continuation);
-
         typedef util::unique_function<void(naming::id_type)> function_type;
 
     public:

diff --git a/hpx/runtime/actions/transfer_action.hpp b/hpx/runtime/actions/transfer_action.hpp
@@ -38,7 +38,7 @@ namespace hpx { namespace actions
     template <typename Action>
     struct transfer_action : transfer_base_action<Action>
     {
-        HPX_MOVABLE_ONLY(transfer_action);
+        HPX_NON_COPYABLE(transfer_action);
 
         typedef transfer_base_action<Action> base_type;
 

diff --git a/hpx/runtime/actions/transfer_base_action.hpp b/hpx/runtime/actions/transfer_base_action.hpp
@@ -46,7 +46,7 @@ namespace hpx { namespace actions
     template <typename Action>
     struct transfer_base_action : base_action
     {
-        HPX_MOVABLE_ONLY(transfer_base_action);
+        HPX_NON_COPYABLE(transfer_base_action);
 
     public:
         typedef typename Action::component_type component_type;

diff --git a/hpx/runtime/actions/transfer_continuation_action.hpp b/hpx/runtime/actions/transfer_continuation_action.hpp
@@ -32,7 +32,7 @@ namespace hpx { namespace actions
     template <typename Action>
     struct transfer_continuation_action : transfer_base_action<Action>
     {
-        HPX_MOVABLE_ONLY(transfer_continuation_action);
+        HPX_NON_COPYABLE(transfer_continuation_action);
 
         typedef transfer_base_action<Action> base_type;
         typedef typename base_type::continuation_type continuation_type;

diff --git a/hpx/runtime/applier/apply_callback.hpp b/hpx/runtime/applier/apply_callback.hpp
@@ -380,9 +380,6 @@ namespace hpx
         template <typename Action, typename Callback, typename ...Ts>
         struct apply_c_p_cb_impl
         {
-        private:
-            HPX_MOVABLE_ONLY(apply_c_p_cb_impl);
-
         public:
             typedef util::tuple<Ts...> tuple_type;
 

diff --git a/hpx/runtime/naming/name.hpp b/hpx/runtime/naming/name.hpp
@@ -695,7 +695,7 @@ namespace hpx { namespace naming
         ///////////////////////////////////////////////////////////////////////
         struct HPX_EXPORT id_type_impl : gid_type
         {
-            HPX_MOVABLE_ONLY(id_type_impl);
+            HPX_NON_COPYABLE(id_type_impl);
 
         private:
             typedef void (*deleter_type)(detail::id_type_impl*);

diff --git a/hpx/runtime/parcelset/detail/call_for_each.hpp b/hpx/runtime/parcelset/detail/call_for_each.hpp
@@ -44,7 +44,6 @@ namespace hpx { namespace parcelset
 
                 return *this;
             }
-            HPX_MOVABLE_ONLY(call_for_each);
 
             void operator()(boost::system::error_code const& e) const
             {

diff --git a/hpx/runtime/parcelset/parcel.hpp b/hpx/runtime/parcelset/parcel.hpp
@@ -43,9 +43,6 @@ namespace hpx { namespace parcelset
     {
         struct parcel_data
         {
-        private:
-            HPX_MOVABLE_ONLY(parcel_data);
-
         public:
             parcel_data();
             parcel_data(naming::gid_type&& dest, naming::address&& addr,
@@ -104,7 +101,6 @@ namespace hpx { namespace parcelset
     public:
         parcel(parcel && other);
         parcel &operator=(parcel && other);
-        HPX_MOVABLE_ONLY(parcel);
 
         void reset();