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/tests/Recursive_Condition_Test.cpp | |
| parent | bd5aaab0e6022781ff8fdb383ea75ae3ecc3b17d (diff) | |
| download | ATCD-revert-176-master.tar.gz | |
Revert "some (bundled) minor changes (take 2)"revert-176-master
Diffstat (limited to 'ACE/tests/Recursive_Condition_Test.cpp')
| -rw-r--r-- | ACE/tests/Recursive_Condition_Test.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ACE/tests/Recursive_Condition_Test.cpp b/ACE/tests/Recursive_Condition_Test.cpp index da75b000977..cfda711b41e 100644 --- a/ACE/tests/Recursive_Condition_Test.cpp +++ b/ACE/tests/Recursive_Condition_Test.cpp @@ -11,16 +11,17 @@ */ //============================================================================= + +#include "test_config.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_sys_time.h" #include "ace/Event_Handler.h" #include "ace/Log_Msg.h" -#include "ace/OS_NS_sys_time.h" -#include "ace/OS_NS_unistd.h" -#include "ace/Synch.h" #include "ace/Thread_Manager.h" #include "ace/Timer_Heap.h" #include "ace/Timer_Queue_Adapters.h" -#include "test_config.h" + #if defined (ACE_HAS_THREADS) @@ -59,7 +60,7 @@ private: // These are for the basic functionality tests. ACE_SYNCH_RECURSIVE_MUTEX mutex_; -ACE_SYNCH_RECURSIVE_CONDITION condition_ (mutex_); +ACE_Condition<ACE_SYNCH_RECURSIVE_MUTEX> condition_ (mutex_); // Test driver sets this to non-zero before spawning and to zero for // waiter. int protected_int = 0; |