diff options
| author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-25 18:04:11 +0000 |
|---|---|---|
| committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-01-25 18:04:11 +0000 |
| commit | c979767a00db4ea1299af482033a68829cc16675 (patch) | |
| tree | 3e959cad0a053f1adad663e7c02bc7a239f383d8 /TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp | |
| parent | 0f3847bc7fd735ab88276fee59e2ebd6cb8d1f99 (diff) | |
| download | ATCD-c979767a00db4ea1299af482033a68829cc16675.tar.gz | |
ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp')
| -rw-r--r-- | TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp index 6576372a4f5..3b05553e724 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp @@ -14,8 +14,7 @@ Consumer::Consumer (void) } void -Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin - ACE_ENV_ARG_DECL) +Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin) { this->proxy_ = consumer_admin->obtain_push_supplier (); @@ -39,23 +38,21 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin h1.type = ACE_ES_EVENT_UNDEFINED; // first free event type h1.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK - this->proxy_->connect_push_consumer (me.in (), qos - ACE_ENV_ARG_PARAMETER); + this->proxy_->connect_push_consumer (me.in (), qos); } void Consumer::disconnect (void) { - ACE_TRY + try { // Disconnect from the proxy this->proxy_->disconnect_push_supplier (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore exceptions } - ACE_ENDTRY; this->proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); // Deactivate this object @@ -63,14 +60,13 @@ Consumer::disconnect (void) this->_default_POA (); // Get the Object Id used for the servant.. PortableServer::ObjectId_var oid = - poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (this); // Deactivate the object - poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in ()); } void -Consumer::push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL_NOT_USED) +Consumer::push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) |