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/OS_NS_Thread.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/OS_NS_Thread.h')
| -rw-r--r-- | ACE/ace/OS_NS_Thread.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h index 9419f1d0812..5a1da97c9df 100644 --- a/ACE/ace/OS_NS_Thread.h +++ b/ACE/ace/OS_NS_Thread.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= @@ -2030,9 +2028,8 @@ protected: /// Keeps track of whether we acquired the lock or failed. int owner_; - // = Prevent assignment and initialization. - ACE_OS_Thread_Mutex_Guard &operator= (const ACE_OS_Thread_Mutex_Guard &); - ACE_OS_Thread_Mutex_Guard (const ACE_OS_Thread_Mutex_Guard &); + ACE_OS_Thread_Mutex_Guard &operator= (const ACE_OS_Thread_Mutex_Guard &) = delete; + ACE_OS_Thread_Mutex_Guard (const ACE_OS_Thread_Mutex_Guard &) = delete; }; /** @@ -2075,11 +2072,8 @@ protected: /// Keeps track of whether we acquired the lock or failed. int owner_; - // = Prevent assignment and initialization. - ACE_OS_Recursive_Thread_Mutex_Guard &operator= ( - const ACE_OS_Recursive_Thread_Mutex_Guard &); - ACE_OS_Recursive_Thread_Mutex_Guard ( - const ACE_OS_Recursive_Thread_Mutex_Guard &); + ACE_OS_Recursive_Thread_Mutex_Guard &operator= (const ACE_OS_Recursive_Thread_Mutex_Guard &) = delete; + ACE_OS_Recursive_Thread_Mutex_Guard (const ACE_OS_Recursive_Thread_Mutex_Guard &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL |