diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-08-27 14:01:01 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-08-27 14:01:01 +0000 |
| commit | 44ee8d6ea26b81f14b0c84cb79467d037516a445 (patch) | |
| tree | 1de167b1de670239b07e030a0242a9b779a3ceb0 /TAO/tests/Bug_2417_Regression | |
| parent | b710b11750d0f21d10c082f1337d5e9326a0b0c3 (diff) | |
| download | ATCD-44ee8d6ea26b81f14b0c84cb79467d037516a445.tar.gz | |
Fri Aug 27 12:50:13 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/Notify/Refcountable.cpp:
* examples/Advanced/ch_21/server.cpp:
* orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp:
* orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:
* orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
* orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp:
* orbsvcs/orbsvcs/Notify/Consumer.cpp:
* orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp:
* orbsvcs/orbsvcs/Notify/Random_File.cpp:
* orbsvcs/orbsvcs/Notify/Routing_Slip.cpp:
* orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp:
* orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp:
* orbsvcs/tests/Bug_2925_Regression/client.cpp:
* tao/Transport.cpp:
* tests/Bug_1254_Regression/Bug_1254_Regression.mpc:
* tests/Bug_2417_Regression/publisher_impl.cpp:
* tests/Bug_2654_Regression/Bug_2654_Regression.mpc:
* tests/Bug_2654_Regression/Hello.h:
* tests/Bug_2654_Regression/Hello.idl:
* tests/Bug_2654_Regression/Hello.cpp:
* tests/Bug_2654_Regression/client.cpp:
* tests/Bug_2654_Regression/server.cpp:
* tests/Bug_3531_Regression/test_i.cpp:
* tests/Bug_3812_Regression/Bug_3812_Regression.cpp:
* tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc:
* tests/Optimized_Connection/Optimized_Connection.mpc:
* tests/POA/EndpointPolicy/EndpointPolicy.mpc:
Use ACE_GUARD macro, use %B for logging a size_t, layout and cleanup
Diffstat (limited to 'TAO/tests/Bug_2417_Regression')
| -rw-r--r-- | TAO/tests/Bug_2417_Regression/publisher_impl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp index 87e84cd8eda..d3d33dccd2e 100644 --- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp +++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp @@ -44,7 +44,7 @@ Publisher_impl::Worker::~Worker() void Publisher_impl::Worker::addSubscriber(Subscriber_ptr subscriber) { - ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex); subscribers.push_back(_Subscriber()); _Subscriber& s = subscribers.back(); s.unsubscribed = false; @@ -64,7 +64,7 @@ int Publisher_impl::Worker::svc (void) data += 0.01; ++iteration; { - ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex); doShutdown = subscribers.size() > 0; for (vector<_Subscriber>::iterator iter = subscribers.begin(); iter != subscribers.end(); ++iter) @@ -89,7 +89,7 @@ int Publisher_impl::Worker::svc (void) } if (iteration % 200 == 0) { - ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex); for (vector<_Subscriber>::iterator iter = subscribers.begin(); iter != subscribers.end(); ++iter) { |