2 files changed, 10 insertions, 13 deletions
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.h b/TAO/tao/DynamicInterface/DII_Reply_Handler.h
index fd8b33bf261..802bddd0b3b 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Handler.h
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.h
@@ -98,11 +98,8 @@ public:
   typedef TAO_DII_Reply_Handler_ptr _ptr_type;
   typedef TAO_DII_Reply_Handler_var _var_type;
 
-#if defined (ACE_WIN32_VC14)
-  // Workaround for connect issue 1577211
-  ACE_UNIMPLEMENTED_FUNC (TAO_DII_Reply_Handler (const TAO_DII_Reply_Handler &))
-  ACE_UNIMPLEMENTED_FUNC (TAO_DII_Reply_Handler &operator = (const TAO_DII_Reply_Handler &))
-#endif
+  TAO_DII_Reply_Handler (const TAO_DII_Reply_Handler &) = delete;
+  TAO_DII_Reply_Handler &operator = (const TAO_DII_Reply_Handler &) = delete;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index af1b1f07563..b2431504fbf 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -99,11 +99,11 @@ namespace CORBA
      * <<=.
      */
     //@{
-    CORBA::Any &add_in_arg (void);
+    CORBA::Any &add_in_arg ();
     CORBA::Any &add_in_arg (const char* name);
-    CORBA::Any &add_inout_arg (void);
+    CORBA::Any &add_inout_arg ();
     CORBA::Any &add_inout_arg (const char* name);
-    CORBA::Any &add_out_arg (void);
+    CORBA::Any &add_out_arg ();
     CORBA::Any &add_out_arg (const char* name);
     //@}
 
@@ -111,7 +111,7 @@ namespace CORBA
     void set_return_type (CORBA::TypeCode_ptr tc);
 
     /// Returns reference to Any for extraction using >>=.
-    CORBA::Any &return_value (void);
+    CORBA::Any &return_value ();
 
     /// Perform method resolution and invoke an appropriate method.
     /**
@@ -125,7 +125,7 @@ namespace CORBA
      *       recommended as the user may not be able to propagate the
      *       exceptions.
      */
-    void invoke (void);
+    void invoke ();
 
     /// Send a oneway request.
     /**
@@ -133,7 +133,7 @@ namespace CORBA
      *       recommended as the user may not be able to propagate the
      *       exceptions.
      */
-    void send_oneway (void);
+    void send_oneway ();
 
     /**
      * @name The 'deferred synchronous' methods.
@@ -141,8 +141,8 @@ namespace CORBA
      * The 'deferred synchronous' methods.
      */
     //@{
-    void send_deferred (void);
-    void get_response (void);
+    void send_deferred ();
+    void get_response ();
     CORBA::Boolean poll_response (void);
     //@}