summaryrefslogtreecommitdiff
path: root/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
diff options
context:
space:
mode:
Diffstat (limited to 'tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl')
-rw-r--r--tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl9
1 files changed, 5 insertions, 4 deletions
diff --git a/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl b/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
index f4c5a1380c1..2f142716d5d 100644
--- a/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
+++ b/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
@@ -1,7 +1,8 @@
// -*- C++ -*-
-//
// $Id$
+#include "ace/Guard_T.h"
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_INLINE
@@ -22,7 +23,7 @@ ACE_INLINE
bool
TAO::CSD::TP_Synch_Helper::wait_while_pending()
{
- GuardType guard(this->lock_);
+ ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, false);
while (this->state_ == PENDING)
{
@@ -37,7 +38,7 @@ ACE_INLINE
void
TAO::CSD::TP_Synch_Helper::dispatched()
{
- GuardType guard(this->lock_);
+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
this->state_ = DISPATCHED;
this->condition_.signal();
}
@@ -47,7 +48,7 @@ ACE_INLINE
void
TAO::CSD::TP_Synch_Helper::cancelled()
{
- GuardType guard(this->lock_);
+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_);
this->state_ = CANCELLED;
this->condition_.signal();
}