Remove obsolete HPX_DELETE_* config macros

STEllAR-GROUP · May 27, 2017 · 51fa433 · 51fa433
1 parent b92bfed
commit 51fa433
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 43 deletions.
diff --git a/hpx/compute/cuda/detail/launch.hpp b/hpx/compute/cuda/detail/launch.hpp
@@ -61,8 +61,7 @@ namespace hpx { namespace compute { namespace cuda { namespace detail
           , args_(std::move(rhs.args_))
         {}
 
-        HPX_DELETE_COPY_ASSIGN(closure);
-        HPX_DELETE_MOVE_ASSIGN(closure);
+        closure& operator=(closure const&) = delete;
 
         HPX_DEVICE void operator()()
         {

diff --git a/hpx/config/emulate_deleted.hpp b/hpx/config/emulate_deleted.hpp
@@ -8,27 +8,11 @@
 
 #include <hpx/config.hpp>
 
-#define HPX_DELETE_COPY_CTOR(cls)                                             \
-    cls(cls const&) = delete                                                  \
-/**/
-
-#define HPX_DELETE_COPY_ASSIGN(cls)                                           \
-    cls& operator=(cls const&) = delete                                       \
-/**/
-
-#define HPX_DELETE_MOVE_CTOR(cls)                                             \
-    cls(cls&&) = delete                                                       \
-/**/
-
-#define HPX_DELETE_MOVE_ASSIGN(cls)                                           \
-    cls& operator=(cls&&) = delete                                            \
-/**/
-
 #define HPX_NON_COPYABLE(cls)                                                 \
-    HPX_DELETE_COPY_CTOR(cls);                                                \
-    HPX_DELETE_COPY_ASSIGN(cls);                                              \
-    HPX_DELETE_MOVE_CTOR(cls);                                                \
-    HPX_DELETE_MOVE_ASSIGN(cls)                                               \
+    cls(cls const&) = delete;                                                 \
+    cls(cls&&) = delete;                                                      \
+    cls& operator=(cls const&) = delete;                                      \
+    cls& operator=(cls&&) = delete                                            \
 /**/
 
 #endif
diff --git a/hpx/parallel/algorithms/count.hpp b/hpx/parallel/algorithms/count.hpp
@@ -71,8 +71,7 @@ namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
             {}
 #endif
 
-            HPX_DELETE_COPY_ASSIGN(count_iteration);
-            HPX_DELETE_MOVE_ASSIGN(count_iteration);
+            count_iteration& operator=(count_iteration const&) = delete;
 
             template <typename Iter>
             HPX_HOST_DEVICE HPX_FORCEINLINE

diff --git a/hpx/parallel/algorithms/for_each.hpp b/hpx/parallel/algorithms/for_each.hpp
@@ -122,8 +122,7 @@ namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
             {}
 #endif
 
-            HPX_DELETE_COPY_ASSIGN(for_each_iteration);
-            HPX_DELETE_MOVE_ASSIGN(for_each_iteration);
+            for_each_iteration& operator=(for_each_iteration const&) = delete;
 
             template <typename Iter>
             HPX_HOST_DEVICE HPX_FORCEINLINE

diff --git a/hpx/parallel/algorithms/transform.hpp b/hpx/parallel/algorithms/transform.hpp
@@ -96,8 +96,7 @@ namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
             {}
 #endif
 
-            HPX_DELETE_COPY_ASSIGN(transform_iteration);
-            HPX_DELETE_MOVE_ASSIGN(transform_iteration);
+            transform_iteration& operator=(transform_iteration const&) = delete;
 
             template <typename Iter>
             HPX_HOST_DEVICE HPX_FORCEINLINE
@@ -364,8 +363,8 @@ namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
             {}
 #endif
 
-            HPX_DELETE_COPY_ASSIGN(transform_binary_iteration);
-            HPX_DELETE_MOVE_ASSIGN(transform_binary_iteration);
+            transform_binary_iteration& operator=(
+                transform_binary_iteration const&) = delete;
 
             template <typename Iter>
             HPX_HOST_DEVICE HPX_FORCEINLINE

diff --git a/hpx/runtime/components/pinned_ptr.hpp b/hpx/runtime/components/pinned_ptr.hpp
@@ -99,11 +99,6 @@ namespace hpx { namespace components
             return pinned_ptr(lva, id<Component>());
         }
 
-#if !defined(HPX_INTEL_VERSION) || (HPX_INTEL_VERSION > 1400)
-        HPX_DELETE_COPY_CTOR(pinned_ptr);
-        HPX_DELETE_COPY_ASSIGN(pinned_ptr);
-#endif
-
     private:
         template <typename Component>
         pinned_ptr(naming::address::address_type lva, id<Component>)

diff --git a/hpx/runtime/components/server/memory_block.hpp b/hpx/runtime/components/server/memory_block.hpp
@@ -44,8 +44,6 @@ namespace hpx { namespace components { namespace server { namespace detail
     ///        a block of memory managed by a server#memory_block component.
     class memory_block_header //-V690
     {
-        HPX_DELETE_COPY_CTOR(memory_block_header);
-
     public:
         /// This constructor is called on the locality where there memory_block
         /// is hosted
@@ -79,6 +77,8 @@ namespace hpx { namespace components { namespace server { namespace detail
             act.construct()(this->get_ptr(), size);
         }
 
+        memory_block_header(memory_block_header const&) = delete;
+
         ~memory_block_header()
         {
             // invoke destructor, if needed

diff --git a/hpx/util/bind.hpp b/hpx/util/bind.hpp
@@ -284,8 +284,7 @@ namespace hpx { namespace util
             {}
 #endif
 
-            HPX_DELETE_COPY_ASSIGN(bound);
-            HPX_DELETE_MOVE_ASSIGN(bound);
+            bound& operator=(bound const&) = delete;
 
             template <typename ...Us>
             HPX_HOST_DEVICE inline

diff --git a/hpx/util/deferred_call.hpp b/hpx/util/deferred_call.hpp
@@ -75,8 +75,7 @@ namespace hpx { namespace util
             {}
 #endif
 
-            HPX_DELETE_COPY_ASSIGN(deferred);
-            HPX_DELETE_MOVE_ASSIGN(deferred);
+            deferred& operator=(deferred const&) = delete;
 
             HPX_HOST_DEVICE HPX_FORCEINLINE
             typename deferred_result_of<F(Ts...)>::type

diff --git a/hpx/util/protect.hpp b/hpx/util/protect.hpp
@@ -46,8 +46,7 @@ namespace hpx { namespace util
             {}
 #endif
 
-            HPX_DELETE_COPY_ASSIGN(protected_bind);
-            HPX_DELETE_MOVE_ASSIGN(protected_bind);
+            protected_bind& operator=(protected_bind const&) = delete;
         };
     }