summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp')
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp
index 9559eb9e68a..0dc6672b483 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp
@@ -19,7 +19,8 @@ TAO_Notify_SequencePushSupplier::~TAO_Notify_SequencePushSupplier ()
}
void
-TAO_Notify_SequencePushSupplier::init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/)
+TAO_Notify_SequencePushSupplier::init
+ (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL_NOT_USED)
{
this->default_POA_ = PortableServer::POA::_duplicate (poa);
}
@@ -31,27 +32,27 @@ TAO_Notify_SequencePushSupplier::get_proxy_consumer (void)
}
void
-TAO_Notify_SequencePushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequencePushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL)
{
CosNotifyComm::SequencePushSupplier_var supplier_ref =
- this->_this (ACE_TRY_ENV);
+ this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
- supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_consumer_id_, ACE_TRY_ENV);
+ supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
// narrow
this->proxy_consumer_ =
- CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow (proxyconsumer.in (), ACE_TRY_ENV);
+ CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
- proxy_consumer_->connect_sequence_push_supplier (supplier_ref.in (),
- ACE_TRY_ENV);
+ proxy_consumer_->connect_sequence_push_supplier (supplier_ref.in ()
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
// give ownership to POA
@@ -59,22 +60,21 @@ TAO_Notify_SequencePushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_p
}
void
-TAO_Notify_SequencePushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequencePushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
{
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
- this->proxy_consumer_->disconnect_sequence_push_consumer(ACE_TRY_ENV);
+ this->proxy_consumer_->disconnect_sequence_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- this->deactivate (ACE_TRY_ENV);
+ this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
}
void
-TAO_Notify_SequencePushSupplier::subscription_change (
- const CosNotification::EventTypeSeq & /*added*/,
- const CosNotification::EventTypeSeq & /*removed */,
- CORBA::Environment & //ACE_TRY_ENV
- )
+TAO_Notify_SequencePushSupplier::subscription_change
+ (const CosNotification::EventTypeSeq & /*added*/,
+ const CosNotification::EventTypeSeq & /*removed */
+ TAO_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((
CORBA::SystemException,
CosNotifyComm::InvalidEventType
@@ -84,45 +84,45 @@ TAO_Notify_SequencePushSupplier::subscription_change (
}
PortableServer::POA_ptr
-TAO_Notify_SequencePushSupplier::_default_POA (CORBA::Environment& /* env */)
+TAO_Notify_SequencePushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* env */)
{
return PortableServer::POA::_duplicate (this->default_POA_.in ());
}
void
-TAO_Notify_SequencePushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequencePushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
{
PortableServer::POA_var poa =
this->_default_POA ();
PortableServer::ObjectId_var id =
- poa->servant_to_id (this,
- ACE_TRY_ENV);
+ poa->servant_to_id (this
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
- poa->deactivate_object (id.in (),
- ACE_TRY_ENV);
+ poa->deactivate_object (id.in ()
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
}
void
TAO_Notify_SequencePushSupplier::disconnect_sequence_push_supplier (
- CORBA::Environment &ACE_TRY_ENV
+ TAO_ENV_SINGLE_ARG_DECL
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- this->proxy_consumer_->disconnect_sequence_push_consumer (ACE_TRY_ENV);
+ this->proxy_consumer_->disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- this->deactivate (ACE_TRY_ENV);
+ this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
}
void
-TAO_Notify_SequencePushSupplier::send_events (const CosNotification::EventBatch & notifications, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequencePushSupplier::send_events (const CosNotification::EventBatch & notifications TAO_ENV_ARG_DECL)
{
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
- this->proxy_consumer_->push_structured_events (notifications, ACE_TRY_ENV);
+ this->proxy_consumer_->push_structured_events (notifications TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
}