summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp')
-rw-r--r--TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp
index 99dfd39610d..2212b38dab9 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp
@@ -17,10 +17,10 @@ ECS_Supplier::ECS_Supplier (void)
void
ECS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+ ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
{
@@ -29,12 +29,12 @@ ECS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
return;
this->proxy_consumer_ =
- supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+ supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
}
RtecEventComm::PushSupplier_var supplier =
- this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
RtecEventChannelAdmin::SupplierQOS supplier_qos;
@@ -46,12 +46,12 @@ ECS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
this->proxy_consumer_->connect_push_supplier (supplier.in (),
supplier_qos
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
}
void
-ECS_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECS_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
{
RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
{
@@ -63,23 +63,23 @@ ECS_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
ACE_TRY
{
- proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+ proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY {} ACE_ENDTRY;
- PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+ PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
PortableServer::ObjectId_var id = poa->servant_to_id (this
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
- poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+ poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
}
void
ECS_Supplier::push (const RtecEventComm::EventSet &events
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -89,12 +89,12 @@ ECS_Supplier::push (const RtecEventComm::EventSet &events
return;
proxy = this->proxy_consumer_;
}
- proxy->push (events TAO_ENV_ARG_PARAMETER);
+ proxy->push (events ACE_ENV_ARG_PARAMETER);
}
void
-ECS_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECS_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);