diff options
| author | Johnny Willemsen <jwillemsen@users.noreply.github.com> | 2016-10-31 16:30:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-31 16:30:31 +0100 |
| commit | 8390b59170b1b66bdda62f2c0bd544fb8baf8b6b (patch) | |
| tree | 592d4c3e0feb26a13c6285ae208f272d4a660e60 /ACE/examples/APG/Timers/TimerDispatcher.h | |
| parent | bd5aaab0e6022781ff8fdb383ea75ae3ecc3b17d (diff) | |
| download | ATCD-revert-176-master.tar.gz | |
Revert "some (bundled) minor changes (take 2)"revert-176-master
Diffstat (limited to 'ACE/examples/APG/Timers/TimerDispatcher.h')
| -rw-r--r-- | ACE/examples/APG/Timers/TimerDispatcher.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ACE/examples/APG/Timers/TimerDispatcher.h b/ACE/examples/APG/Timers/TimerDispatcher.h index e587ab6fb05..06ce42a8d8a 100644 --- a/ACE/examples/APG/Timers/TimerDispatcher.h +++ b/ACE/examples/APG/Timers/TimerDispatcher.h @@ -2,10 +2,9 @@ #if !defined(TIMER_DISPATCHER_H) #define TIMER_DISPATCHER_H -#include "ace/Event.h" #include "ace/Event_Handler.h" #include "ace/Singleton.h" -#include "ace/Synch_Traits.h" +#include "ace/Synch.h" // needed for ACE_Event #include "ace/Timer_Queue.h" // Listing 1 code/ch20 @@ -32,7 +31,7 @@ private: ACE_Event timer_; }; -typedef ACE_Singleton<Timer_Dispatcher, ACE_SYNCH_NULL_MUTEX> Timer; +typedef ACE_Singleton<Timer_Dispatcher, ACE_Null_Mutex> Timer; // Listing 1 #endif /*TIMER_DISPATCHER_H*/ |