Merge pull request #1699 from jwillemsen/jwi-defaultdestructor

Make use of default destructor

17 files changed, 13 insertions, 84 deletions

diff --git a/ACE/ASNMP/asnmp/oid.cpp b/ACE/ASNMP/asnmp/oid.cpp
index fa7bd43137b..c5d07161253 100644
--- a/ACE/ASNMP/asnmp/oid.cpp
+++ b/ACE/ASNMP/asnmp/oid.cpp
@@ -27,7 +27,7 @@
   derivatives based upon this software code base.
 =====================================================================*/
 
-//---------[ external C libaries used ]--------------------------------
+//---------[ external C libraries used ]--------------------------------
 
 #include "asnmp/oid.h"                  // include def for oid class
 #include "ace/OS_NS_string.h"
diff --git a/ACE/ace/ATM_Addr.cpp b/ACE/ace/ATM_Addr.cpp
index 57e4e2639f0..5c1ff5e73b4 100644
--- a/ACE/ace/ATM_Addr.cpp
+++ b/ACE/ace/ATM_Addr.cpp
@@ -112,12 +112,7 @@ ACE_ATM_Addr::ACE_ATM_Addr (const ACE_TCHAR sap[],
   this->set (sap, selector);
 }
 
-ACE_ATM_Addr::~ACE_ATM_Addr (void)
-{
-}
-
 // Return the address.
-
 void *
 ACE_ATM_Addr::get_addr () const
 {
diff --git a/ACE/ace/ATM_Addr.h b/ACE/ace/ATM_Addr.h
index 9f0a72e9d4a..324be266b06 100644
--- a/ACE/ace/ATM_Addr.h
+++ b/ACE/ace/ATM_Addr.h
@@ -88,7 +88,7 @@ public:
                 u_char selector = DEFAULT_SELECTOR);
 
   /// Default dtor.
-  ~ACE_ATM_Addr (void);
+  ~ACE_ATM_Addr () = default;
 
   /// Default initialization for non-address values (e.g.,
   /// t_atm_sap_addr.SVE_tag_addr, t_atm_sap_addr.SVE_tag_selector)
diff --git a/ACE/ace/Asynch_IO.cpp b/ACE/ace/Asynch_IO.cpp
index 64637f49a6b..e97457b75ee 100644
--- a/ACE/ace/Asynch_IO.cpp
+++ b/ACE/ace/Asynch_IO.cpp
@@ -124,14 +124,6 @@ ACE_Asynch_Operation::proactor () const
   return this->implementation ()->proactor ();
 }
 
-ACE_Asynch_Operation::ACE_Asynch_Operation ()
-{
-}
-
-ACE_Asynch_Operation::~ACE_Asynch_Operation ()
-{
-}
-
 ACE_Proactor *
 ACE_Asynch_Operation::get_proactor (ACE_Proactor *user_proactor,
                                     ACE_Handler &handler) const
diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h
index f31d5d0a42b..819eed30e7c 100644
--- a/ACE/ace/Asynch_IO.h
+++ b/ACE/ace/Asynch_IO.h
@@ -253,11 +253,11 @@ public:
   ACE_Proactor* proactor () const;
 
   /// Destructor.
-  virtual ~ACE_Asynch_Operation (void);
+  virtual ~ACE_Asynch_Operation () = default;
 
 protected:
   /// Constructor.
-  ACE_Asynch_Operation (void);
+  ACE_Asynch_Operation () = default;
 
   /// Return the underlying implementation class.
   virtual ACE_Asynch_Operation_Impl *implementation () const = 0;
diff --git a/ACE/ace/Barrier.cpp b/ACE/ace/Barrier.cpp
index 430ff115476..c516d1307d7 100644
--- a/ACE/ace/Barrier.cpp
+++ b/ACE/ace/Barrier.cpp
@@ -2,10 +2,6 @@
 
 #if defined (ACE_HAS_THREADS)
 
-#if !defined (__ACE_INLINE__)
-#include "ace/Barrier.inl"
-#endif /* __ACE_INLINE__ */
-
 #include "ace/Guard_T.h"
 #include "ace/OS_NS_errno.h"
 
diff --git a/ACE/ace/Barrier.h b/ACE/ace/Barrier.h
index 0f5eccd1f6a..12130f71a57 100644
--- a/ACE/ace/Barrier.h
+++ b/ACE/ace/Barrier.h
@@ -57,7 +57,7 @@ struct ACE_Export ACE_Sub_Barrier
                    const ACE_TCHAR *name = 0,
                    void *arg = 0);
 
-  ~ACE_Sub_Barrier ();
+  ~ACE_Sub_Barrier () = default;
 
   /// True if this generation of the barrier is done.
   ACE_Condition_Thread_Mutex barrier_finished_;
@@ -98,7 +98,7 @@ public:
                void *arg = 0);
 
   /// Default destructor.
-  ~ACE_Barrier ();
+  ~ACE_Barrier () = default;
 
   /// Block the caller until all @c count threads have called @c wait and
   /// then allow all the caller threads to continue in parallel.
@@ -166,7 +166,7 @@ public:
   ACE_Thread_Barrier (unsigned int count, const ACE_TCHAR *name = 0);
 
   /// Default destructor.
-  ~ACE_Thread_Barrier ();
+  ~ACE_Thread_Barrier () = default;
 
   /// Dump the state of an object.
   void dump () const;
@@ -177,10 +177,6 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__ACE_INLINE__)
-#include "ace/Barrier.inl"
-#endif /* __ACE_INLINE__ */
-
 #endif /* !ACE_HAS_THREADS */
 
 #include /**/ "ace/post.h"
diff --git a/ACE/ace/Barrier.inl b/ACE/ace/Barrier.inl
deleted file mode 100644
index 62cac458393..00000000000
--- a/ACE/ace/Barrier.inl
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- C++ -*-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-ACE_Sub_Barrier::~ACE_Sub_Barrier ()
-{
-}
-
-ACE_INLINE
-ACE_Barrier::~ACE_Barrier ()
-{
-}
-
-ACE_INLINE
-ACE_Thread_Barrier::~ACE_Thread_Barrier ()
-{
-}
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Base_Thread_Adapter.cpp b/ACE/ace/Base_Thread_Adapter.cpp
index 78731564b29..e44e295512b 100644
--- a/ACE/ace/Base_Thread_Adapter.cpp
+++ b/ACE/ace/Base_Thread_Adapter.cpp
@@ -51,10 +51,6 @@ ACE_Base_Thread_Adapter::ACE_Base_Thread_Adapter (
 #endif // ACE_USES_GPROF
 }
 
-ACE_Base_Thread_Adapter::~ACE_Base_Thread_Adapter ()
-{
-}
-
 void
 ACE_Base_Thread_Adapter::inherit_log_msg ()
 {
@@ -83,10 +79,6 @@ ACE_Base_Thread_Adapter::sync_log_msg (const ACE_TCHAR *prg)
     (*ACE_Base_Thread_Adapter::sync_log_msg_hook_) (prg);
 }
 
-ACE_OS_Thread_Descriptor::~ACE_OS_Thread_Descriptor ()
-{
-}
-
 ACE_OS_Thread_Descriptor *
 ACE_Base_Thread_Adapter::thr_desc_log_msg ()
 {
diff --git a/ACE/ace/Base_Thread_Adapter.h b/ACE/ace/Base_Thread_Adapter.h
index 9f4056afb30..5d9fc10ef2d 100644
--- a/ACE/ace/Base_Thread_Adapter.h
+++ b/ACE/ace/Base_Thread_Adapter.h
@@ -51,7 +51,7 @@ public:
   /// Get the thread creation flags.
   long flags () const;
 
-  virtual ~ACE_OS_Thread_Descriptor ();
+  virtual ~ACE_OS_Thread_Descriptor () = default;
 
 protected:
   /// For use by ACE_Thread_Descriptor.
@@ -87,7 +87,7 @@ class ACE_Service_Gestalt;
 class ACE_Export ACE_Base_Thread_Adapter
 {
 public:
-  virtual ~ACE_Base_Thread_Adapter ();
+  virtual ~ACE_Base_Thread_Adapter () = default;
 
   /// Virtual method invoked by the thread entry point.
   virtual ACE_THR_FUNC_RETURN invoke () = 0;
diff --git a/ACE/ace/Compression/Compressor.cpp b/ACE/ace/Compression/Compressor.cpp
index f2c31e1fe05..74ff168aa6e 100644
--- a/ACE/ace/Compression/Compressor.cpp
+++ b/ACE/ace/Compression/Compressor.cpp
@@ -14,10 +14,6 @@ ACE_Compressor::ACE_Compressor(ACE_CompressorId compressor_id,
     , uncompressed_bytes_   (0)
 {}
 
-ACE_Compressor::~ACE_Compressor ()
-{
-}
-
 ACE_UINT64
 ACE_Compressor::compressed_bytes() const
 {
diff --git a/ACE/ace/Compression/Compressor.h b/ACE/ace/Compression/Compressor.h
index 0ef800fe868..5bddb9cd696 100644
--- a/ACE/ace/Compression/Compressor.h
+++ b/ACE/ace/Compression/Compressor.h
@@ -103,7 +103,7 @@ public:
     */
   virtual void reset_stats();
 
-  virtual ~ACE_Compressor ();
+  virtual ~ACE_Compressor () = default;
 
 protected:
   ACE_Compressor(ACE_CompressorId compressor_id,
diff --git a/ACE/ace/Local_Tokens.cpp b/ACE/ace/Local_Tokens.cpp
index b429cbd12f8..2aedeb0b94c 100644
--- a/ACE/ace/Local_Tokens.cpp
+++ b/ACE/ace/Local_Tokens.cpp
@@ -56,16 +56,6 @@ ACE_Tokens::no_of_waiters ()
   return this->waiters_.size ();
 }
 
-#if defined (ACE_LACKS_INLINE_FUNCTIONS)
-ACE_Null_Token::ACE_Null_Token (void)
-{
-}
-
-ACE_Null_Token::~ACE_Null_Token (void)
-{
-}
-#endif /* ACE_LACKS_INLINE_FUNCTIONS */
-
 void
 ACE_TPQ_Entry::dump () const
 {
diff --git a/ACE/ace/Local_Tokens.h b/ACE/ace/Local_Tokens.h
index 2df0c741dff..e52695aff37 100644
--- a/ACE/ace/Local_Tokens.h
+++ b/ACE/ace/Local_Tokens.h
@@ -905,14 +905,11 @@ protected:
 class ACE_Export ACE_Null_Token : public ACE_Token_Proxy
 {
 public:
-#if defined (ACE_LACKS_INLINE_FUNCTIONS)
-  // @@ Hopefully, we can remove this ridicules ifdef when CE's compiler becomes more normal.
   /// Construction.
-  ACE_Null_Token (void);
+  ACE_Null_Token () = default;
 
   /// Destructor.
-  ~ACE_Null_Token (void);
-#endif /* ACE_LACKS_INLINE_FUNCTION */
+  ~ACE_Null_Token () = default;
 
   /// Acquire.
   virtual int acquire (int /* notify */ = 0,
diff --git a/ACE/ace/MEM_Addr.cpp b/ACE/ace/MEM_Addr.cpp
index 5c5082891f0..4ee10c5b663 100644
--- a/ACE/ace/MEM_Addr.cpp
+++ b/ACE/ace/MEM_Addr.cpp
@@ -54,10 +54,6 @@ ACE_MEM_Addr::ACE_MEM_Addr (u_short port_number)
   this->initialize_local (port_number);
 }
 
-ACE_MEM_Addr::~ACE_MEM_Addr ()
-{
-}
-
 int
 ACE_MEM_Addr::initialize_local (u_short port_number)
 {
diff --git a/ACE/ace/MEM_Addr.h b/ACE/ace/MEM_Addr.h
index a50c1fb737d..017756f0335 100644
--- a/ACE/ace/MEM_Addr.h
+++ b/ACE/ace/MEM_Addr.h
@@ -47,7 +47,7 @@ public:
   explicit ACE_MEM_Addr (const ACE_TCHAR port_name[]);
 
   /// Default dtor.
-  ~ACE_MEM_Addr (void);
+  ~ACE_MEM_Addr () = default;
 
   // = Direct initialization methods.
 
diff --git a/TAO/tests/OctetSeq/README b/TAO/tests/OctetSeq/README
index 972a78fc41f..a22f254c593 100644
--- a/TAO/tests/OctetSeq/README
+++ b/TAO/tests/OctetSeq/README
@@ -1,5 +1,3 @@
-
-
 = server, client
 
 	This test verifies that the optimizations for octet sequences