diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-10-12 15:59:10 +0200 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-10-12 15:59:10 +0200 |
commit | 59faca133037343c33432677bd5cd5eec72aa522 (patch) | |
tree | f556ca8f8ad8ba5c5902fc6243b2f29261f22e79 /ACE/ace | |
parent | 9084da95c561f11fc84e449e4e19324eecddda1e (diff) | |
download | ATCD-59faca133037343c33432677bd5cd5eec72aa522.tar.gz |
Make use of default destructor
* ACE/ace/Barrier.inl:
Deleted.
* ACE/ace/Barrier.cpp:
* ACE/ace/Barrier.h:
* ACE/ace/Base_Thread_Adapter.cpp:
* ACE/ace/Base_Thread_Adapter.h:
* ACE/ace/Compression/Compressor.cpp:
* ACE/ace/Compression/Compressor.h:
Diffstat (limited to 'ACE/ace')
-rw-r--r-- | ACE/ace/Barrier.cpp | 4 | ||||
-rw-r--r-- | ACE/ace/Barrier.h | 10 | ||||
-rw-r--r-- | ACE/ace/Barrier.inl | 19 | ||||
-rw-r--r-- | ACE/ace/Base_Thread_Adapter.cpp | 8 | ||||
-rw-r--r-- | ACE/ace/Base_Thread_Adapter.h | 4 | ||||
-rw-r--r-- | ACE/ace/Compression/Compressor.cpp | 4 | ||||
-rw-r--r-- | ACE/ace/Compression/Compressor.h | 2 |
7 files changed, 6 insertions, 45 deletions
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, |