diff options
Diffstat (limited to 'TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp')
-rw-r--r-- | TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp index f835dcb6daa..071cd1d5a98 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp @@ -17,12 +17,10 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL) { this->proxy_ = - supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + supplier_admin->obtain_push_consumer (); RtecEventComm::PushSupplier_var me = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); // Simple publication, but usually the helper classes in // $TAO_ROOT/orbsvcs/Event_Utils.h are a better way to do this. @@ -37,17 +35,15 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin this->proxy_->connect_push_supplier (me.in (), qos ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) +Supplier::disconnect (void) { // Disconnect from the EC ACE_TRY { - this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->proxy_->disconnect_push_consumer (); } ACE_CATCHANY { @@ -55,17 +51,14 @@ Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) ACE_ENDTRY; PortableServer::POA_var poa = - this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_default_POA (); PortableServer::ObjectId_var id = poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK; poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void -Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL) +Supplier::perform_push (void) { ACE_TRY { @@ -78,7 +71,6 @@ Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL) event[0].header.ttl = 1; this->proxy_->push (event ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -87,7 +79,7 @@ Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL) } void -Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Supplier::disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } |