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/Logging/LogManager.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/Logging/LogManager.h')
| -rw-r--r-- | ACE/examples/APG/Logging/LogManager.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ACE/examples/APG/Logging/LogManager.h b/ACE/examples/APG/Logging/LogManager.h index d1689d7d3aa..523abff55d8 100644 --- a/ACE/examples/APG/Logging/LogManager.h +++ b/ACE/examples/APG/Logging/LogManager.h @@ -1,9 +1,8 @@ #include "ace/streams.h" - +#include "ace/Synch.h" +#include "ace/Singleton.h" #include "ace/Log_Msg.h" #include "ace/Log_Msg_Callback.h" -#include "ace/Singleton.h" -#include "ace/Synch_Traits.h" #ifndef LOG_MANAGER_H #define LOG_MANAGER_H @@ -93,7 +92,7 @@ LogManager::redirectToCallback (ACE_Log_Msg_Callback * callback) // Listing 2 // Listing 3 code/ch03 -typedef ACE_Singleton<LogManager, ACE_SYNCH_NULL_MUTEX> +typedef ACE_Singleton<LogManager, ACE_Null_Mutex> LogManagerSingleton; #define LOG_MANAGER LogManagerSingleton::instance() // Listing 3 |