summaryrefslogtreecommitdiff
path: root/TAO/performance-tests/Throughput/Receiver.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/performance-tests/Throughput/Receiver.cpp')
-rw-r--r--TAO/performance-tests/Throughput/Receiver.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp
index cead7402c5c..71850aaee22 100644
--- a/TAO/performance-tests/Throughput/Receiver.cpp
+++ b/TAO/performance-tests/Throughput/Receiver.cpp
@@ -17,8 +17,7 @@ Receiver::Receiver (void)
}
void
-Receiver::receive_data (const Test::Message &the_message
- ACE_ENV_ARG_DECL_NOT_USED)
+Receiver::receive_data (const Test::Message &the_message)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -45,7 +44,7 @@ Receiver::receive_data (const Test::Message &the_message
}
void
-Receiver::done (ACE_ENV_SINGLE_ARG_DECL)
+Receiver::done (void)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->message_count_ == 0)
@@ -85,15 +84,12 @@ Receiver::done (ACE_ENV_SINGLE_ARG_DECL)
}
}
- ACE_TRY
+ try
{
- PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ PortableServer::POA_var poa = this->_default_POA ();
PortableServer::ObjectId_var oid =
- poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ poa->servant_to_id (this);
+ poa->deactivate_object (oid.in ());
}
- ACE_CATCHANY {} ACE_ENDTRY;
+ catch (const CORBA::Exception&){}
}