Merge pull request #1685 from jwillemsen/jwi-cleanup4

Use default/override

21 files changed, 16 insertions, 75 deletions

diff --git a/TAO/tao/Strategies/COIOP_Connection_Handler.h b/TAO/tao/Strategies/COIOP_Connection_Handler.h
index b65fe1b6092..fbc7ee9e9fd 100644
--- a/TAO/tao/Strategies/COIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/COIOP_Connection_Handler.h
@@ -44,9 +44,7 @@ class TAO_Strategies_Export TAO_COIOP_Connection_Handler
   : public TAO_COIOP_SVC_HANDLER,
     public TAO_Connection_Handler
 {
-
 public:
-
   TAO_COIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
 
   /// Constructor.
@@ -84,7 +82,6 @@ public:
 
   /// Add ourselves to Cache.
   int add_transport_to_cache (void);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp
index 21bbaad9dac..52cf349b0a1 100644
--- a/TAO/tao/Strategies/COIOP_Connector.cpp
+++ b/TAO/tao/Strategies/COIOP_Connector.cpp
@@ -13,15 +13,11 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_COIOP_Connector::TAO_COIOP_Connector (void)
+TAO_COIOP_Connector::TAO_COIOP_Connector ()
   : TAO_Connector (TAO_TAG_COIOP_PROFILE)
 {
 }
 
-TAO_COIOP_Connector::~TAO_COIOP_Connector (void)
-{
-}
-
 int
 TAO_COIOP_Connector::open (TAO_ORB_Core *orb_core)
 {
diff --git a/TAO/tao/Strategies/COIOP_Connector.h b/TAO/tao/Strategies/COIOP_Connector.h
index 5f6fff50bcf..9873329de74 100644
--- a/TAO/tao/Strategies/COIOP_Connector.h
+++ b/TAO/tao/Strategies/COIOP_Connector.h
@@ -49,7 +49,7 @@ public:
   TAO_COIOP_Connector (void);
 
   /// Destructor.
-  ~TAO_COIOP_Connector (void);
+  ~TAO_COIOP_Connector () = default;
 
   /**
    * @name The TAO_Connector Methods
diff --git a/TAO/tao/Strategies/COIOP_Endpoint.cpp b/TAO/tao/Strategies/COIOP_Endpoint.cpp
index 18290090a03..7a0cbf6c6e4 100644
--- a/TAO/tao/Strategies/COIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/COIOP_Endpoint.cpp
@@ -31,11 +31,6 @@ TAO_COIOP_Endpoint::TAO_COIOP_Endpoint (void)
 {
 }
 
-TAO_COIOP_Endpoint::~TAO_COIOP_Endpoint (void)
-{
-
-}
-
 int
 TAO_COIOP_Endpoint::addr_to_string (char *buffer, size_t length)
 {
diff --git a/TAO/tao/Strategies/COIOP_Endpoint.h b/TAO/tao/Strategies/COIOP_Endpoint.h
index a6fad6bc309..ae125713d46 100644
--- a/TAO/tao/Strategies/COIOP_Endpoint.h
+++ b/TAO/tao/Strategies/COIOP_Endpoint.h
@@ -52,7 +52,7 @@ public:
   TAO_COIOP_Endpoint (const ACE_Utils::UUID& uuid);
 
   /// Destructor.
-  ~TAO_COIOP_Endpoint (void);
+  ~TAO_COIOP_Endpoint () = default;
 
   /**
    * @name TAO_Endpoint Methods
diff --git a/TAO/tao/Strategies/COIOP_Factory.cpp b/TAO/tao/Strategies/COIOP_Factory.cpp
index d239c961daf..91186a98a3e 100644
--- a/TAO/tao/Strategies/COIOP_Factory.cpp
+++ b/TAO/tao/Strategies/COIOP_Factory.cpp
@@ -18,10 +18,6 @@ TAO_COIOP_Protocol_Factory::TAO_COIOP_Protocol_Factory (void)
 {
 }
 
-TAO_COIOP_Protocol_Factory::~TAO_COIOP_Protocol_Factory (void)
-{
-}
-
 int
 TAO_COIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
diff --git a/TAO/tao/Strategies/COIOP_Factory.h b/TAO/tao/Strategies/COIOP_Factory.h
index 19c95335947..044d6193270 100644
--- a/TAO/tao/Strategies/COIOP_Factory.h
+++ b/TAO/tao/Strategies/COIOP_Factory.h
@@ -39,7 +39,7 @@ public:
   TAO_COIOP_Protocol_Factory (void);
 
   /// Destructor.
-  virtual ~TAO_COIOP_Protocol_Factory (void);
+  virtual ~TAO_COIOP_Protocol_Factory () = default;
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
diff --git a/TAO/tao/Strategies/COIOP_Transport.cpp b/TAO/tao/Strategies/COIOP_Transport.cpp
index 1638a38763b..282c00f2330 100644
--- a/TAO/tao/Strategies/COIOP_Transport.cpp
+++ b/TAO/tao/Strategies/COIOP_Transport.cpp
@@ -27,10 +27,6 @@ TAO_COIOP_Transport::TAO_COIOP_Transport (TAO_COIOP_Connection_Handler *handler,
 {
 }
 
-TAO_COIOP_Transport::~TAO_COIOP_Transport (void)
-{
-}
-
 ACE_Event_Handler *
 TAO_COIOP_Transport::event_handler_i (void)
 {
diff --git a/TAO/tao/Strategies/COIOP_Transport.h b/TAO/tao/Strategies/COIOP_Transport.h
index 2e01336abe9..a4d76e3b278 100644
--- a/TAO/tao/Strategies/COIOP_Transport.h
+++ b/TAO/tao/Strategies/COIOP_Transport.h
@@ -47,13 +47,12 @@ typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 class TAO_Strategies_Export TAO_COIOP_Transport : public TAO_Transport
 {
 public:
-
   /// Constructor.
   TAO_COIOP_Transport (TAO_COIOP_Connection_Handler *handler,
                        TAO_ORB_Core *orb_core);
 
   /// Default destructor.
-  ~TAO_COIOP_Transport (void);
+  ~TAO_COIOP_Transport () = default;
 
   /// Look for the documentation in Transport.h.
   virtual int handle_input (TAO_Resume_Handle &rh,
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h
index 38dcb2cd588..bddca90cdeb 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h
@@ -45,9 +45,7 @@ class TAO_Strategies_Export TAO_DIOP_Connection_Handler
   : public TAO_DIOP_SVC_HANDLER
   , public TAO_Connection_Handler
 {
-
 public:
-
   TAO_DIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
 
   /// Constructor.
@@ -116,7 +114,6 @@ public:
   int set_dscp_codepoint (CORBA::Long dscp_codepoint);
 
 protected:
-
   //@{
   /**
    * @name TAO_Connection Handler overloads
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index b4b24ddd3bb..79bb9eb9e6f 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -24,10 +24,6 @@ TAO_DIOP_Connector::TAO_DIOP_Connector (void)
 {
 }
 
-TAO_DIOP_Connector::~TAO_DIOP_Connector (void)
-{
-}
-
 int
 TAO_DIOP_Connector::open (TAO_ORB_Core *orb_core)
 {
diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h
index 7448c5938ed..4d43cc543f0 100644
--- a/TAO/tao/Strategies/DIOP_Connector.h
+++ b/TAO/tao/Strategies/DIOP_Connector.h
@@ -49,7 +49,7 @@ public:
   TAO_DIOP_Connector (void);
 
   /// Destructor.
-  ~TAO_DIOP_Connector (void);
+  ~TAO_DIOP_Connector () = default;
 
   /**
    * @name The TAO_Connector Methods
@@ -68,7 +68,6 @@ public:
   //@}
 
 protected:
-
   /**
    * @name More TAO_Connector Methods
    *
@@ -88,7 +87,6 @@ protected:
   int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
 
 private:
-
   /// Return the remote endpoint, a helper function
   TAO_DIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
 };
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp
index 7cea233a221..599a55aaff4 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp
@@ -81,10 +81,6 @@ TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const char *host,
   this->host (host); // With IPv6 performs check for decimal address
 }
 
-TAO_DIOP_Endpoint::~TAO_DIOP_Endpoint (void)
-{
-}
-
 int
 TAO_DIOP_Endpoint::set (const ACE_INET_Addr &addr,
                         int use_dotted_decimal_addresses)
diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h
index ae1f8a3e70d..a4513c1dc8c 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.h
+++ b/TAO/tao/Strategies/DIOP_Endpoint.h
@@ -65,7 +65,7 @@ public:
                      CORBA::Short priority);
 
   /// Destructor.
-  ~TAO_DIOP_Endpoint (void);
+  ~TAO_DIOP_Endpoint (void) = default;
 
   /**
    * @name TAO_Endpoint Methods
diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp
index c29d38219b1..869bcba0155 100644
--- a/TAO/tao/Strategies/DIOP_Factory.cpp
+++ b/TAO/tao/Strategies/DIOP_Factory.cpp
@@ -18,10 +18,6 @@ TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory (void)
 {
 }
 
-TAO_DIOP_Protocol_Factory::~TAO_DIOP_Protocol_Factory (void)
-{
-}
-
 int
 TAO_DIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h
index e63cc69399a..b38e7c8f140 100644
--- a/TAO/tao/Strategies/DIOP_Factory.h
+++ b/TAO/tao/Strategies/DIOP_Factory.h
@@ -39,7 +39,7 @@ public:
   TAO_DIOP_Protocol_Factory (void);
 
   /// Destructor.
-  virtual ~TAO_DIOP_Protocol_Factory (void);
+  virtual ~TAO_DIOP_Protocol_Factory (void) = default;
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index 05f210b7243..59cd61a83c6 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -28,10 +28,6 @@ TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
 {
 }
 
-TAO_DIOP_Transport::~TAO_DIOP_Transport (void)
-{
-}
-
 ACE_Event_Handler *
 TAO_DIOP_Transport::event_handler_i (void)
 {
diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h
index 592240b664c..bce523006bb 100644
--- a/TAO/tao/Strategies/DIOP_Transport.h
+++ b/TAO/tao/Strategies/DIOP_Transport.h
@@ -51,13 +51,12 @@ typedef ACE_Svc_Handler<ACE_SOCK_DGRAM, ACE_NULL_SYNCH>
 class TAO_Strategies_Export TAO_DIOP_Transport : public TAO_Transport
 {
 public:
-
   /// Constructor.
   TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
                       TAO_ORB_Core *orb_core);
 
   /// Default destructor.
-  ~TAO_DIOP_Transport (void);
+  ~TAO_DIOP_Transport () = default;
 
   /// Look for the documentation in Transport.h.
   virtual int handle_input (TAO_Resume_Handle &rh,
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.cpp b/TAO/tao/Strategies/LF_Strategy_Null.cpp
index e4c897391e0..2e0da48098f 100644
--- a/TAO/tao/Strategies/LF_Strategy_Null.cpp
+++ b/TAO/tao/Strategies/LF_Strategy_Null.cpp
@@ -1,15 +1,7 @@
 #include "tao/Strategies/LF_Strategy_Null.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/Strategies/LF_Strategy_Null.inl"
-#endif /* __ACE_INLINE__ */
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_LF_Strategy_Null::~TAO_LF_Strategy_Null (void)
-{
-}
-
 void
 TAO_LF_Strategy_Null::set_upcall_thread (TAO_Leader_Follower &)
 {
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.h b/TAO/tao/Strategies/LF_Strategy_Null.h
index 802292b53a0..c53adaa8b82 100644
--- a/TAO/tao/Strategies/LF_Strategy_Null.h
+++ b/TAO/tao/Strategies/LF_Strategy_Null.h
@@ -31,28 +31,24 @@ class TAO_Strategies_Export TAO_LF_Strategy_Null : public TAO_LF_Strategy
 {
 public:
   /// Constructor
-  TAO_LF_Strategy_Null (void);
+  TAO_LF_Strategy_Null () = default;
 
   //@{
   /** @name Virtual Methods
    *
    * Please check the documentation in TAO_LF_Strategy
    */
-  virtual ~TAO_LF_Strategy_Null (void);
+  ~TAO_LF_Strategy_Null () override = default;
 
-  virtual void set_upcall_thread (TAO_Leader_Follower &);
-  virtual int set_event_loop_thread (ACE_Time_Value *max_wait_time,
-                                     TAO_Leader_Follower &);
-  virtual void reset_event_loop_thread (int call_reset,
-                                        TAO_Leader_Follower &);
+  void set_upcall_thread (TAO_Leader_Follower &) override;
+  int set_event_loop_thread (ACE_Time_Value *max_wait_time,
+                             TAO_Leader_Follower &) override;
+  void reset_event_loop_thread (int call_reset,
+                                TAO_Leader_Follower &) override;
   //@}
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__ACE_INLINE__)
-# include "tao/Strategies/LF_Strategy_Null.inl"
-#endif /* __ACE_INLINE__ */
-
 #include /**/ "ace/post.h"
 #endif  /* TAO_LF_STRATEGY_NULL_H */
diff --git a/TAO/tao/Strategies/LF_Strategy_Null.inl b/TAO/tao/Strategies/LF_Strategy_Null.inl
deleted file mode 100644
index 2eecd74fa73..00000000000
--- a/TAO/tao/Strategies/LF_Strategy_Null.inl
+++ /dev/null
@@ -1,4 +0,0 @@
-ACE_INLINE
-TAO_LF_Strategy_Null::TAO_LF_Strategy_Null (void)
-{
-}