diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-11-17 14:07:57 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-11-17 14:07:57 +0100 |
| commit | 970acaf766896175cd61f35d0ca88cdc9c57ebbf (patch) | |
| tree | 88a366282fadba1364221de8147dae8f1b308d11 /ACE/ace/Event_Handler.h | |
| parent | 7ff048403bb2b42c774d7a2ae01ef4a1a2f33b20 (diff) | |
| parent | 1192c46b40da9e5a2d8f06d9d8c700871a072188 (diff) | |
| download | ATCD-970acaf766896175cd61f35d0ca88cdc9c57ebbf.tar.gz | |
Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master
Diffstat (limited to 'ACE/ace/Event_Handler.h')
| -rw-r--r-- | ACE/ace/Event_Handler.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ACE/ace/Event_Handler.h b/ACE/ace/Event_Handler.h index 3dc5f1f8e1b..6d70762a04a 100644 --- a/ACE/ace/Event_Handler.h +++ b/ACE/ace/Event_Handler.h @@ -19,9 +19,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/os_include/os_signal.h" -#include "ace/Atomic_Op.h" #include "ace/OS_NS_Thread.h" -#include "ace/Synch_Traits.h" +#include <atomic> ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -286,7 +285,7 @@ protected: int priority = ACE_Event_Handler::LO_PRIORITY); /// Typedef for implementation of reference counting. - typedef ACE_Atomic_Op<ACE_SYNCH_MUTEX, Reference_Count> Atomic_Reference_Count; + typedef std::atomic<Reference_Count> Atomic_Reference_Count; /// Reference count. Atomic_Reference_Count reference_count_; |