diff options
Diffstat (limited to 'tests/Bug_3531_Regression/test_i.cpp')
| -rw-r--r-- | tests/Bug_3531_Regression/test_i.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/Bug_3531_Regression/test_i.cpp b/tests/Bug_3531_Regression/test_i.cpp index 6485df08911..fba6b1837aa 100644 --- a/tests/Bug_3531_Regression/test_i.cpp +++ b/tests/Bug_3531_Regression/test_i.cpp @@ -2,7 +2,6 @@ #include "test_i.h" #include "tao/debug.h" -#include "ace/OS.h" #include "tao/ORB_Core.h" #include "tao/LF_Strategy.h" #include "ace/Reactor.h" @@ -11,8 +10,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Bug_2494_Regression, test_i, "$Id$") - char * Simple_Server_i::test_method (Simple_Server_ptr objref) { @@ -26,7 +23,7 @@ Simple_Server_i::test_method (Simple_Server_ptr objref) try { { - ACE_Guard<TAO_SYNCH_MUTEX> guard (this->lock_); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); if (!this->timer_registed_) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Scheduling timeout...\n")); @@ -54,7 +51,7 @@ Simple_Server_i::test_method (Simple_Server_ptr objref) void Simple_Server_i::client_done () { - ACE_Guard<TAO_SYNCH_MUTEX> guard (this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); ACE_DEBUG ((LM_DEBUG, "(%P|%t) Simple_Server_i::client_done () called\n")); this->cond_.signal (); } @@ -63,7 +60,7 @@ int Simple_Server_i::handle_timeout (const ACE_Time_Value &, const void *) { - ACE_Guard<TAO_SYNCH_MUTEX> guard (this->lock_); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); // We are the (client) leader. Signal the leader-follower pattern to // elect a new leader TAO_ORB_Core *oc = orb_->orb_core(); |