summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp')
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index 774f3177df8..80f15496418 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -12,41 +12,41 @@ CEC_Counting_Supplier::CEC_Counting_Supplier (void)
void
CEC_Counting_Supplier::connect (
- CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
- CORBA::Environment &ACE_TRY_ENV)
+ CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
+ TAO_ENV_ARG_DECL)
{
CosEventComm::PushSupplier_var supplier =
- this->_this (ACE_TRY_ENV);
+ this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
if (CORBA::is_nil (this->consumer_proxy_.in ()))
{
this->consumer_proxy_ =
- supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+ supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
}
- this->consumer_proxy_->connect_push_supplier (supplier.in (),
- ACE_TRY_ENV);
+ this->consumer_proxy_->connect_push_supplier (supplier.in ()
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
}
void
-CEC_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+CEC_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
{
if (!CORBA::is_nil (this->consumer_proxy_.in ()))
{
- this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+ this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
}
PortableServer::POA_var supplier_poa =
- this->_default_POA (ACE_TRY_ENV);
+ this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
PortableServer::ObjectId_var supplier_id =
- supplier_poa->servant_to_id (this, ACE_TRY_ENV);
+ supplier_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
- supplier_poa->deactivate_object (supplier_id.in (), ACE_TRY_ENV);
+ supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
this->consumer_proxy_ =
@@ -54,8 +54,8 @@ CEC_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
}
void
-CEC_Counting_Supplier::push (const CORBA::Any&,
- CORBA::Environment &ACE_TRY_ENV)
+CEC_Counting_Supplier::push (const CORBA::Any&
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -64,13 +64,13 @@ CEC_Counting_Supplier::push (const CORBA::Any&,
CORBA::Any event;
event <<= CORBA::Long(0);
- this->consumer_proxy_->push (event, ACE_TRY_ENV);
+ this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
this->event_count++;
}
void
-CEC_Counting_Supplier::disconnect_push_supplier (CORBA::Environment &)
+CEC_Counting_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->disconnect_count++;
@@ -95,7 +95,7 @@ CEC_Counting_Supplier_Task::svc ()
{
ACE_TRY_NEW_ENV
{
- this->run (ACE_TRY_ENV);
+ this->run (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -120,14 +120,14 @@ CEC_Counting_Supplier_Task::push_count (void)
}
void
-CEC_Counting_Supplier_Task::run (CORBA::Environment &ACE_TRY_ENV)
+CEC_Counting_Supplier_Task::run (TAO_ENV_SINGLE_ARG_DECL)
{
CORBA::Any event;
event <<= CORBA::Long(0);
int stop = 0;
do {
- this->supplier_->push (event, ACE_TRY_ENV);
+ this->supplier_->push (event TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
if (this->milliseconds_ != 0)
@@ -159,41 +159,41 @@ CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier (void)
void
CEC_Pull_Counting_Supplier::connect (
- CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
- CORBA::Environment &ACE_TRY_ENV)
+ CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
+ TAO_ENV_ARG_DECL)
{
CosEventComm::PullSupplier_var supplier =
- this->_this (ACE_TRY_ENV);
+ this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
if (CORBA::is_nil (this->consumer_proxy_.in ()))
{
this->consumer_proxy_ =
- supplier_admin->obtain_pull_consumer (ACE_TRY_ENV);
+ supplier_admin->obtain_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
}
- this->consumer_proxy_->connect_pull_supplier (supplier.in (),
- ACE_TRY_ENV);
+ this->consumer_proxy_->connect_pull_supplier (supplier.in ()
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
}
void
-CEC_Pull_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+CEC_Pull_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
{
if (!CORBA::is_nil (this->consumer_proxy_.in ()))
{
- this->consumer_proxy_->disconnect_pull_consumer (ACE_TRY_ENV);
+ this->consumer_proxy_->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
}
PortableServer::POA_var supplier_poa =
- this->_default_POA (ACE_TRY_ENV);
+ this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
PortableServer::ObjectId_var supplier_id =
- supplier_poa->servant_to_id (this, ACE_TRY_ENV);
+ supplier_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
- supplier_poa->deactivate_object (supplier_id.in (), ACE_TRY_ENV);
+ supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
this->consumer_proxy_ =
@@ -201,7 +201,7 @@ CEC_Pull_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
}
CORBA::Any*
-CEC_Pull_Counting_Supplier::pull (CORBA::Environment &ACE_TRY_ENV)
+CEC_Pull_Counting_Supplier::pull (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
{
if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -221,8 +221,8 @@ CEC_Pull_Counting_Supplier::pull (CORBA::Environment &ACE_TRY_ENV)
}
CORBA::Any*
-CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event,
- CORBA::Environment &ACE_TRY_ENV)
+CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
{
if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -247,7 +247,7 @@ CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event,
}
void
-CEC_Pull_Counting_Supplier::disconnect_pull_supplier (CORBA::Environment &)
+CEC_Pull_Counting_Supplier::disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->disconnect_count++;
View Lorry Controller Status