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/ace/Condition_Recursive_Thread_Mutex.cpp | |
parent | bd5aaab0e6022781ff8fdb383ea75ae3ecc3b17d (diff) | |
download | ATCD-8390b59170b1b66bdda62f2c0bd544fb8baf8b6b.tar.gz |
Revert "some (bundled) minor changes (take 2)"revert-176-master
Diffstat (limited to 'ACE/ace/Condition_Recursive_Thread_Mutex.cpp')
-rw-r--r-- | ACE/ace/Condition_Recursive_Thread_Mutex.cpp | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp index 763f08154de..2f68f8c8b36 100644 --- a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp +++ b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp @@ -12,15 +12,15 @@ #if defined (ACE_HAS_THREADS) -#if !defined (__ACE_INLINE__) -#include "ace/Condition_Recursive_Thread_Mutex.inl" -#endif /* __ACE_INLINE__ */ - #include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_ALLOC_HOOK_DEFINE (ACE_Condition<ACE_Recursive_Thread_Mutex>) +int +ACE_Condition<ACE_Recursive_Thread_Mutex>::remove (void) +{ + return ACE_OS::cond_destroy (&this->cond_); +} void ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const @@ -37,6 +37,11 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const #endif /* ACE_HAS_DUMP */ } +ACE_Condition<ACE_Recursive_Thread_Mutex>::~ACE_Condition (void) +{ + this->remove (); +} + ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition (ACE_Recursive_Thread_Mutex &m) : mutex_ (m) { @@ -55,11 +60,6 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition (ACE_Recursive_Thread_M ACE_TEXT ("ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition<ACE_Recursive_Thread_Mutex>"))); } -ACE_Condition<ACE_Recursive_Thread_Mutex>::~ACE_Condition (void) -{ - this->remove (); -} - int ACE_Condition<ACE_Recursive_Thread_Mutex>::wait (const ACE_Time_Value *abstime) { @@ -108,6 +108,24 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::wait (ACE_Recursive_Thread_Mutex &mut return result; } +int +ACE_Condition<ACE_Recursive_Thread_Mutex>::signal (void) +{ + return ACE_OS::cond_signal (&this->cond_); +} + +int +ACE_Condition<ACE_Recursive_Thread_Mutex>::broadcast (void) +{ + return ACE_OS::cond_broadcast (&this->cond_); +} + +ACE_Recursive_Thread_Mutex & +ACE_Condition<ACE_Recursive_Thread_Mutex>::mutex (void) +{ + return this->mutex_; +} + ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_THREADS */ |