diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp | 1275 |
1 files changed, 632 insertions, 643 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 5c289498b2d..f48848f066c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -70,8 +70,8 @@ TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (void) // Stop the transfer of data of the stream // Empty the_spec means apply operation to all flows void -TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) +TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { @@ -90,7 +90,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec, if (this->flow_connection_map_.find (flow_name_key, flow_connection_entry) == 0) { - flow_connection_entry->int_id_->stop (ACE_TRY_ENV); + flow_connection_entry->int_id_->stop (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -101,7 +101,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec, FlowConnection_Map_Entry *entry = 0; for (;iterator.next (entry) != 0;iterator.advance ()) { - entry->int_id_->stop (ACE_TRY_ENV); + entry->int_id_->stop (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -119,8 +119,8 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec, // Start the transfer of data in the stream. // Empty the_spec means apply operation to all flows void -TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) +TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { @@ -140,7 +140,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec, if (this->flow_connection_map_.find (flow_name_key, flow_connection_entry) == 0) { - flow_connection_entry->int_id_->start (ACE_TRY_ENV); + flow_connection_entry->int_id_->start (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -151,7 +151,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec, FlowConnection_Map_Entry *entry = 0; for (;iterator.next (entry) != 0;iterator.advance ()) { - entry->int_id_->start (ACE_TRY_ENV); + entry->int_id_->start (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -171,8 +171,8 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec, // the_spec means apply operation to all flows void -TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) +TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { @@ -190,7 +190,7 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec, FlowConnection_Map::ENTRY *flow_connection_entry = 0; if (this->flow_connection_map_.find (flow_name_key, flow_connection_entry) == 0) { - flow_connection_entry->int_id_->destroy (ACE_TRY_ENV); + flow_connection_entry->int_id_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -202,7 +202,7 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec, FlowConnection_Map_Entry *entry = 0; for (;iterator.next (entry) != 0;iterator.advance ()) { - entry->int_id_->destroy (ACE_TRY_ENV); + entry->int_id_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -221,8 +221,8 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec, // Empty the_spec means apply operation to all flows CORBA::Boolean TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & new_qos, - const AVStreams::flowSpec &flowspec, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec &flowspec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) @@ -230,12 +230,12 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & new_qos, ACE_TRY { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_Basic_StreamCtrl::modify_QoS\n")); - + ACE_DEBUG ((LM_DEBUG, + "TAO_Basic_StreamCtrl::modify_QoS\n")); + AVStreams::flowSpec in_flowspec; AVStreams::flowSpec out_flowspec; - + in_flowspec.length (0); out_flowspec.length (0); @@ -243,34 +243,34 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & new_qos, int out_index = 0; for (u_int i=0;i < flowspec.length ();i++) - { - TAO_Forward_FlowSpec_Entry entry; - entry.parse (flowspec [i].in ()); - int direction = entry.direction (); - if (direction == 0) - { - in_flowspec.length (in_index + 1); - in_flowspec [in_index++] = CORBA::string_dup (entry.entry_to_string ()); - } - else - { - out_flowspec.length (out_index + 1); - out_flowspec [out_index++] = CORBA::string_dup (entry.entry_to_string ()); - } - } + { + TAO_Forward_FlowSpec_Entry entry; + entry.parse (flowspec [i].in ()); + int direction = entry.direction (); + if (direction == 0) + { + in_flowspec.length (in_index + 1); + in_flowspec [in_index++] = CORBA::string_dup (entry.entry_to_string ()); + } + else + { + out_flowspec.length (out_index + 1); + out_flowspec [out_index++] = CORBA::string_dup (entry.entry_to_string ()); + } + } if (in_flowspec.length () != 0) - { - this->vdev_a_->modify_QoS (new_qos, in_flowspec, ACE_TRY_ENV); - ACE_TRY_CHECK; - } + { + this->vdev_a_->modify_QoS (new_qos, in_flowspec TAO_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } if (out_flowspec.length () != 0) - { - this->vdev_b_->modify_QoS (new_qos, out_flowspec, ACE_TRY_ENV); - ACE_TRY_CHECK; - } - } + { + this->vdev_b_->modify_QoS (new_qos, out_flowspec TAO_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::modify_QoS"); @@ -284,8 +284,8 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & new_qos, // Used by StreamEndPoint and VDev to inform StreamCtrl of events. // E.g., loss of flow, reestablishment of flow, etc.. void -TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/, - CORBA::Environment & /* ACE_TRY_ENV */) +TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/ + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -296,8 +296,8 @@ TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*t void TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec, const char *fp_name, - const CORBA::Any &fp_settings, - CORBA::Environment &ACE_TRY_ENV) + const CORBA::Any &fp_settings + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::FPError)) @@ -305,15 +305,15 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec, { if (!CORBA::is_nil (this->sep_a_.in ())) { - this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings, ACE_TRY_ENV); + this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } // Gets the flow connection. CORBA::Object_ptr -TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name, - CORBA::Environment &ACE_TRY_ENV) +TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::notSupported)) @@ -329,8 +329,8 @@ TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name, // Sets the flow connection. void TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name, - CORBA::Object_ptr flow_connection_obj, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr flow_connection_obj + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::notSupported)) @@ -338,7 +338,7 @@ TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name, AVStreams::FlowConnection_ptr flow_connection = AVStreams::FlowConnection::_nil (); ACE_TRY { - flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj, ACE_TRY_ENV); + flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -370,12 +370,12 @@ TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void) CORBA::Boolean TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr /* remote_negotiator */, - const AVStreams::streamQoS &/* qos_spec */, - CORBA::Environment &/* ACE_TRY_ENV */) + const AVStreams::streamQoS &/* qos_spec */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, - "TAO_Negotiator::negotiate\n")); + "TAO_Negotiator::negotiate\n")); return 0; } @@ -413,11 +413,11 @@ int MMDevice_Map_Hash_Key::operator == (const MMDevice_Map_Hash_Key &hash_key) const { CORBA::Boolean result = 0; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { result = - this->mmdevice_->_is_equivalent (hash_key.mmdevice_, ACE_TRY_ENV); + this->mmdevice_->_is_equivalent (hash_key.mmdevice_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -435,14 +435,14 @@ operator < (const MMDevice_Map_Hash_Key &left, const MMDevice_Map_Hash_Key &right) { int result = 0; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - CORBA::ULong left_hash = left.mmdevice_->_hash (left.hash_maximum_, - ACE_TRY_ENV); + CORBA::ULong left_hash = left.mmdevice_->_hash (left.hash_maximum_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ULong right_hash = right.mmdevice_->_hash (right.hash_maximum_, - ACE_TRY_ENV); + CORBA::ULong right_hash = right.mmdevice_->_hash (right.hash_maximum_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result = left_hash < right_hash; } @@ -460,11 +460,11 @@ u_long MMDevice_Map_Hash_Key::hash (void) const { u_long result = 0; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - result = this->mmdevice_->_hash (this->hash_maximum_, - ACE_TRY_ENV); + result = this->mmdevice_->_hash (this->hash_maximum_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -484,10 +484,10 @@ MMDevice_Map_Hash_Key::hash (void) const TAO_StreamCtrl::TAO_StreamCtrl (void) :mcastconfigif_ (0) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - this->streamctrl_ = this->_this (ACE_TRY_ENV); + this->streamctrl_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; char buf [BUFSIZ]; int result = ACE_OS::hostname (buf, BUFSIZ); @@ -524,14 +524,14 @@ TAO_StreamCtrl::~TAO_StreamCtrl (void) // Stop the transfer of data of the stream // Empty the_spec means apply operation to all flows void -TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) +TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { ACE_TRY { - TAO_Basic_StreamCtrl::stop (flow_spec, ACE_TRY_ENV); + TAO_Basic_StreamCtrl::stop (flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->flow_connection_map_.current_size () > 0) return; @@ -539,13 +539,13 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec, MMDevice_Map::ENTRY *entry = 0; for (;a_iterator.next (entry)!= 0;a_iterator.advance ()) { - entry->int_id_.sep_->stop (flow_spec, ACE_TRY_ENV); + entry->int_id_.sep_->stop (flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_); for (;b_iterator.next (entry)!= 0;b_iterator.advance ()) { - entry->int_id_.sep_->stop (flow_spec, ACE_TRY_ENV); + entry->int_id_.sep_->stop (flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -561,14 +561,14 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec, // Start the transfer of data in the stream. // Empty the_spec means apply operation to all flows void -TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) +TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { ACE_TRY { - TAO_Basic_StreamCtrl::start (flow_spec, ACE_TRY_ENV); + TAO_Basic_StreamCtrl::start (flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->flow_connection_map_.current_size () > 0) return; @@ -577,13 +577,13 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec, MMDevice_Map::ENTRY *entry = 0; for (;a_iterator.next (entry)!= 0;a_iterator.advance ()) { - entry->int_id_.sep_->start (flow_spec, ACE_TRY_ENV); + entry->int_id_.sep_->start (flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_); for (;b_iterator.next (entry)!= 0;b_iterator.advance ()) { - entry->int_id_.sep_->start (flow_spec, ACE_TRY_ENV); + entry->int_id_.sep_->start (flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -600,14 +600,14 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec, // the streamendpoint and vdev associated with this stream // Empty the_spec means apply operation to all flows void -TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) +TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { ACE_TRY { - TAO_Basic_StreamCtrl::destroy (flow_spec, ACE_TRY_ENV); + TAO_Basic_StreamCtrl::destroy (flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->flow_connection_map_.current_size () > 0) return; @@ -616,13 +616,13 @@ TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec, MMDevice_Map::ENTRY *entry = 0; for (;a_iterator.next (entry)!= 0;a_iterator.advance ()) { - entry->int_id_.sep_->destroy (flow_spec, ACE_TRY_ENV); + entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_); for (;b_iterator.next (entry)!= 0;b_iterator.advance ()) { - entry->int_id_.sep_->destroy (flow_spec, ACE_TRY_ENV); + entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -643,8 +643,8 @@ CORBA::Boolean TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, AVStreams::MMDevice_ptr b_party, AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_flows, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec &the_flows + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -692,8 +692,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, the_qos, met_qos, named_vdev.inout (), - the_flows, - ACE_TRY_ENV); + the_flows + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) @@ -702,22 +702,22 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, CORBA::Any streamctrl_any; streamctrl_any <<= this->streamctrl_.in (); this->sep_a_->define_property ("Related_StreamCtrl", - streamctrl_any, - ACE_TRY_ENV); + streamctrl_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any vdev_a_any; vdev_a_any <<= this->vdev_a_.in (); this->sep_a_->define_property ("Related_VDev", - vdev_a_any, - ACE_TRY_ENV); + vdev_a_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any streamendpoint_a_any; streamendpoint_a_any <<= this->sep_a_.in (); this->vdev_a_->define_property ("Related_StreamEndpoint", - streamendpoint_a_any, - ACE_TRY_ENV); + streamendpoint_a_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -726,8 +726,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, CORBA::Any mmdevice_a_any; mmdevice_a_any <<= a_party_copy; this->vdev_a_->define_property ("Related_MMDevice", - mmdevice_a_any, - ACE_TRY_ENV); + mmdevice_a_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // add the mmdevice, sep and vdev to the map. @@ -765,37 +765,37 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, the_qos, met_qos, named_vdev.inout (), - the_flows, - ACE_TRY_ENV); + the_flows + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n")); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "\n(%P|%t)stream_endpoint_b_ = %s", - TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in (), - ACE_TRY_ENV))); + TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in () + TAO_ENV_ARG_PARAMETER))); ACE_TRY_CHECK; // Define ourselves as the related_streamctrl property of the sep. CORBA::Any streamctrl_any; streamctrl_any <<= this->streamctrl_.in (); this->sep_b_->define_property ("Related_StreamCtrl", - streamctrl_any, - ACE_TRY_ENV); + streamctrl_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any vdev_b_any; vdev_b_any <<= this->vdev_b_.in (); this->sep_b_->define_property ("Related_VDev", - vdev_b_any, - ACE_TRY_ENV); + vdev_b_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any streamendpoint_b_any; streamendpoint_b_any <<= this->sep_b_.in (); this->vdev_b_->define_property ("Related_StreamEndpoint", - streamendpoint_b_any, - ACE_TRY_ENV); + streamendpoint_b_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -804,8 +804,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, CORBA::Any mmdevice_b_any; mmdevice_b_any <<= b_party_copy; this->vdev_b_->define_property ("Related_MMDevice", - mmdevice_b_any, - ACE_TRY_ENV); + mmdevice_b_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // add the mmdevice, sep and vdev to the map. MMDevice_Map_Entry map_entry; @@ -835,13 +835,13 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, sep_a_peer_any <<= sep_a_peer.in(); sep_b_peer_any <<= sep_b_peer.in(); this->sep_a_->define_property ("PeerAdapter", - sep_a_peer_any, - ACE_TRY_ENV); + sep_a_peer_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sep_b_->define_property ("PeerAdapter", - sep_b_peer_any, - ACE_TRY_ENV); + sep_b_peer_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -853,21 +853,21 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, // instead. ACE_TRY_EX (set_source_id) { - CORBA::Any_ptr flows_any = this->sep_a_->get_property_value ("Flows", - ACE_TRY_ENV); + CORBA::Any_ptr flows_any = this->sep_a_->get_property_value ("Flows" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (set_source_id); AVStreams::flowSpec_var flows; *flows_any >>= flows.out (); for (u_int i=0; i< flows->length ();i++) { CORBA::Object_var fep_obj = - this->sep_a_->get_fep (flows [i], ACE_TRY_ENV); + this->sep_a_->get_fep (flows [i] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (set_source_id); ACE_TRY_EX (producer_check) { AVStreams::FlowProducer_var producer = - AVStreams::FlowProducer::_narrow (fep_obj.in (), - ACE_TRY_ENV); + AVStreams::FlowProducer::_narrow (fep_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); producer->set_source_id (this->source_id_++); } @@ -891,8 +891,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, // many producers who do not have flow interfaces. Then // the streamctrl has to give an array of source ids to // the sep. - this->sep_a_->set_source_id (this->source_id_++, - ACE_TRY_ENV); + this->sep_a_->set_source_id (this->source_id_++ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -903,15 +903,15 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, TAO_MCastConfigIf, 0); // @@: Deactivating the object thru poa means calling remove_ref after _this. - this->mcastconfigif_ptr_ = this->mcastconfigif_->_this (ACE_TRY_ENV); + this->mcastconfigif_ptr_ = this->mcastconfigif_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // Multicast source being added. CORBA::Boolean result = this->vdev_a_->set_Mcast_peer (this->streamctrl_.in (), this->mcastconfigif_ptr_.in (), the_qos, - the_flows, - ACE_TRY_ENV); + the_flows + TAO_ENV_ARG_PARAMETER); if (!result) ACE_ERROR_RETURN ((LM_ERROR, "set_Mcast_peer failed\n"), 0); } @@ -925,8 +925,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, ACE_ERROR_RETURN ((LM_ERROR, "first add a source and then a sink\n"), 0); this->mcastconfigif_->set_peer (this->vdev_b_.in (), the_qos, - the_flows, - ACE_TRY_ENV); + the_flows + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -937,8 +937,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, // ACE adds support for ATM multicast. connect_leaf_success = this->sep_a_->connect_leaf (this->sep_b_.in (), the_qos, - the_flows, - ACE_TRY_ENV); + the_flows + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (connect_leaf); connect_leaf_success = 1; } @@ -958,9 +958,9 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_StreamCtrl::bind_devs Multiconnect\n")); AVStreams::flowSpec connect_flows = the_flows; - this->sep_a_->multiconnect (the_qos, connect_flows, ACE_TRY_ENV); + this->sep_a_->multiconnect (the_qos, connect_flows TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->sep_b_->multiconnect (the_qos, connect_flows, ACE_TRY_ENV); + this->sep_b_->multiconnect (the_qos, connect_flows TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -973,15 +973,15 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->vdev_a_->set_peer (this->streamctrl_.in (), this->vdev_b_.in (), the_qos, - the_flows, - ACE_TRY_ENV); + the_flows + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->vdev_b_->set_peer (this->streamctrl_.in (), this->vdev_a_.in (), the_qos, - the_flows, - ACE_TRY_ENV); + the_flows + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -990,8 +990,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, CORBA::Boolean result = this->sep_a_->connect (this->sep_b_.in (), the_qos, - the_flows, - ACE_TRY_ENV); + the_flows + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == 0) ACE_ERROR_RETURN ((LM_ERROR, "sep_a->connect (sep_b) failed\n"), 0); @@ -1003,8 +1003,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->bind (this->sep_a_.in (), this->sep_b_.in (), the_qos, - the_flows, - ACE_TRY_ENV); + the_flows + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1025,8 +1025,8 @@ CORBA::Boolean TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, AVStreams::StreamEndPoint_B_ptr sep_b, AVStreams::streamQoS &stream_qos, - const AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -1049,25 +1049,25 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, CORBA::Any sep_any; sep_any <<= sep_b; sep_a->define_property ("PeerAdapter", - sep_any, - ACE_TRY_ENV); + sep_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sep_any <<= sep_a; sep_b->define_property ("PeerAdapter", - sep_any, - ACE_TRY_ENV); + sep_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // since its full profile we do the viable stream setup algorithm. // get the flows for the A streamendpoint. // the flows spec is empty and hence we do a exhaustive match. AVStreams::flowSpec a_flows, b_flows; CORBA::Any_var flows_any; - flows_any = sep_a->get_property_value ("Flows", ACE_TRY_ENV); + flows_any = sep_a->get_property_value ("Flows" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::flowSpec *temp_flows; flows_any.in () >>= temp_flows; a_flows = *temp_flows; - flows_any = sep_b->get_property_value ("Flows", ACE_TRY_ENV); + flows_any = sep_b->get_property_value ("Flows" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; flows_any.in () >>= temp_flows; b_flows = *temp_flows; @@ -1085,12 +1085,12 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, const char *flowname = a_flows[i]; // get the flowendpoint references. CORBA::Object_var fep_obj = - sep_a->get_fep (flowname, - ACE_TRY_ENV); + sep_a->get_fep (flowname + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::FlowEndPoint_ptr fep = - AVStreams::FlowEndPoint::_narrow (fep_obj.in (), - ACE_TRY_ENV); + AVStreams::FlowEndPoint::_narrow (fep_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_CString fep_key (flowname); result = a_fep_map->bind (fep_key, fep); @@ -1103,12 +1103,12 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, const char *flowname = b_flows[i]; // get the flowendpoint references. CORBA::Object_var fep_obj = - sep_b->get_fep (flowname, - ACE_TRY_ENV); + sep_b->get_fep (flowname + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::FlowEndPoint_ptr fep = - AVStreams::FlowEndPoint::_narrow (fep_obj.in (), - ACE_TRY_ENV); + AVStreams::FlowEndPoint::_narrow (fep_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_CString fep_key (flowname); result = b_fep_map->bind (fep_key, fep); @@ -1172,7 +1172,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, { AVStreams::FlowEndPoint_ptr fep_a = a_feps_entry->int_id_; AVStreams::FlowEndPoint_var connected_to = - fep_a->get_connected_fep (ACE_TRY_ENV); + fep_a->get_connected_fep (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); if (!CORBA::is_nil (connected_to.in ())) @@ -1189,7 +1189,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, AVStreams::FlowConnection_var flow_connection; AVStreams::FlowEndPoint_var connected_to = - fep_b->get_connected_fep (ACE_TRY_ENV); + fep_b->get_connected_fep (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); if (!CORBA::is_nil (connected_to.in ())) @@ -1198,28 +1198,28 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, continue; } - if (fep_a->is_fep_compatible (fep_b, - ACE_TRY_ENV) == 1) + if (fep_a->is_fep_compatible (fep_b + TAO_ENV_ARG_PARAMETER) == 1) { ACE_TRY_CHECK_EX (flow_connect); // assume that flow names are same so that we // can use either of them. CORBA::Object_var flow_connection_obj; CORBA::Any_var flowname_any = - fep_a->get_property_value ("Flow", - ACE_TRY_ENV); + fep_a->get_property_value ("Flow" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); const char *flowname = 0; flowname_any.in () >>= flowname; ACE_TRY_EX (flow_connection) { flow_connection_obj = - this->get_flow_connection (flowname, - ACE_TRY_ENV); + this->get_flow_connection (flowname + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); flow_connection = - AVStreams::FlowConnection::_narrow (flow_connection_obj.in (), - ACE_TRY_ENV); + AVStreams::FlowConnection::_narrow (flow_connection_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); } ACE_CATCHANY @@ -1228,11 +1228,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, ACE_NEW_RETURN (flowConnection, TAO_FlowConnection, 0); - flow_connection = flowConnection->_this (ACE_TRY_ENV); + flow_connection = flowConnection->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); this->set_flow_connection (flowname, - flow_connection.in (), - ACE_TRY_ENV); + flow_connection.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); } ACE_ENDTRY; @@ -1250,12 +1250,12 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, ACE_TRY_EX (producer_check) { producer = - AVStreams::FlowProducer::_narrow (fep_a, - ACE_TRY_ENV); + AVStreams::FlowProducer::_narrow (fep_a + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); consumer = - AVStreams::FlowConsumer::_narrow (fep_b, - ACE_TRY_ENV); + AVStreams::FlowConsumer::_narrow (fep_b + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); // If the types don't match then try in @@ -1263,12 +1263,12 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, if (CORBA::is_nil (producer.in ())) { producer = - AVStreams::FlowProducer::_narrow (fep_b, - ACE_TRY_ENV); + AVStreams::FlowProducer::_narrow (fep_b + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); consumer = - AVStreams::FlowConsumer::_narrow (fep_a, - ACE_TRY_ENV); + AVStreams::FlowConsumer::_narrow (fep_a + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); } // At this point they should both be @@ -1286,13 +1286,13 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, ACE_ENDTRY; ACE_CHECK_RETURN (0); CORBA::String_var fep_a_name, fep_b_name; - flowname_any = fep_a->get_property_value ("FlowName", - ACE_TRY_ENV); + flowname_any = fep_a->get_property_value ("FlowName" + TAO_ENV_ARG_PARAMETER); const char *temp_name; flowname_any.in () >>= temp_name; fep_a_name = CORBA::string_dup (temp_name); - flowname_any = fep_b->get_property_value ("FlowName", - ACE_TRY_ENV); + flowname_any = fep_b->get_property_value ("FlowName" + TAO_ENV_ARG_PARAMETER); flowname_any.in () >>= temp_name; fep_b_name = CORBA::string_dup (temp_name); AVStreams::QoS flow_qos; @@ -1310,8 +1310,8 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, } flow_connection->connect (producer.in (), consumer.in (), - flow_qos, - ACE_TRY_ENV); + flow_qos + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); } } @@ -1325,15 +1325,15 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, } ACE_ENDTRY; ACE_CHECK_RETURN (0); - } + } ACE_CATCHANY { // error was thrown because one of the streamendpoints is light profile. // Now connect the streams together this->sep_a_->connect (this->sep_b_.in (), stream_qos, - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -1342,7 +1342,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, } void -TAO_StreamCtrl::unbind (CORBA::Environment &ACE_TRY_ENV) +TAO_StreamCtrl::unbind (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed)) { @@ -1358,13 +1358,13 @@ TAO_StreamCtrl::unbind (CORBA::Environment &ACE_TRY_ENV) MMDevice_Map::ENTRY *entry = 0; for (;a_iterator.next (entry)!= 0;a_iterator.advance ()) { - entry->int_id_.sep_->destroy (flow_spec, ACE_TRY_ENV); + entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_); for (;b_iterator.next (entry)!= 0;b_iterator.advance ()) { - entry->int_id_.sep_->destroy (flow_spec, ACE_TRY_ENV); + entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1379,8 +1379,8 @@ TAO_StreamCtrl::unbind (CORBA::Environment &ACE_TRY_ENV) void TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */, - const AVStreams::flowSpec &/* the_spec */, - CORBA::Environment &/* ACE_TRY_ENV */) + const AVStreams::flowSpec &/* the_spec */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow)) @@ -1389,8 +1389,8 @@ TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */, void TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */, - const AVStreams::flowSpec & /* the_spec */, - CORBA::Environment &/* ACE_TRY_ENV */) + const AVStreams::flowSpec & /* the_spec */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow)) @@ -1399,8 +1399,8 @@ TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */, AVStreams::VDev_ptr TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev, - AVStreams::StreamEndPoint_out sep, - CORBA::Environment &/* ACE_TRY_ENV */) + AVStreams::StreamEndPoint_out sep + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed)) { @@ -1420,15 +1420,15 @@ TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev, CORBA::Boolean TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) { - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_StreamCtrl::modify_QoS\n")); + "TAO_StreamCtrl::modify_QoS\n")); if (this->mcastconfigif_ != 0) @@ -1438,7 +1438,7 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &the_qos, } else { - TAO_Basic_StreamCtrl::modify_QoS (the_qos, the_spec, ACE_TRY_ENV); + TAO_Basic_StreamCtrl::modify_QoS (the_qos, the_spec TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -1462,8 +1462,8 @@ TAO_MCastConfigIf::~TAO_MCastConfigIf (void) CORBA::Boolean TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer, AVStreams::streamQoS & qos, - const AVStreams::flowSpec & flow_spec, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec & flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)) @@ -1474,7 +1474,7 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer, ACE_NEW_RETURN (info, Peer_Info, 0); - info->peer_ = AVStreams::VDev::_narrow (peer, ACE_TRY_ENV); + info->peer_ = AVStreams::VDev::_narrow (peer TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; info->qos_ = qos; info->flow_spec_ = flow_spec; @@ -1492,8 +1492,8 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer, // In future this should be a multicast message instead of point-to-point unicasts. void -TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration, - CORBA::Environment &ACE_TRY_ENV) +TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Peer_Info *info; @@ -1503,7 +1503,7 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati (info = this->peer_list_iterator_.next ()) != 0; this->peer_list_iterator_.advance ()) { - info->peer_->configure (a_configuration, ACE_TRY_ENV); + info->peer_->configure (a_configuration TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1518,8 +1518,8 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati void -TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties &initial, - CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties &initial + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->initial_configuration_ = initial; @@ -1528,8 +1528,8 @@ TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properti // In future this should be a multicast message instead of point-to-point unicasts. void TAO_MCastConfigIf::set_format (const char * flowName, - const char * format_name, - CORBA::Environment &ACE_TRY_ENV) + const char * format_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -1542,7 +1542,7 @@ TAO_MCastConfigIf::set_format (const char * flowName, { if (this->in_flowSpec (info->flow_spec_, flowName)) { - info->peer_->set_format (flowName, format_name, ACE_TRY_ENV); + info->peer_->set_format (flowName, format_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1559,8 +1559,8 @@ TAO_MCastConfigIf::set_format (const char * flowName, // In future this should be a multicast message instead of point-to-point unicasts. void TAO_MCastConfigIf::set_dev_params (const char * flowName, - const CosPropertyService::Properties & new_params, - CORBA::Environment &ACE_TRY_ENV) + const CosPropertyService::Properties & new_params + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)) @@ -1575,7 +1575,7 @@ TAO_MCastConfigIf::set_dev_params (const char * flowName, { if (this->in_flowSpec (info->flow_spec_, flowName)) { - info->peer_->set_dev_params (flowName, new_params, ACE_TRY_ENV); + info->peer_->set_dev_params (flowName, new_params TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1628,22 +1628,22 @@ TAO_Base_StreamEndPoint::handle_open (void) } int -TAO_Base_StreamEndPoint::handle_stop (const AVStreams::flowSpec &, - CORBA::Environment &) +TAO_Base_StreamEndPoint::handle_stop (const AVStreams::flowSpec & + TAO_ENV_ARG_DECL_NOT_USED) { return 0; } int -TAO_Base_StreamEndPoint::handle_start (const AVStreams::flowSpec &, - CORBA::Environment &) +TAO_Base_StreamEndPoint::handle_start (const AVStreams::flowSpec & + TAO_ENV_ARG_DECL_NOT_USED) { return 0; } int -TAO_Base_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &, - CORBA::Environment &) +TAO_Base_StreamEndPoint::handle_destroy (const AVStreams::flowSpec & + TAO_ENV_ARG_DECL_NOT_USED) { return 0; } @@ -1664,8 +1664,8 @@ TAO_Base_StreamEndPoint::handle_postconnect (AVStreams::flowSpec &) // The following function is for backward compatibility. CORBA::Boolean -TAO_Base_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &, - CORBA::Environment &) +TAO_Base_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec & + TAO_ENV_ARG_DECL_NOT_USED) { return 1; } @@ -1702,7 +1702,7 @@ TAO_Base_StreamEndPoint::set_flow_handler (const char *flowname, ACE_CString flow_name_key (flowname); if (this->flow_handler_map_.bind (flow_name_key, handler) != 0) ACE_ERROR ((LM_ERROR, - "Error in storing flow handler\n")); + "Error in storing flow handler\n")); } void @@ -1712,7 +1712,7 @@ TAO_Base_StreamEndPoint::set_control_flow_handler (const char *flowname, ACE_CString flow_name_key (flowname); if (this->control_flow_handler_map_.bind (flow_name_key, handler) != 0) ACE_ERROR ((LM_ERROR, - "Error in storing control flow handler\n")); + "Error in storing control flow handler\n")); } // ---------------------------------------------------------------------- @@ -1736,8 +1736,8 @@ TAO_StreamEndPoint::TAO_StreamEndPoint (void) CORBA::Boolean TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, AVStreams::streamQoS &qos, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -1751,8 +1751,8 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, { if (!CORBA::is_nil (this->negotiator_.in ())) { - ACE_DEBUG ((LM_DEBUG, - "NEGOTIATOR AVIALABLE\n")); + ACE_DEBUG ((LM_DEBUG, + "NEGOTIATOR AVIALABLE\n")); CORBA::Any_var negotiator_any = responder->get_property_value ("Negotiator"); @@ -1762,8 +1762,8 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, { CORBA::Boolean result = this->negotiator_->negotiate (peer_negotiator, - qos, - ACE_TRY_ENV); + qos + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (negotiate); if (!result) if (TAO_debug_level > 0) @@ -1784,7 +1784,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, { // choose protocols based on what the remote endpoint can support. CORBA::Any_var protocols_any = - responder->get_property_value ("AvailableProtocols", ACE_TRY_ENV); + responder->get_property_value ("AvailableProtocols" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (available_protocols); AVStreams::protocolSpec peer_protocols; AVStreams::protocolSpec *temp_protocols; @@ -1814,18 +1814,18 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, AVStreams::streamQoS network_qos; if (qos.length () > 0) { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "QoS is Specified\n")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "QoS is Specified\n")); int result = this->translate_qos (qos, - network_qos); + network_qos); if (result != 0) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "QoS translation failed\n")); + "QoS translation failed\n")); - this->qos ().set (network_qos); + this->qos ().set (network_qos); } @@ -1833,8 +1833,8 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, this->handle_preconnect (flow_spec); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_StreamEndPoint::connect: flow_spec_length = %d\n", + ACE_DEBUG ((LM_DEBUG, + "TAO_StreamEndPoint::connect: flow_spec_length = %d\n", flow_spec.length ())); u_int i; for (i=0;i<flow_spec.length ();i++) @@ -1863,14 +1863,14 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, ACE_ERROR_RETURN ((LM_ERROR, "%N:%l TAO_AV_Core::init_forward_flows failed\n"), 0); - AVStreams::StreamEndPoint_var streamendpoint = this->_this (ACE_TRY_ENV); + AVStreams::StreamEndPoint_var streamendpoint = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; retv = responder->request_connection (streamendpoint.in (), 0, network_qos, - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) @@ -1886,13 +1886,13 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, 0); if (entry->parse (flow_spec[i].in ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "Reverse_Flow_Spec_Set::parse failed\n"), - 0); + "Reverse_Flow_Spec_Set::parse failed\n"), + 0); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_StreamEndPoint::Connect: Reverse Flow Spec %s\n", - entry->entry_to_string ())); + "TAO_StreamEndPoint::Connect: Reverse Flow Spec %s\n", + entry->entry_to_string ())); this->reverse_flow_spec_set.insert (entry); } @@ -1903,8 +1903,8 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, TAO_AV_Core::TAO_AV_ENDPOINT_A); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, - "TAO_AV_Core::init_reverse_flows failed\n"), - 0); + "TAO_AV_Core::init_reverse_flows failed\n"), + 0); // Make the upcall to the app retv = this->handle_postconnect (flow_spec); @@ -1937,13 +1937,13 @@ TAO_StreamEndPoint::translate_qos (const AVStreams::streamQoS& application_qos, // Empty the_spec --> apply to all flows void -TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) +TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { // Make the upcall into the app - this->handle_stop (flow_spec, ACE_TRY_ENV); + this->handle_stop (flow_spec TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (flow_spec.length () > 0) @@ -1985,14 +1985,14 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec, // Start the physical flow of data on the stream // Empty the_spec --> apply to all flows void -TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) +TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::start\n")); // Make the upcall into the app - this->handle_start (flow_spec, ACE_TRY_ENV); + this->handle_start (flow_spec TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (flow_spec.length () > 0) @@ -2076,8 +2076,8 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec, // Close the connection void -TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec, - CORBA::Environment &/* ACE_TRY_ENV */) +TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { @@ -2154,7 +2154,7 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec, } // Make the upcall into the app - // this->handle_destroy (the_spec, ACE_TRY_ENV); + // this->handle_destroy (the_spec TAO_ENV_ARG_PARAMETER); // } @@ -2164,8 +2164,8 @@ CORBA::Boolean TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiator*/, CORBA::Boolean /*is_mcast*/, AVStreams::streamQoS &qos, - AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) + AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpDenied, AVStreams::noSuchFlow, @@ -2175,8 +2175,8 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "\n(%P|%t) TAO_StreamEndPoint::request_connection called")); - + "\n(%P|%t) TAO_StreamEndPoint::request_connection called")); + int result = 0; ACE_TRY @@ -2184,18 +2184,18 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato AVStreams::streamQoS network_qos; if (qos.length () > 0) { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "QoS is Specified\n")); - + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "QoS is Specified\n")); + int result = this->translate_qos (qos, network_qos); if (result != 0) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "QoS translation failed\n")); - - this->qos ().set (network_qos); - } - + + this->qos ().set (network_qos); + } + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) TAO_StreamEndPoint::request_connection: " @@ -2211,19 +2211,19 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato TAO_Forward_FlowSpec_Entry, 0); - if(TAO_debug_level > 0) - ACE_DEBUG(( LM_DEBUG, "%N:%l Parsing flow spec: %s\n", flow_spec[i].in() )); + if(TAO_debug_level > 0) + ACE_DEBUG(( LM_DEBUG, "%N:%l Parsing flow spec: %s\n", flow_spec[i].in() )); if (entry->parse (flow_spec[i]) == -1) - { + { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l Error parsing flow_spec: %s\n", flow_spec[i].in() )); return 0; - } + } if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_StreamEndPoint::request_connection Flow Spec %s", - entry->entry_to_string ())); + "TAO_StreamEndPoint::request_connection Flow Spec %s", + entry->entry_to_string ())); this->forward_flow_spec_set.insert (entry); } @@ -2237,13 +2237,13 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato return 0; // Make the upcall to the app - result = this->handle_connection_requested (flow_spec, ACE_TRY_ENV); + result = this->handle_connection_requested (flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "TAO_StreamEndpoint::request_connection"); + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "TAO_StreamEndpoint::request_connection"); return 0; } ACE_ENDTRY; @@ -2253,12 +2253,12 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato int TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_flows, - CORBA::Environment &/*ACE_TRY_ENV*/) + const AVStreams::flowSpec &the_flows + TAO_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_StreamEndPoint::change_qos\n")); + "TAO_StreamEndPoint::change_qos\n")); TAO_AV_QoS qos (new_qos); for (int i = 0; (unsigned) i < the_flows.length (); i++) @@ -2268,21 +2268,21 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos, ACE_CString flow_name_key (entry.flowname ()); Flow_Handler_Map_Entry *handler_entry; if (this->flow_handler_map_.find (flow_name_key, - handler_entry) == 0) - { - AVStreams::QoS flow_qos; - if (qos.get_flow_qos (entry.flowname (), flow_qos) != 0) - ACE_DEBUG ((LM_DEBUG, - "New QoS for the flow %s is not specified\n", - entry.flowname ())); - int result; - result = handler_entry->int_id_->change_qos (flow_qos); - if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Modifying QoS Failed\n"), - -1); - - } + handler_entry) == 0) + { + AVStreams::QoS flow_qos; + if (qos.get_flow_qos (entry.flowname (), flow_qos) != 0) + ACE_DEBUG ((LM_DEBUG, + "New QoS for the flow %s is not specified\n", + entry.flowname ())); + int result; + result = handler_entry->int_id_->change_qos (flow_qos); + if (result != 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Modifying QoS Failed\n"), + -1); + + } } return 0; } @@ -2290,15 +2290,15 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos, // Refers to modification of transport QoS. CORBA::Boolean TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &/* new_qos */, - const AVStreams::flowSpec &/* the_flows */, - CORBA::Environment &/* ACE_TRY_ENV */) + const AVStreams::flowSpec &/* the_flows */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_StreamEndPoint::modify_QoS\n")); + "TAO_StreamEndPoint::modify_QoS\n")); return 1; } @@ -2306,8 +2306,8 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &/* new_qos */, // Sets the list of protocols this streamendpoint can understand. CORBA::Boolean -TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &protocols, - CORBA::Environment &ACE_TRY_ENV) +TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &protocols + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -2316,8 +2316,8 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro protocol_restriction_any <<= protocols; this->define_property ("ProtocolRestriction", - protocol_restriction_any, - ACE_TRY_ENV); + protocol_restriction_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->protocols_ = protocols; } @@ -2333,14 +2333,13 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro void -TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec, - CORBA::Environment &ACE_TRY_ENV) +TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::streamOpFailed)) { ACE_UNUSED_ARG (the_spec); - ACE_UNUSED_ARG (ACE_TRY_ENV); } // Sets the status of the flow protocol. @@ -2348,8 +2347,8 @@ TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec, void TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/, const char *fp_name, - const CORBA::Any &fp_settings, - CORBA::Environment &/*ACE_TRY_ENV*/) + const CORBA::Any &fp_settings + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::FPError)) @@ -2362,8 +2361,8 @@ TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/, CORBA::Object_ptr -TAO_StreamEndPoint::get_fep (const char *flow_name, - CORBA::Environment &) +TAO_StreamEndPoint::get_fep (const char *flow_name + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow)) @@ -2376,8 +2375,8 @@ TAO_StreamEndPoint::get_fep (const char *flow_name, } char* -TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep, - CORBA::Environment &ACE_TRY_ENV) +TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -2398,8 +2397,8 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep, CORBA::Any flowname_any; flowname_any <<= flow_name.in (); fep->define_property ("Flow", - flowname_any, - ACE_TRY_ENV); + flowname_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2413,8 +2412,8 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep, } char* -TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep, - CORBA::Environment &ACE_TRY_ENV) +TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -2423,7 +2422,7 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep, ACE_TRY { CORBA::Any_var flow_name_any = - fep->get_property_value ("FlowName", ACE_TRY_ENV); + fep->get_property_value ("FlowName" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; const char *tmp; @@ -2433,7 +2432,7 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep, ACE_CATCHANY { flow_name = - this->add_fep_i_add_property (fep, ACE_TRY_ENV); + this->add_fep_i_add_property (fep TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } ACE_ENDTRY; @@ -2441,23 +2440,23 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep, } char * -TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj, - CORBA::Environment &ACE_TRY_ENV) +TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) { AVStreams::FlowEndPoint_var fep = - AVStreams::FlowEndPoint::_narrow (fep_obj, ACE_TRY_ENV); + AVStreams::FlowEndPoint::_narrow (fep_obj TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::String_var flow_name = - this->add_fep_i (fep.in (), ACE_TRY_ENV); + this->add_fep_i (fep.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TRY { - fep->lock (ACE_TRY_ENV); + fep->lock (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Add it to the sequence of flowNames supported. // put the flowname and the flowendpoint in a hashtable. @@ -2474,8 +2473,8 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj, CORBA::Any flows_any; flows_any <<= this->flows_; this->define_property ("Flows", - flows_any, - ACE_TRY_ENV); + flows_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2489,8 +2488,8 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj, void -TAO_StreamEndPoint::remove_fep (const char *flow_name, - CORBA::Environment &ACE_TRY_ENV) +TAO_StreamEndPoint::remove_fep (const char *flow_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -2512,8 +2511,8 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name, flows <<= new_flows; this->flows_ = new_flows; this->define_property ("Flows", - flows, - ACE_TRY_ENV); + flows + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2526,8 +2525,8 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name, // Sets the negotiator object. void -TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator, - CORBA::Environment &ACE_TRY_ENV) +TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -2535,8 +2534,8 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator, CORBA::Any negotiator; negotiator <<= new_negotiator; this->define_property ("Negotiator", - negotiator, - ACE_TRY_ENV); + negotiator + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->negotiator_ = AVStreams::Negotiator::_duplicate (new_negotiator); } @@ -2552,8 +2551,8 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator, // Sets the public key used for this streamendpoint. void TAO_StreamEndPoint::set_key (const char *flow_name, - const AVStreams::key & the_key, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::key & the_key + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -2564,8 +2563,8 @@ TAO_StreamEndPoint::set_key (const char *flow_name, char PublicKey_property [BUFSIZ]; ACE_OS::sprintf (PublicKey_property, "%s_PublicKey", flow_name); this->define_property (PublicKey_property, - PublicKey, - ACE_TRY_ENV); + PublicKey + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2578,8 +2577,8 @@ TAO_StreamEndPoint::set_key (const char *flow_name, // Set the source id. void -TAO_StreamEndPoint::set_source_id (CORBA::Long source_id, - CORBA::Environment &) +TAO_StreamEndPoint::set_source_id (CORBA::Long source_id + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->source_id_ = source_id; @@ -2587,8 +2586,8 @@ TAO_StreamEndPoint::set_source_id (CORBA::Long source_id, CORBA::Boolean TAO_StreamEndPoint::multiconnect (AVStreams::streamQoS &/*the_qos*/, - AVStreams::flowSpec &/*flow_spec*/, - CORBA::Environment &/*ACE_TRY_ENV*/) + AVStreams::flowSpec &/*flow_spec*/ + TAO_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::multiconnect\n")); @@ -2638,8 +2637,8 @@ TAO_StreamEndPoint_A::TAO_StreamEndPoint_A (void) // IP Multicast style connect. CORBA::Boolean TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, - AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) + AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -2676,7 +2675,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, if (result < 0) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "QoS not found for %s", forward_entry->flowname ())); // Narrow it to FlowProducer. - AVStreams::FlowProducer_var producer = AVStreams::FlowProducer::_narrow (flow_endpoint, ACE_TRY_ENV); + AVStreams::FlowProducer_var producer = AVStreams::FlowProducer::_narrow (flow_endpoint TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (narrow); // Else narrow succeeeded. if (!CORBA::is_nil (producer.in ())) @@ -2687,8 +2686,8 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, if (CORBA::is_nil (this->streamctrl_.in ())) { CORBA::Any_var streamctrl_any; - streamctrl_any = this->get_property_value ("Related_StreamCtrl", - ACE_TRY_ENV); + streamctrl_any = this->get_property_value ("Related_StreamCtrl" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::StreamCtrl_ptr streamctrl; streamctrl_any.in () >>= streamctrl; @@ -2696,11 +2695,11 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, } CORBA::Object_var flow_connection_obj = - this->streamctrl_->get_flow_connection (forward_entry->flowname (), - ACE_TRY_ENV); + this->streamctrl_->get_flow_connection (forward_entry->flowname () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); - flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in (), - ACE_TRY_ENV); + flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); } ACE_CATCHANY @@ -2713,11 +2712,11 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, flowConnection->set_mcast_addr (this->mcast_addr_, this->mcast_port_); this->mcast_port_++; flowConnection->set_protocol (forward_entry->carrier_protocol_str ()); - flow_connection = flowConnection->_this (ACE_TRY_ENV); + flow_connection = flowConnection->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->streamctrl_->set_flow_connection (forward_entry->flowname (), - flow_connection.in (), - ACE_TRY_ENV); + flow_connection.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -2726,13 +2725,13 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, { CORBA::Any fp_settings; flow_connection->use_flow_protocol (forward_entry->flow_protocol_str (), - fp_settings, - ACE_TRY_ENV); + fp_settings + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } result = flow_connection->add_producer (producer.in (), - flow_qos, - ACE_TRY_ENV); + flow_qos + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == 0) ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_A::multiconnect: add_producer failed\n"), 0); @@ -2831,8 +2830,8 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, CORBA::Boolean TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */, AVStreams::streamQoS & /* the_qos */, - const AVStreams::flowSpec & /* the_flows */, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec & /* the_flows */ + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -2845,8 +2844,8 @@ TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */ // Multicast not supported yet. void TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */, - const AVStreams::flowSpec & /* theSpec */, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec & /* theSpec */ + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, @@ -2874,8 +2873,8 @@ TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void) CORBA::Boolean TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, - AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) + AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -2901,7 +2900,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, AVStreams::FlowConsumer_var consumer; ACE_TRY_EX (narrow) { - consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in (), ACE_TRY_ENV); + consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (narrow); } ACE_CATCHANY @@ -2921,19 +2920,19 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, if (CORBA::is_nil (this->streamctrl_.in ())) { CORBA::Any_var streamctrl_any; - streamctrl_any = this->get_property_value ("Related_StreamCtrl", - ACE_TRY_ENV); + streamctrl_any = this->get_property_value ("Related_StreamCtrl" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::StreamCtrl_ptr streamctrl; streamctrl_any.in () >>= streamctrl; this->streamctrl_ = AVStreams::StreamCtrl::_duplicate (streamctrl); } CORBA::Object_var flow_connection_obj = - this->streamctrl_->get_flow_connection (forward_entry->flowname (), - ACE_TRY_ENV); + this->streamctrl_->get_flow_connection (forward_entry->flowname () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); - flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in (), - ACE_TRY_ENV); + flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); } ACE_CATCHANY @@ -2944,8 +2943,8 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, ACE_ENDTRY; ACE_CHECK_RETURN (0); result = flow_connection->add_consumer (consumer.in (), - flow_qos, - ACE_TRY_ENV); + flow_qos + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == 0) ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect:add_consumer failed\n"), 0); @@ -3026,8 +3025,8 @@ CORBA::Boolean TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, AVStreams::VDev_ptr the_peer_dev, AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -3042,8 +3041,8 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_VDev::set_peer: called")); - CORBA::String_var ior = TAO_ORB_Core_instance ()->orb ()->object_to_string (the_peer_dev, - ACE_TRY_ENV); + CORBA::String_var ior = TAO_ORB_Core_instance ()->orb ()->object_to_string (the_peer_dev + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -3054,8 +3053,8 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, CORBA::Any anyval; anyval <<= ior.in (); this->define_property ("Related_VDev", - anyval, - ACE_TRY_ENV); + anyval + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -3064,8 +3063,8 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, CORBA::Any_var anyptr; const char *media_ctrl_ior; - anyptr = this->peer_->get_property_value ("Related_MediaCtrl", - ACE_TRY_ENV); + anyptr = this->peer_->get_property_value ("Related_MediaCtrl" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; anyptr.in () >>= media_ctrl_ior; @@ -3074,10 +3073,10 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, media_ctrl_ior)); CORBA::Object_ptr media_ctrl_obj = TAO_ORB_Core_instance ()->orb ()->string_to_object - (media_ctrl_ior, ACE_TRY_ENV); + (media_ctrl_ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result = this->set_media_ctrl (media_ctrl_obj, ACE_TRY_ENV); + result = this->set_media_ctrl (media_ctrl_obj TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3091,12 +3090,11 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, } CORBA::Boolean -TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl, - CORBA::Environment &ACE_TRY_ENV) +TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl + TAO_ENV_ARG_DECL_NOT_USED) { // ACE_UNUSED_ARG (media_ctrl); - ACE_UNUSED_ARG (ACE_TRY_ENV); ACE_CHECK_RETURN (0); // FIX MEMORY LEAK: @@ -3113,8 +3111,8 @@ CORBA::Boolean TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */, AVStreams::MCastConfigIf_ptr mcast_peer, AVStreams::streamQoS &/* the_qos */, - const AVStreams::flowSpec &/* the_spec */, - CORBA::Environment &/* ACE_TRY_ENV */) + const AVStreams::flowSpec &/* the_spec */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -3126,8 +3124,8 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */, // applications should override this to handle configuration changes. void -TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/, - CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)) @@ -3137,8 +3135,8 @@ TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/, // sets the media format used for the flowname as a property. void TAO_VDev::set_format (const char *flowName, - const char *format_name, - CORBA::Environment &ACE_TRY_ENV) + const char *format_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -3151,8 +3149,8 @@ TAO_VDev::set_format (const char *flowName, CORBA::Any format; format <<= format_name; this->define_property (format_property, - format, - ACE_TRY_ENV); + format + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3168,8 +3166,8 @@ TAO_VDev::set_format (const char *flowName, // sets the device parameters for the flowname as a property. void TAO_VDev::set_dev_params (const char *flowName, - const CosPropertyService::Properties &new_params, - CORBA::Environment &ACE_TRY_ENV) + const CosPropertyService::Properties &new_params + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)) @@ -3183,8 +3181,8 @@ TAO_VDev::set_dev_params (const char *flowName, CORBA::Any devParams; devParams <<= new_params; this->define_property (devParams_property, - devParams, - ACE_TRY_ENV); + devParams + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3200,15 +3198,15 @@ TAO_VDev::set_dev_params (const char *flowName, // QoS Modification should be handled by the application currently. CORBA::Boolean TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &flowspec, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec &flowspec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_VDev::modify_QoS\n")); + "TAO_VDev::modify_QoS\n")); if (flowspec.length () != 0) { @@ -3216,35 +3214,35 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, entry.parse (flowspec [0]); int direction = entry.direction (); if (direction == 0) - { - AVStreams::StreamEndPoint_A_ptr sep_a; - - CORBA::Any_ptr streamendpoint_a_any = - this->get_property_value ("Related_StreamEndpoint", - ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - *streamendpoint_a_any >>= sep_a; - if (sep_a != 0) - { - sep_a->modify_QoS (the_qos, flowspec, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - } - else ACE_DEBUG ((LM_DEBUG, - "Stream EndPoint Not Found\n")); - } + { + AVStreams::StreamEndPoint_A_ptr sep_a; + + CORBA::Any_ptr streamendpoint_a_any = + this->get_property_value ("Related_StreamEndpoint" + TAO_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + *streamendpoint_a_any >>= sep_a; + if (sep_a != 0) + { + sep_a->modify_QoS (the_qos, flowspec TAO_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + } + else ACE_DEBUG ((LM_DEBUG, + "Stream EndPoint Not Found\n")); + } else - { - AVStreams::StreamEndPoint_B_ptr sep_b; - - CORBA::Any_ptr streamendpoint_b_any = - this->get_property_value ("Related_StreamEndpoint", - ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - *streamendpoint_b_any >>= sep_b; - sep_b->modify_QoS (the_qos, flowspec, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - } + { + AVStreams::StreamEndPoint_B_ptr sep_b; + + CORBA::Any_ptr streamendpoint_b_any = + this->get_property_value ("Related_StreamEndpoint" + TAO_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + *streamendpoint_b_any >>= sep_b; + sep_b->modify_QoS (the_qos, flowspec TAO_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + } } return 1; } @@ -3278,8 +3276,8 @@ AVStreams::StreamCtrl_ptr TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device, AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -3292,15 +3290,15 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device, ACE_NEW_RETURN (this->stream_ctrl_, TAO_StreamCtrl, 0); - AVStreams::MMDevice_var mmdevice = this->_this (ACE_TRY_ENV); + AVStreams::MMDevice_var mmdevice = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->stream_ctrl_->bind_devs (peer_device, mmdevice.in (), the_qos, - the_spec, - ACE_TRY_ENV); + the_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - streamctrl = this->stream_ctrl_->_this (ACE_TRY_ENV); + streamctrl = this->stream_ctrl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3318,8 +3316,8 @@ AVStreams::StreamCtrl_ptr TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer, AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -3329,7 +3327,6 @@ TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer, ACE_UNUSED_ARG (the_qos); ACE_UNUSED_ARG (is_met); ACE_UNUSED_ARG (the_spec); - ACE_UNUSED_ARG (ACE_TRY_ENV); ACE_CHECK_RETURN (0); return 0; @@ -3342,8 +3339,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, AVStreams::streamQoS &the_qos, CORBA::Boolean_out met_qos, char *&/*named_vdev*/, - const AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) { AVStreams::StreamEndPoint_A_ptr sep_a (AVStreams::StreamEndPoint_A::_nil ()); AVStreams::StreamEndPoint_B_ptr sep_b (AVStreams::StreamEndPoint_B::_nil ()); @@ -3355,8 +3352,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, case MMDEVICE_A: { if (this->endpoint_strategy_->create_A (sep_a, - the_vdev, - ACE_TRY_ENV) == -1) + the_vdev + TAO_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "TAO_MMDevice::create_A_B (%P|%t) - " "error in create_A\n"), @@ -3367,8 +3364,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, case MMDEVICE_B: { if (this->endpoint_strategy_->create_B (sep_b, - the_vdev, - ACE_TRY_ENV) == -1) + the_vdev + TAO_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "TAO_MMDevice::create_A_B (%P|%t) - " "error in create_B\n"), @@ -3397,12 +3394,12 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, { // Get the flowconnection for this flow. CORBA::Object_var flowconnection_obj = - streamctrl->get_flow_connection (forward_entry.flowname (), ACE_TRY_ENV); + streamctrl->get_flow_connection (forward_entry.flowname () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flowconnection); if (!CORBA::is_nil (flowconnection_obj.in ())) { - flowconnection = AVStreams::FlowConnection::_narrow (flowconnection_obj.in (), - ACE_TRY_ENV); + flowconnection = AVStreams::FlowConnection::_narrow (flowconnection_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flowconnection); } } @@ -3439,8 +3436,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, flow_dev->create_producer (flowconnection.in (), flow_qos, met_qos, - named_fdev.inout (), - ACE_TRY_ENV); + named_fdev.inout () + TAO_ENV_ARG_PARAMETER); } break; case MMDEVICE_B: @@ -3449,8 +3446,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, flow_dev->create_consumer (flowconnection.in (), flow_qos, met_qos, - named_fdev.inout (), - ACE_TRY_ENV); + named_fdev.inout () + TAO_ENV_ARG_PARAMETER); } break; } @@ -3470,8 +3467,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, flow_dev->create_consumer (flowconnection.in (), flow_qos, met_qos, - named_fdev.inout (), - ACE_TRY_ENV); + named_fdev.inout () + TAO_ENV_ARG_PARAMETER); } break; case MMDEVICE_B: @@ -3483,8 +3480,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, flow_dev->create_producer (flowconnection.in (), flow_qos, met_qos, - named_fdev.inout (), - ACE_TRY_ENV); + named_fdev.inout () + TAO_ENV_ARG_PARAMETER); } break; } @@ -3496,10 +3493,10 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, } CORBA::Any flowname_any; flowname_any <<= forward_entry.flowname (); - flow_endpoint->define_property ("FlowName", flowname_any, ACE_TRY_ENV); + flow_endpoint->define_property ("FlowName", flowname_any TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - sep->add_fep (flow_endpoint.in (), - ACE_TRY_ENV); + sep->add_fep (flow_endpoint.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -3520,8 +3517,8 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl, AVStreams::streamQoS &stream_qos, CORBA::Boolean_out met_qos, char *&named_vdev, - const AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -3530,7 +3527,7 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl, AVStreams::noSuchFlow)) { CORBA::String_var str_ctrl_ior = - TAO_ORB_Core_instance ()->orb ()->object_to_string (streamctrl, ACE_TRY_ENV); + TAO_ORB_Core_instance ()->orb ()->object_to_string (streamctrl TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); AVStreams::StreamEndPoint_A_ptr sep_a = 0; @@ -3541,9 +3538,9 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl, AVStreams::StreamEndPoint_var sep; ACE_TRY { - sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec, ACE_TRY_ENV); + sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in(), ACE_TRY_ENV); + sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in() TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3563,8 +3560,8 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl, AVStreams::streamQoS &stream_qos, CORBA::Boolean_out met_qos, char *&named_vdev, - const AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -3582,9 +3579,9 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl, ACE_TRY { - sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec, ACE_TRY_ENV); + sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in(), ACE_TRY_ENV); + sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in() TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3601,8 +3598,8 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl, // destroys the streamendpoint and the Vdev. void TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */, - const char * /* vdev_name */, - CORBA::Environment &/*ACE_TRY_ENV*/) + const char * /* vdev_name */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -3615,8 +3612,8 @@ TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */, } char * -TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev, - CORBA::Environment &ACE_TRY_ENV) +TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -3634,7 +3631,7 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev, ACE_OS::sprintf (tmp, "flow%d", flow_num_++); CORBA::Any flowname_any; flowname_any <<= flow_name.in (); - fdev->define_property ("Flow", flowname_any, ACE_TRY_ENV); + fdev->define_property ("Flow", flowname_any TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3648,8 +3645,8 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev, // Adds the fdev object to the MMDevice. char * -TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj, - CORBA::Environment &ACE_TRY_ENV) +TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -3659,14 +3656,14 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj, ACE_TRY_EX (flow_name) { CORBA::Any_ptr flow_name_any; - fdev = AVStreams::FDev::_narrow (fdev_obj, ACE_TRY_ENV); + fdev = AVStreams::FDev::_narrow (fdev_obj TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_name); if (CORBA::is_nil (fdev.in ())) return 0; - flow_name_any = fdev->get_property_value ("Flow", ACE_TRY_ENV); + flow_name_any = fdev->get_property_value ("Flow" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_name); const char *tmp; @@ -3676,7 +3673,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj, ACE_CATCHANY { flow_name = - this->add_fdev_i (fdev.in (), ACE_TRY_ENV); + this->add_fdev_i (fdev.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } ACE_ENDTRY; @@ -3700,8 +3697,8 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj, ACE_TRY_EX (flows) { this->define_property ("Flows", - flows_any, - ACE_TRY_ENV); + flows_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flows); } ACE_CATCHANY @@ -3716,13 +3713,12 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj, // Gets the FDev object associated with this flow. CORBA::Object_ptr -TAO_MMDevice::get_fdev (const char *flow_name, - CORBA::Environment &ACE_TRY_ENV) +TAO_MMDevice::get_fdev (const char *flow_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow)) { - ACE_UNUSED_ARG (ACE_TRY_ENV); ACE_CHECK_RETURN (0); ACE_CString fdev_name_key (flow_name); @@ -3734,8 +3730,8 @@ TAO_MMDevice::get_fdev (const char *flow_name, // Removes the fdev from this MMDevice. void -TAO_MMDevice::remove_fdev (const char *flow_name, - CORBA::Environment &ACE_TRY_ENV) +TAO_MMDevice::remove_fdev (const char *flow_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow, @@ -3761,8 +3757,8 @@ TAO_MMDevice::remove_fdev (const char *flow_name, flows <<= new_flows; this->flows_ = new_flows; this->define_property ("Flows", - flows, - ACE_TRY_ENV); + flows + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3818,7 +3814,7 @@ TAO_FlowConnection::set_protocol (const char *protocol) // stop this flow. void -TAO_FlowConnection::stop (CORBA::Environment &ACE_TRY_ENV) +TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -3829,7 +3825,7 @@ TAO_FlowConnection::stop (CORBA::Environment &ACE_TRY_ENV) this->flow_producer_set_.end (); producer_begin != producer_end; ++producer_begin) { - (*producer_begin)->stop (ACE_TRY_ENV); + (*producer_begin)->stop (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin @@ -3838,7 +3834,7 @@ TAO_FlowConnection::stop (CORBA::Environment &ACE_TRY_ENV) this->flow_consumer_set_.end (); consumer_begin != consumer_end; ++consumer_begin) { - (*consumer_begin)->stop (ACE_TRY_ENV); + (*consumer_begin)->stop (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -3853,7 +3849,7 @@ TAO_FlowConnection::stop (CORBA::Environment &ACE_TRY_ENV) // start this flow. void -TAO_FlowConnection::start (CORBA::Environment &ACE_TRY_ENV) +TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -3864,7 +3860,7 @@ TAO_FlowConnection::start (CORBA::Environment &ACE_TRY_ENV) this->flow_consumer_set_.end (); consumer_begin != consumer_end; ++consumer_begin) { - (*consumer_begin)->start (ACE_TRY_ENV); + (*consumer_begin)->start (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } FlowProducer_SetItor producer_begin = this->flow_producer_set_.begin @@ -3873,7 +3869,7 @@ TAO_FlowConnection::start (CORBA::Environment &ACE_TRY_ENV) this->flow_producer_set_.end (); producer_begin != producer_end; ++producer_begin) { - (*producer_begin)->start (ACE_TRY_ENV); + (*producer_begin)->start (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -3888,7 +3884,7 @@ TAO_FlowConnection::start (CORBA::Environment &ACE_TRY_ENV) // destroy this flow. void -TAO_FlowConnection::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -3899,7 +3895,7 @@ TAO_FlowConnection::destroy (CORBA::Environment &ACE_TRY_ENV) this->flow_producer_set_.end (); producer_begin != producer_end; ++producer_begin) { - (*producer_begin)->destroy (ACE_TRY_ENV); + (*producer_begin)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin @@ -3908,7 +3904,7 @@ TAO_FlowConnection::destroy (CORBA::Environment &ACE_TRY_ENV) this->flow_consumer_set_.end (); consumer_begin != consumer_end; ++consumer_begin) { - (*consumer_begin)->destroy (ACE_TRY_ENV); + (*consumer_begin)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -3926,13 +3922,12 @@ TAO_FlowConnection::destroy (CORBA::Environment &ACE_TRY_ENV) // modify the QoS for this flow. CORBA::Boolean -TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos, - CORBA::Environment &ACE_TRY_ENV) +TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed)) { ACE_UNUSED_ARG (new_qos); - ACE_UNUSED_ARG (ACE_TRY_ENV); ACE_CHECK_RETURN (0); return 0; } @@ -3940,8 +3935,8 @@ TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos, // use the specified flow protocol for this flow. CORBA::Boolean TAO_FlowConnection::use_flow_protocol (const char * fp_name, - const CORBA::Any & fp_settings, - CORBA::Environment &ACE_TRY_ENV) + const CORBA::Any & fp_settings + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::FPError, AVStreams::notSupported)) @@ -3955,7 +3950,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name, producer_begin != producer_end; ++producer_begin) { (*producer_begin)->use_flow_protocol - (fp_name, fp_settings, ACE_TRY_ENV); + (fp_name, fp_settings TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin @@ -3965,26 +3960,25 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name, consumer_begin != consumer_end; ++consumer_begin) { (*consumer_begin)->use_flow_protocol - (fp_name, fp_settings, ACE_TRY_ENV); + (fp_name, fp_settings TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; } void -TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event, - CORBA::Environment &ACE_TRY_ENV) +TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (the_event); - ACE_UNUSED_ARG (ACE_TRY_ENV); } CORBA::Boolean TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party, AVStreams::FDev_ptr b_party, - AVStreams::QoS & flow_qos, - CORBA::Environment &ACE_TRY_ENV) + AVStreams::QoS & flow_qos + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -3993,7 +3987,7 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party, CORBA::Boolean result = 0; ACE_TRY { - AVStreams::FlowConnection_var flowconnection = this->_this (ACE_TRY_ENV); + AVStreams::FlowConnection_var flowconnection = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean met_qos; CORBA::String_var named_fdev ((const char *)""); @@ -4001,20 +3995,20 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party, a_party->create_producer (flowconnection.in (), flow_qos, met_qos, - named_fdev.inout (), - ACE_TRY_ENV); + named_fdev.inout () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::FlowConsumer_var consumer = b_party->create_consumer (flowconnection.in (), flow_qos, met_qos, - named_fdev.inout (), - ACE_TRY_ENV); + named_fdev.inout () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result = this->connect (producer.in (), consumer.in (), - flow_qos, - ACE_TRY_ENV); + flow_qos + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4031,8 +4025,8 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party, CORBA::Boolean TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, AVStreams::FlowConsumer_ptr consumer, - AVStreams::QoS & the_qos, - CORBA::Environment &ACE_TRY_ENV) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::formatMismatch, AVStreams::FEPMismatch, @@ -4049,27 +4043,27 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, this->flow_producer_set_.insert (flow_producer); this->flow_consumer_set_.insert (flow_consumer); AVStreams::FlowConnection_var flowconnection = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; flow_producer->set_peer (flowconnection.in (), flow_consumer, - the_qos, - ACE_TRY_ENV); + the_qos + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; flow_consumer->set_peer (flowconnection.in (), flow_producer, - the_qos, - ACE_TRY_ENV); + the_qos + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; char *consumer_address = flow_consumer->go_to_listen (the_qos, 0, // false for is_mcast flow_producer, - this->fp_name_.inout (), - ACE_TRY_ENV); + this->fp_name_.inout () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (consumer_address, "") == 0) @@ -4078,13 +4072,13 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, consumer_address = flow_producer->go_to_listen (the_qos, 0, // false for is_mcast flow_consumer, - this->fp_name_.inout (), - ACE_TRY_ENV); + this->fp_name_.inout () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; flow_consumer->connect_to_peer (the_qos, consumer_address, - this->fp_name_.inout (), - ACE_TRY_ENV); + this->fp_name_.inout () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ Naga: We have to find means to set the reverse channel for the producer. // Its broken in the point-to_point case for UDP. @@ -4094,8 +4088,8 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowConnection::connect_to_peer addres: %s", consumer_address)); flow_producer->connect_to_peer (the_qos, consumer_address, - this->fp_name_.inout (), - ACE_TRY_ENV); + this->fp_name_.inout () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -4110,18 +4104,17 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, CORBA::Boolean -TAO_FlowConnection::disconnect (CORBA::Environment &ACE_TRY_ENV) +TAO_FlowConnection::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_UNUSED_ARG (ACE_TRY_ENV); ACE_CHECK_RETURN (0); return 0; } CORBA::Boolean TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, - AVStreams::QoS & the_qos, - CORBA::Environment &ACE_TRY_ENV) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::alreadyConnected, AVStreams::notSupported)) @@ -4139,8 +4132,8 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, FlowProducer_SetItor end = this->flow_producer_set_.end (); for (; begin != end; ++begin) { - if ((*begin)->_is_equivalent (producer, - ACE_TRY_ENV)) + if ((*begin)->_is_equivalent (producer + TAO_ENV_ARG_PARAMETER)) // producer exists in the set, a duplicate. ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_producer: producer already exists\n"), 1); } @@ -4174,8 +4167,8 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, char *address = flow_producer->connect_mcast (the_qos, met_qos, mcast_address, - this->fp_name_.in (), - ACE_TRY_ENV); + this->fp_name_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->producer_address_.in () == 0) @@ -4198,15 +4191,15 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, ACE_NEW_RETURN (this->mcastconfigif_i_, TAO_MCastConfigIf, 0); - this->mcastconfigif_ = this->mcastconfigif_i_->_this (ACE_TRY_ENV); + this->mcastconfigif_ = this->mcastconfigif_i_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - AVStreams::FlowConnection_var flowconnection = this->_this (ACE_TRY_ENV); + AVStreams::FlowConnection_var flowconnection = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; flow_producer->set_Mcast_peer (flowconnection.in (), this->mcastconfigif_.in (), - the_qos, - ACE_TRY_ENV); + the_qos + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4221,8 +4214,8 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, CORBA::Boolean TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, - AVStreams::QoS & the_qos, - CORBA::Environment &ACE_TRY_ENV) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::alreadyConnected)) { @@ -4234,8 +4227,8 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, FlowConsumer_SetItor end = this->flow_consumer_set_.end (); for (; begin != end; ++begin) { - if ((*begin)->_is_equivalent (consumer, - ACE_TRY_ENV)) + if ((*begin)->_is_equivalent (consumer + TAO_ENV_ARG_PARAMETER)) // Consumer exists in the set, a duplicate. ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_Consumer: Consumer already exists\n"), 1); } @@ -4259,22 +4252,22 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, if (!this->ip_multicast_) { - flow_consumer->set_protocol_restriction (protocols, - ACE_TRY_ENV); + flow_consumer->set_protocol_restriction (protocols + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; char * address = flow_consumer->go_to_listen (the_qos, 1, flow_producer, - this->fp_name_.inout (), - ACE_TRY_ENV); + this->fp_name_.inout () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean is_met; flow_producer->connect_mcast (the_qos, is_met, address, - this->fp_name_.inout (), - ACE_TRY_ENV); + this->fp_name_.inout () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -4286,15 +4279,15 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, // IP Multicasting. flow_consumer->connect_to_peer (the_qos, this->producer_address_.in (), - this->fp_name_.inout (), - ACE_TRY_ENV); + this->fp_name_.inout () + TAO_ENV_ARG_PARAMETER); // char * address = // flow_consumer->go_to_listen (the_qos, // 1, // flow_producer, // this->fp_name_.inout (), - // ACE_TRY_ENV); + // TAO_ENV_SINGLE_ARG_PARAMETER); // ACE_TRY_CHECK; } @@ -4307,8 +4300,8 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, stream_qos [0] = the_qos; this->mcastconfigif_->set_peer (flow_consumer, stream_qos, - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4322,13 +4315,12 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, } CORBA::Boolean -TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target, - CORBA::Environment &ACE_TRY_ENV) +TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notConnected)) { ACE_UNUSED_ARG (target); - ACE_UNUSED_ARG (ACE_TRY_ENV); ACE_CHECK_RETURN (0); return 0; } @@ -4352,7 +4344,7 @@ TAO_FlowEndPoint::TAO_FlowEndPoint (const char *flowname, void TAO_FlowEndPoint::set_flow_handler (const char * /*flowname*/, - TAO_AV_Flow_Handler * /*handler*/) + TAO_AV_Flow_Handler * /*handler*/) { } @@ -4365,17 +4357,17 @@ TAO_FlowEndPoint::open (const char *flowname, this->format_ = format; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowEndPoint::open\n")); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::Any flowname_any; flowname_any <<= flowname; this->define_property ("Flow", - flowname_any, - ACE_TRY_ENV); + flowname_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->set_format (format, - ACE_TRY_ENV); + this->set_format (format + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->protocol_addresses_ = protocols; AVStreams::protocolSpec protocol_spec (protocols.length ()); @@ -4388,8 +4380,8 @@ TAO_FlowEndPoint::open (const char *flowname, protocol_spec [i] = CORBA::string_dup (entry.carrier_protocol_str ()); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", protocol_spec[i].in ())); } - this->set_protocol_restriction (protocol_spec, - ACE_TRY_ENV); + this->set_protocol_restriction (protocol_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4413,11 +4405,10 @@ TAO_FlowEndPoint::set_flowname (const char *flowname) // used by one flowconnection so that multiple connections cant use // the same flowendpoint. CORBA::Boolean -TAO_FlowEndPoint::lock (CORBA::Environment &ACE_TRY_ENV) +TAO_FlowEndPoint::lock (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // lock the current flowendpoint - ACE_UNUSED_ARG (ACE_TRY_ENV); ACE_CHECK_RETURN (0); if (this->lock_) @@ -4428,10 +4419,9 @@ TAO_FlowEndPoint::lock (CORBA::Environment &ACE_TRY_ENV) // unlocks the flowendpoint , becomes free to be used in another flow. void -TAO_FlowEndPoint::unlock (CORBA::Environment &ACE_TRY_ENV) +TAO_FlowEndPoint::unlock (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_UNUSED_ARG (ACE_TRY_ENV); ACE_CHECK; this->lock_ = 0; @@ -4439,7 +4429,7 @@ TAO_FlowEndPoint::unlock (CORBA::Environment &ACE_TRY_ENV) void -TAO_FlowEndPoint::destroy (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_FlowEndPoint::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { int result = TAO_AV_Core::deactivate_servant (this); @@ -4452,7 +4442,7 @@ TAO_FlowEndPoint::destroy (CORBA::Environment &/*ACE_TRY_ENV*/) } AVStreams::StreamEndPoint_ptr -TAO_FlowEndPoint::related_sep (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_FlowEndPoint::related_sep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4460,26 +4450,25 @@ TAO_FlowEndPoint::related_sep (CORBA::Environment &/*ACE_TRY_ENV*/) } void -TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep, - CORBA::Environment &) +TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->related_sep_ = AVStreams::StreamEndPoint::_duplicate (related_sep); } AVStreams::FlowConnection_ptr -TAO_FlowEndPoint::related_flow_connection (CORBA::Environment &) +TAO_FlowEndPoint::related_flow_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return AVStreams::FlowConnection::_duplicate (this->related_flow_connection_.in ()); } void -TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection, - CORBA::Environment &ACE_TRY_ENV) +TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_UNUSED_ARG (ACE_TRY_ENV); ACE_CHECK; this->related_flow_connection_ = AVStreams::FlowConnection::_duplicate (related_flow_connection); @@ -4487,7 +4476,7 @@ TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related // returns the connected peer for this flow AVStreams::FlowEndPoint_ptr -TAO_FlowEndPoint::get_connected_fep (CORBA::Environment &) +TAO_FlowEndPoint::get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notConnected, AVStreams::notSupported)) @@ -4497,8 +4486,8 @@ TAO_FlowEndPoint::get_connected_fep (CORBA::Environment &) CORBA::Boolean TAO_FlowEndPoint::use_flow_protocol (const char * fp_name, - const CORBA::Any & , - CORBA::Environment &ACE_TRY_ENV) + const CORBA::Any & + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::FPError, AVStreams::notSupported)) @@ -4509,8 +4498,8 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name, CORBA::Any flowname_property; flowname_property <<= fp_name; this->define_property ("FlowProtocol", - flowname_property, - ACE_TRY_ENV); + flowname_property + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4524,8 +4513,8 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name, } void -TAO_FlowEndPoint::set_format (const char * format, - CORBA::Environment &ACE_TRY_ENV) +TAO_FlowEndPoint::set_format (const char * format + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -4537,8 +4526,8 @@ TAO_FlowEndPoint::set_format (const char * format, CORBA::Any format_val; format_val <<= format; this->define_property ("Format", - format_val, - ACE_TRY_ENV); + format_val + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4550,8 +4539,8 @@ TAO_FlowEndPoint::set_format (const char * format, } void -TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings, - CORBA::Environment &ACE_TRY_ENV) +TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)) @@ -4562,8 +4551,8 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set CORBA::Any DevParams_property; DevParams_property <<= new_settings; this->define_property ("DevParams", - DevParams_property, - ACE_TRY_ENV); + DevParams_property + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4575,8 +4564,8 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set } void -TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & protocols, - CORBA::Environment &ACE_TRY_ENV) +TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & protocols + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -4592,12 +4581,12 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot CORBA::Any AvailableProtocols_property; AvailableProtocols_property <<= protocols; this->define_property ("AvailableProtocols", - AvailableProtocols_property, - ACE_TRY_ENV); + AvailableProtocols_property + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::protocolSpec *temp_spec; - CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols", - ACE_TRY_ENV); + CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; temp_any.in () >>= temp_spec; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n")); @@ -4617,8 +4606,8 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot } CORBA::Boolean -TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep, - CORBA::Environment &ACE_TRY_ENV) +TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::formatMismatch, AVStreams::deviceQosMismatch)) @@ -4633,8 +4622,8 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep, CORBA::String_var my_format, peer_format; exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format"; - format_ptr = this->get_property_value ("Format", - ACE_TRY_ENV); + format_ptr = this->get_property_value ("Format" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; const char *temp_format; @@ -4642,8 +4631,8 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep, my_format = CORBA::string_dup (temp_format); // get my peer's format value exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format[2]"; - format_ptr = peer_fep->get_property_value ("Format", - ACE_TRY_ENV); + format_ptr = peer_fep->get_property_value ("Format" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; format_ptr.in () >>= temp_format; peer_format = CORBA::string_dup (temp_format); @@ -4658,16 +4647,16 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep, exception_message = "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols"; - AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols", - ACE_TRY_ENV); + AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AvailableProtocols_ptr.in () >>= temp_protocols; my_protocol_spec = *temp_protocols; exception_message = "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols[2]"; - AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols", - ACE_TRY_ENV); + AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AvailableProtocols_ptr.in () >>= temp_protocols; peer_protocol_spec = *temp_protocols; @@ -4712,8 +4701,8 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep, CORBA::Boolean TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr /* the_fc */, AVStreams::FlowEndPoint_ptr the_peer_fep, - AVStreams::QoS & /* the_qos */, - CORBA::Environment &/* ACE_TRY_ENV */) + AVStreams::QoS & /* the_qos */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)) @@ -4726,8 +4715,8 @@ TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr /* the_fc */, CORBA::Boolean TAO_FlowEndPoint::set_Mcast_peer (AVStreams::FlowConnection_ptr /* the_fc */, AVStreams::MCastConfigIf_ptr mcast_peer, - AVStreams::QoS & /* the_qos */, - CORBA::Environment &/* ACE_TRY_ENV */) + AVStreams::QoS & /* the_qos */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed)) { @@ -4740,8 +4729,8 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role, AVStreams::QoS & /*the_qos*/, CORBA::Boolean /*is_mcast*/, AVStreams::FlowEndPoint_ptr peer_fep, - char *& flowProtocol, - CORBA::Environment &ACE_TRY_ENV) + char *& flowProtocol + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -4762,14 +4751,14 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role, AVStreams::protocolSpec my_protocol_spec, peer_protocol_spec; AVStreams::protocolSpec *temp_protocols; CORBA::Any_var AvailableProtocols_ptr = - peer_fep->get_property_value ("AvailableProtocols", - ACE_TRY_ENV); + peer_fep->get_property_value ("AvailableProtocols" + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); AvailableProtocols_ptr.in () >>= temp_protocols; peer_protocol_spec = *temp_protocols; AvailableProtocols_ptr = - this->get_property_value ("AvailableProtocols", - ACE_TRY_ENV); + this->get_property_value ("AvailableProtocols" + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); AvailableProtocols_ptr.in () >>= temp_protocols; my_protocol_spec = *temp_protocols; @@ -4833,8 +4822,8 @@ CORBA::Boolean TAO_FlowEndPoint::connect_to_peer_i (TAO_FlowSpec_Entry::Role role, AVStreams::QoS & /*the_qos*/, const char * address, - const char * use_flow_protocol, - CORBA::Environment &/*ACE_TRY_ENV*/) + const char * use_flow_protocol + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -4897,8 +4886,8 @@ TAO_FlowProducer::TAO_FlowProducer (const char *flowname, // gets the reverse channel for feedback. char * -TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/, - CORBA::Environment &/* ACE_TRY_ENV */) +TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -4906,7 +4895,7 @@ TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/, // The start, stop and destroy are to be handled by the application. void -TAO_FlowProducer::stop (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_FlowProducer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); @@ -4919,7 +4908,7 @@ TAO_FlowProducer::stop (CORBA::Environment &/*ACE_TRY_ENV*/) } void -TAO_FlowProducer::start (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_FlowProducer::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); @@ -4942,8 +4931,8 @@ char * TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer_fep, - char *& flowProtocol, - CORBA::Environment &ACE_TRY_ENV) + char *& flowProtocol + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -4953,15 +4942,15 @@ TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos, the_qos, is_mcast, peer_fep, - flowProtocol, - ACE_TRY_ENV); + flowProtocol + TAO_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos, const char * address, - const char * use_flow_protocol, - CORBA::Environment &ACE_TRY_ENV) + const char * use_flow_protocol + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -4970,16 +4959,16 @@ TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos, return this->connect_to_peer_i (TAO_FlowSpec_Entry::TAO_AV_PRODUCER, the_qos, address, - use_flow_protocol, - ACE_TRY_ENV); + use_flow_protocol + TAO_ENV_ARG_PARAMETER); } // Connect to a IP multicast address. char * TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */, CORBA::Boolean_out /* is_met */, const char *address, - const char * use_flow_protocol, - CORBA::Environment &/*ACE_TRY_ENV*/) + const char * use_flow_protocol + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::notSupported, @@ -5022,8 +5011,8 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */, // sets the key for this flow. void -TAO_FlowProducer::set_key (const AVStreams::key & the_key, - CORBA::Environment &ACE_TRY_ENV) +TAO_FlowProducer::set_key (const AVStreams::key & the_key + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -5031,8 +5020,8 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key, CORBA::Any anyval; anyval <<= the_key; this->define_property ("PublicKey", - anyval, - ACE_TRY_ENV); + anyval + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -5045,8 +5034,8 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key, // source id to be used to distinguish this source from others. void -TAO_FlowProducer::set_source_id (CORBA::Long source_id, - CORBA::Environment &/* ACE_TRY_ENV */) +TAO_FlowProducer::set_source_id (CORBA::Long source_id + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->source_id_ = source_id; @@ -5071,7 +5060,7 @@ TAO_FlowConsumer::TAO_FlowConsumer (const char *flowname, // The start, stop and destroy are to be handled by the application. void -TAO_FlowConsumer::stop (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_FlowConsumer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); @@ -5081,7 +5070,7 @@ TAO_FlowConsumer::stop (CORBA::Environment &/*ACE_TRY_ENV*/) } void -TAO_FlowConsumer::start (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_FlowConsumer::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); @@ -5096,8 +5085,8 @@ char * TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer_fep, - char *& flowProtocol, - CORBA::Environment &ACE_TRY_ENV) + char *& flowProtocol + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -5107,15 +5096,15 @@ TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos, the_qos, is_mcast, peer_fep, - flowProtocol, - ACE_TRY_ENV); + flowProtocol + TAO_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos, const char * address, - const char * use_flow_protocol, - CORBA::Environment &ACE_TRY_ENV) + const char * use_flow_protocol + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -5124,8 +5113,8 @@ TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos, return this->connect_to_peer_i (TAO_FlowSpec_Entry::TAO_AV_CONSUMER, the_qos, address, - use_flow_protocol, - ACE_TRY_ENV); + use_flow_protocol + TAO_ENV_ARG_PARAMETER); } //------------------------------------------------------------ |