diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-09 18:44:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-09 18:44:09 +0100 |
commit | b0a0b92a0ee6bb248700d6ff4e7c51cc44db198f (patch) | |
tree | f78fc5b7b2ea337ffc306a77223018fcc780e507 /ACE/ace/Null_Condition.h | |
parent | 199259c5d2d5f4a6550382a683f5d54ac482fcd1 (diff) | |
parent | adc1dcda981a4c76612bedeba2dddb76aa272d6f (diff) | |
download | ATCD-b0a0b92a0ee6bb248700d6ff4e7c51cc44db198f.tar.gz |
Merge pull request #1446 from jwillemsen/jwi-cpp11cleanup
Various cleanup and use of C++11 features
Diffstat (limited to 'ACE/ace/Null_Condition.h')
-rw-r--r-- | ACE/ace/Null_Condition.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ACE/ace/Null_Condition.h b/ACE/ace/Null_Condition.h index bf4d4313a4e..db68b6c0e0a 100644 --- a/ACE/ace/Null_Condition.h +++ b/ACE/ace/Null_Condition.h @@ -4,8 +4,6 @@ /** * @file Null_Condition.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -49,7 +47,7 @@ public: void * = 0) : mutex_ ((ACE_Null_Mutex &) m) {} - ~ACE_Condition () {} + ~ACE_Condition () = default; /// Returns 0. int remove () {return 0;} @@ -78,9 +76,8 @@ protected: ACE_Null_Mutex &mutex_; // Reference to mutex lock. private: - // = Prevent assignment and initialization. - void operator= (const ACE_Condition<ACE_Null_Mutex> &); - ACE_Condition (const ACE_Condition<ACE_Null_Mutex> &); + void operator= (const ACE_Condition<ACE_Null_Mutex> &) = delete; + ACE_Condition (const ACE_Condition<ACE_Null_Mutex> &) = delete; }; typedef ACE_Condition<ACE_Null_Mutex> ACE_Null_Condition; |