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/protocols/ace/TMCast/TransactionController.hpp | |
parent | bd5aaab0e6022781ff8fdb383ea75ae3ecc3b17d (diff) | |
download | ATCD-8390b59170b1b66bdda62f2c0bd544fb8baf8b6b.tar.gz |
Revert "some (bundled) minor changes (take 2)"revert-176-master
Diffstat (limited to 'ACE/protocols/ace/TMCast/TransactionController.hpp')
-rw-r--r-- | ACE/protocols/ace/TMCast/TransactionController.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/protocols/ace/TMCast/TransactionController.hpp b/ACE/protocols/ace/TMCast/TransactionController.hpp index 57c601749ba..43ff7a9ee8c 100644 --- a/ACE/protocols/ace/TMCast/TransactionController.hpp +++ b/ACE/protocols/ace/TMCast/TransactionController.hpp @@ -1,9 +1,9 @@ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -#include "ace/Bound_Ptr.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdlib.h" -#include "ace/Synch_Traits.h" +#include "ace/Synch.h" +#include "ace/Bound_Ptr.h" #include "Protocol.hpp" #include "Messaging.hpp" @@ -366,7 +366,7 @@ namespace ACE_TMCast private: // FUZZ: disable check_for_ACE_Guard - typedef ACE_Guard<ACE_SYNCH_MUTEX> AutoLock; + typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; // FUZZ: enable check_for_ACE_Guard // bool trace_; |