diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
| commit | b11770b30f8b58d20fe2d61846bfa3fc5354ee7e (patch) | |
| tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/orbsvcs/orbsvcs | |
| parent | 8fd5b8293423d91c699711bce0f3551cb8c20a69 (diff) | |
| download | ATCD-b11770b30f8b58d20fe2d61846bfa3fc5354ee7e.tar.gz | |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
389 files changed, 7157 insertions, 7242 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 2104699fcba..085d3bd7a44 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -26,7 +26,9 @@ #include "AVStreams_i.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(AV, AVStreams_i, "$Id$") +ACE_RCSID (AV, + AVStreams_i, + "$Id$") //------------------------------------------------------------ // TAO_AV_Qos @@ -70,8 +72,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 +92,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 +103,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 +121,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 +142,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 +153,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 +173,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 +192,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 +204,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; } } @@ -220,9 +222,10 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec, // Changes the QoS associated with the stream // 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_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) @@ -233,8 +236,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) @@ -245,8 +248,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)) @@ -254,15 +257,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)) @@ -278,8 +281,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)) @@ -287,7 +290,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 @@ -319,12 +322,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; } @@ -362,11 +365,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 @@ -384,14 +387,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; } @@ -409,11 +412,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 @@ -433,10 +436,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); @@ -473,14 +476,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; @@ -488,13 +491,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; } } @@ -510,14 +513,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; @@ -526,13 +529,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; } } @@ -549,14 +552,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; @@ -565,13 +568,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; } } @@ -592,8 +595,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, @@ -641,8 +644,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) @@ -651,22 +654,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; @@ -675,8 +678,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. @@ -714,37 +717,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; @@ -753,8 +756,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; @@ -784,13 +787,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; } @@ -802,21 +805,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_++); } @@ -840,8 +843,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; @@ -852,15 +855,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); } @@ -874,8 +877,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; } @@ -886,8 +889,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; } @@ -907,9 +910,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; } } @@ -922,15 +925,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; @@ -939,8 +942,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); @@ -952,8 +955,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; } } @@ -974,8 +977,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, @@ -998,25 +1001,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; @@ -1034,12 +1037,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); @@ -1052,12 +1055,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); @@ -1121,7 +1124,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 ())) @@ -1138,7 +1141,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 ())) @@ -1147,28 +1150,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 @@ -1177,11 +1180,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; @@ -1199,12 +1202,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 @@ -1212,12 +1215,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 @@ -1235,13 +1238,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; @@ -1259,8 +1262,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); } } @@ -1274,15 +1277,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; @@ -1291,7 +1294,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)) { @@ -1307,13 +1310,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; } } @@ -1328,8 +1331,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)) @@ -1338,8 +1341,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)) @@ -1348,8 +1351,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)) { @@ -1368,16 +1371,17 @@ TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev, } CORBA::Boolean + TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_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) @@ -1388,73 +1392,72 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos, else { ACE_TRY - { - - AVStreams::flowSpec in_flowspec; - AVStreams::flowSpec out_flowspec; - - in_flowspec.length (0); - out_flowspec.length (0); - - int in_index = 0; - int out_index = 0; - - AVStreams::flowSpec flowspec; - if (the_spec.length () == 0) - { - // Apply modify_qos to all the flows - flowspec = this->flows_; - MMDevice_Map_Iterator iterator (this->mmdevice_a_map_); - MMDevice_Map::ENTRY *entry = 0; - for (;iterator.next (entry) != 0;iterator.advance ()) - { - flowspec = entry->int_id_.flowspec_; - } - } - else - { - flowspec = the_spec; - } - - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_StreamCtrl::modify_QoS\n")); - - - 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 ()); - } - } - - if (in_flowspec.length () != 0) - { - this->vdev_a_->modify_QoS (new_qos, in_flowspec, ACE_TRY_ENV); - ACE_TRY_CHECK; - } - - if (out_flowspec.length () != 0) - { - this->vdev_b_->modify_QoS (new_qos, out_flowspec, ACE_TRY_ENV); - ACE_TRY_CHECK; - } - } + { + AVStreams::flowSpec in_flowspec; + AVStreams::flowSpec out_flowspec; + + in_flowspec.length (0); + out_flowspec.length (0); + + int in_index = 0; + int out_index = 0; + + AVStreams::flowSpec flowspec; + if (the_spec.length () == 0) + { + // Apply modify_qos to all the flows + flowspec = this->flows_; + MMDevice_Map_Iterator iterator (this->mmdevice_a_map_); + MMDevice_Map::ENTRY *entry = 0; + for (;iterator.next (entry) != 0;iterator.advance ()) + { + flowspec = entry->int_id_.flowspec_; + } + } + else + { + flowspec = the_spec; + } + + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO_StreamCtrl::modify_QoS\n")); + + + 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 ()); + } + } + + if (in_flowspec.length () != 0) + { + 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 TAO_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + } ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::modify_QoS"); - return 0; - } + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::modify_QoS"); + return 0; + } ACE_ENDTRY; ACE_CHECK_RETURN (0); @@ -1480,8 +1483,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)) @@ -1492,7 +1495,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; @@ -1510,8 +1513,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; @@ -1521,7 +1524,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; } } @@ -1536,8 +1539,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; @@ -1546,8 +1549,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)) { @@ -1560,7 +1563,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; } } @@ -1577,8 +1580,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)) @@ -1593,7 +1596,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; } } @@ -1646,22 +1649,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; } @@ -1682,8 +1685,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; } @@ -1720,7 +1723,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 @@ -1730,7 +1733,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")); } // ---------------------------------------------------------------------- @@ -1754,8 +1757,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, @@ -1769,8 +1772,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"); @@ -1780,8 +1783,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) @@ -1802,7 +1805,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; @@ -1832,18 +1835,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); } @@ -1851,8 +1854,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++) @@ -1881,14 +1884,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) @@ -1904,13 +1907,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); } @@ -1921,8 +1924,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); @@ -1955,13 +1958,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) @@ -2003,14 +2006,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) @@ -2094,8 +2097,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)) { @@ -2172,7 +2175,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); // } @@ -2182,8 +2185,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, @@ -2193,8 +2196,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 @@ -2202,18 +2205,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: " @@ -2229,19 +2232,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); } @@ -2255,13 +2258,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; @@ -2271,12 +2274,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++) @@ -2286,21 +2289,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; } @@ -2308,22 +2311,22 @@ 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) 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")); - int result = this->change_qos (new_qos, the_flows, ACE_TRY_ENV); + int result = this->change_qos (new_qos, the_flows TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - + if (result != 0) return 0; - + return 1; } @@ -2331,8 +2334,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 @@ -2341,8 +2344,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; } @@ -2358,14 +2361,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. @@ -2373,8 +2375,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)) @@ -2387,8 +2389,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)) @@ -2401,8 +2403,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)) @@ -2423,8 +2425,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 @@ -2438,8 +2440,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)) @@ -2448,7 +2450,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; @@ -2458,7 +2460,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; @@ -2466,23 +2468,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. @@ -2499,8 +2501,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 @@ -2514,8 +2516,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)) @@ -2537,8 +2539,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 @@ -2551,8 +2553,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 @@ -2560,8 +2562,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); } @@ -2577,8 +2579,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 @@ -2589,8 +2591,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 @@ -2603,8 +2605,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; @@ -2612,8 +2614,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")); @@ -2663,8 +2665,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, @@ -2701,7 +2703,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 ())) @@ -2712,8 +2714,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; @@ -2721,11 +2723,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 @@ -2738,11 +2740,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; @@ -2751,13 +2753,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); @@ -2856,8 +2858,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, @@ -2870,8 +2872,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, @@ -2899,8 +2901,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, @@ -2926,7 +2928,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 @@ -2946,19 +2948,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 @@ -2969,8 +2971,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); @@ -3051,8 +3053,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, @@ -3067,8 +3069,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; @@ -3079,8 +3081,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; @@ -3089,8 +3091,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; @@ -3099,10 +3101,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 @@ -3116,12 +3118,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) { // ACE_UNUSED_ARG (media_ctrl); - ACE_UNUSED_ARG (ACE_TRY_ENV); ACE_CHECK_RETURN (0); // FIX MEMORY LEAK: @@ -3138,8 +3139,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, @@ -3151,8 +3152,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)) @@ -3162,8 +3163,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)) { @@ -3176,8 +3177,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 @@ -3193,8 +3194,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)) @@ -3208,8 +3209,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 @@ -3225,15 +3226,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) { @@ -3241,35 +3242,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; } @@ -3303,8 +3304,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, @@ -3317,15 +3318,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 @@ -3343,8 +3344,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, @@ -3354,7 +3355,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; @@ -3367,8 +3367,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 ()); @@ -3380,8 +3380,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"), @@ -3392,8 +3392,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"), @@ -3422,12 +3422,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); } } @@ -3464,8 +3464,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: @@ -3474,8 +3474,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; } @@ -3495,8 +3495,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: @@ -3508,8 +3508,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; } @@ -3521,10 +3521,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; } } @@ -3545,8 +3545,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, @@ -3555,7 +3555,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; @@ -3566,9 +3566,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 @@ -3588,8 +3588,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, @@ -3607,9 +3607,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 @@ -3626,8 +3626,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)) { @@ -3640,8 +3640,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)) @@ -3659,7 +3659,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 @@ -3673,8 +3673,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)) @@ -3684,14 +3684,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; @@ -3701,7 +3701,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; @@ -3725,8 +3725,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 @@ -3741,13 +3741,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); @@ -3759,8 +3758,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, @@ -3786,8 +3785,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 @@ -3843,7 +3842,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 @@ -3854,7 +3853,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 @@ -3863,7 +3862,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; } } @@ -3878,7 +3877,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 @@ -3889,7 +3888,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 @@ -3898,7 +3897,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; } } @@ -3913,7 +3912,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 @@ -3924,7 +3923,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 @@ -3933,7 +3932,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; } } @@ -3951,13 +3950,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; } @@ -3965,8 +3963,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)) @@ -3980,7 +3978,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 @@ -3990,26 +3988,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, @@ -4018,7 +4015,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 *)""); @@ -4026,20 +4023,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 @@ -4056,8 +4053,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, @@ -4074,27 +4071,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) @@ -4103,13 +4100,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. @@ -4119,8 +4116,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; } } @@ -4135,18 +4132,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)) @@ -4164,8 +4160,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); } @@ -4199,8 +4195,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) @@ -4223,15 +4219,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 @@ -4246,8 +4242,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)) { @@ -4259,8 +4255,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); } @@ -4284,22 +4280,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 @@ -4311,15 +4307,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; } @@ -4332,8 +4328,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 @@ -4347,13 +4343,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; } @@ -4377,7 +4372,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*/) { } @@ -4390,17 +4385,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 ()); @@ -4413,8 +4408,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 @@ -4438,11 +4433,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_) @@ -4453,10 +4447,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; @@ -4464,7 +4457,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); @@ -4477,7 +4470,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)) { @@ -4485,26 +4478,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); @@ -4512,7 +4504,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)) @@ -4522,8 +4514,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)) @@ -4534,8 +4526,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 @@ -4549,8 +4541,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)) { @@ -4562,8 +4554,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 @@ -4575,8 +4567,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)) @@ -4587,8 +4579,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 @@ -4600,8 +4592,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)) { @@ -4617,12 +4609,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")); @@ -4642,8 +4634,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)) @@ -4658,8 +4650,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; @@ -4667,8 +4659,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); @@ -4683,16 +4675,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; @@ -4737,8 +4729,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)) @@ -4751,8 +4743,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)) { @@ -4765,8 +4757,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, @@ -4787,14 +4779,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; @@ -4858,8 +4850,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, @@ -4922,8 +4914,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; @@ -4931,7 +4923,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 (); @@ -4944,7 +4936,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 (); @@ -4967,8 +4959,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, @@ -4978,15 +4970,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, @@ -4995,16 +4987,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, @@ -5047,8 +5039,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 @@ -5056,8 +5048,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 @@ -5070,8 +5062,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; @@ -5096,7 +5088,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 (); @@ -5106,7 +5098,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 (); @@ -5121,8 +5113,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, @@ -5132,15 +5124,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, @@ -5149,8 +5141,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); } //------------------------------------------------------------ diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 0de8277fc7e..c4f7103d87f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -76,7 +76,7 @@ public: /** * @class TAO_Basic_StreamCtrl - * @brief Base class for StreamCtrl, implements basic stream start + * @brief Base class for StreamCtrl, implements basic stream start * and stop functionality. */ class TAO_AV_Export TAO_Basic_StreamCtrl @@ -94,15 +94,15 @@ public: /// Stop the transfer of data of the stream /// Empty the_spec means apply operation to all flows - virtual void stop (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void stop (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Start the transfer of data in the stream. /// Empty the_spec means apply operation to all flows - virtual void start (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void start (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -111,39 +111,39 @@ public: * the streamendpoint and vdev associated with this stream * Empty the_spec means apply operation to all flows */ - virtual void destroy (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void destroy (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Changes the QoS associated with the stream /// Empty the_spec means apply operation to all flows virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); /// Used by StreamEndPoint and VDev to inform StreamCtrl of events. /// E.g., loss of flow, reestablishment of flow, etc.. - virtual void push_event (const struct CosPropertyService::Property & the_event, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void push_event (const struct CosPropertyService::Property & the_event + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used to control the flow protocol parameters. virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, const char *fp_name, - const CORBA::Any &fp_settings, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const CORBA::Any &fp_settings + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::FPError)); /// Not implemented in the light profile, will raise the notsupported /// exception - virtual CORBA::Object_ptr get_flow_connection (const char *flow_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Object_ptr get_flow_connection (const char *flow_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::notSupported)); @@ -151,8 +151,8 @@ public: /// Not implemented in the light profile, will raise the notsupported /// exception virtual void set_flow_connection (const char *flow_name, - CORBA::Object_ptr flow_connection, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + CORBA::Object_ptr flow_connection + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::notSupported)); @@ -185,8 +185,8 @@ class TAO_AV_Export TAO_Negotiator { public: virtual CORBA::Boolean negotiate (AVStreams::Negotiator_ptr remote_negotiator, - const AVStreams::streamQoS &qos_spec, - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) + const AVStreams::streamQoS &qos_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -250,15 +250,15 @@ public: /// Stop the transfer of data of the stream /// Empty the_spec means apply operation to all flows - virtual void stop (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void stop (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Start the transfer of data in the stream. /// Empty the_spec means apply operation to all flows - virtual void start (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void start (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -267,8 +267,8 @@ public: * the streamendpoint and vdev associated with this stream * Empty the_spec means apply operation to all flows */ - virtual void destroy (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void destroy (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -282,8 +282,8 @@ public: virtual CORBA::Boolean bind_devs (AVStreams::MMDevice_ptr a_party, AVStreams::MMDevice_ptr b_party, AVStreams::streamQoS& the_qos, - const AVStreams::flowSpec& the_flows, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec& the_flows + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -297,44 +297,44 @@ public: virtual CORBA::Boolean bind (AVStreams::StreamEndPoint_A_ptr a_party, AVStreams::StreamEndPoint_B_ptr b_party, AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_flows, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_flows + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); virtual void unbind_dev (AVStreams::MMDevice_ptr dev, - const AVStreams::flowSpec & the_spec, - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec & the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow)); /// Unbind the_ep from the stream. Empty the_spec means apply to all flows. virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow)); /// unbind the stream. Same effect as Basic_StreamCtrl::destroy () - virtual void unbind (CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void unbind (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed)); virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev, - AVStreams::StreamEndPoint_out sep, - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) + AVStreams::StreamEndPoint_out sep + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed)); /// Changes the QoS associated with the stream /// Empty the_spec means apply operation to all flows virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); @@ -385,30 +385,29 @@ public: virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer, AVStreams::streamQoS & the_qos, - const AVStreams::flowSpec & the_spec, - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec & the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)); - virtual void configure (const CosPropertyService::Property & a_configuration, - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) + virtual void configure (const CosPropertyService::Property & a_configuration + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void set_initial_configuration (const CosPropertyService::Properties & initial, - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) + virtual void set_initial_configuration (const CosPropertyService::Properties & initial + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_format (const char * flowName, - const char * format_name, - CORBA::Environment &ACE_TRY_ENV = - CORBA::Environment::default_environment ()) + const char * format_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); virtual void set_dev_params (const char * flowName, - const CosPropertyService::Properties & new_params, - CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) + const CosPropertyService::Properties & new_params + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, @@ -494,16 +493,16 @@ public: virtual int handle_close (void); /// Application needs to define this - virtual int handle_stop (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()); + virtual int handle_stop (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Application needs to define this - virtual int handle_start (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()); + virtual int handle_start (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Application needs to define this - virtual int handle_destroy (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()); + virtual int handle_destroy (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Application needs to define this virtual CORBA::Boolean handle_preconnect (AVStreams::flowSpec &the_spec); @@ -512,8 +511,8 @@ public: virtual CORBA::Boolean handle_postconnect (AVStreams::flowSpec &the_spec); /// Application needs to define this - virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()); + virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS); virtual int get_callback (const char *flowname, TAO_AV_Callback *&callback); @@ -525,7 +524,7 @@ public: TAO_AV_Protocol_Object *object); virtual void set_flow_handler (const char *flowname, - TAO_AV_Flow_Handler *handler); + TAO_AV_Flow_Handler *handler); virtual void set_control_flow_handler (const char *flowname, TAO_AV_Flow_Handler *handler); @@ -546,7 +545,7 @@ class TAO_AV_Connector; class TAO_Forward_FlowSpec_Entry; class TAO_Reverse_FlowSpec_Entry; -/** +/** * @class TAO_StreamEndPoint * @brief The Stream EndPoint. Used to implement one endpoint of a stream * that implements the transport layer. @@ -563,28 +562,28 @@ public: TAO_StreamEndPoint (void); /// Stop the stream. Empty the_spec means, for all the flows - virtual void stop (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void stop (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Start the stream, Empty the_spec means, for all the flows - virtual void start (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void start (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Destroy the stream, Empty the_spec means, for all the flows - virtual void destroy (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void destroy (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); /// Called by StreamCtrl. responder is the peer to connect to virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, AVStreams::streamQoS& qos_spec, - const AVStreams::flowSpec& the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec& the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -595,8 +594,8 @@ public: virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator, CORBA::Boolean is_mcast, AVStreams::streamQoS &qos, - AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpDenied, AVStreams::noSuchFlow, @@ -605,24 +604,24 @@ public: /// Change the transport qos on a stream virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_flows, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_flows + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); - + virtual int change_qos (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_flows, - CORBA::Environment &env = CORBA::Environment::default_environment ()); - + const AVStreams::flowSpec &the_flows + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + /// Used to restrict the set of protocols - virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// disconnect the flows - virtual void disconnect (const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void disconnect (const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::streamOpFailed)); @@ -630,65 +629,65 @@ public: /// Used to control the flow virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, const char *fp_name, - const CORBA::Any &fp_settings, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const CORBA::Any &fp_settings + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::FPError)); /// Not implemented in the light profile, throws notsupported - virtual CORBA::Object_ptr get_fep (const char *flow_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Object_ptr get_fep (const char *flow_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow)); /// Not implemented in the light profile, throws notsupported - virtual char * add_fep (CORBA::Object_ptr the_fep, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual char * add_fep (CORBA::Object_ptr the_fep + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); /// Not implemented in the light profile, throws notsupported - virtual void remove_fep (const char *fep_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void remove_fep (const char *fep_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); /// Used to "attach" a negotiator to the endpoint - virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used for public key encryption. virtual void set_key (const char *flow_name, - const AVStreams::key & the_key, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::key & the_key + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used to set a unique id for packets sent by this streamendpoint - virtual void set_source_id (CORBA::Long source_id, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void set_source_id (CORBA::Long source_id + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Destructor virtual ~TAO_StreamEndPoint (void); CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, - AVStreams::flowSpec &the_spec, - CORBA::Environment &ACE_TRY_ENV); + AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL); protected: /// Helper methods to implement add_fep() - char* add_fep_i (AVStreams::FlowEndPoint_ptr fep, - CORBA::Environment &ACE_TRY_ENV) + char* add_fep_i (AVStreams::FlowEndPoint_ptr fep + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); - char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep, - CORBA::Environment &ACE_TRY_ENV) + char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); @@ -753,8 +752,8 @@ public: /// Used for ATM-style multicast virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, - AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -763,8 +762,8 @@ public: /// Used for ATM-style multicast virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_flows, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_flows + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -773,8 +772,8 @@ public: /// Used to remove a multicast leaf virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, - const AVStreams::flowSpec &theSpec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &theSpec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -806,8 +805,8 @@ public: /// Used for internet-style multicast virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, - AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -837,8 +836,8 @@ public: virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl, AVStreams::VDev_ptr the_peer_dev, AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -848,39 +847,39 @@ public: virtual CORBA::Boolean set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl, AVStreams::MCastConfigIf_ptr a_mcastconfigif, AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)); /// Called by the peer VDev to configure the device (catch all) - virtual void configure (const CosPropertyService::Property &the_config_mesg, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void configure (const CosPropertyService::Property &the_config_mesg + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)); /// Used to set a format on a flowname virtual void set_format (const char *flowName, - const char *format_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const char *format_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); /// Used to set device parameters virtual void set_dev_params (const char *flowName, - const CosPropertyService::Properties &new_params, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const CosPropertyService::Properties &new_params + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)); /// Called to change QoS of the device virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); @@ -890,8 +889,8 @@ public: protected: /// hook called after set_peer is done to set the media ctrl of the peer vdev. - virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl, - CORBA::Environment &env = CORBA::Environment::default_environment ()); + virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// My stream controller AVStreams::StreamCtrl_var streamctrl_; @@ -930,16 +929,16 @@ public: AVStreams::streamQoS &the_qos, CORBA::Boolean_out met_qos, char *&named_vdev, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()); + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Can be used to request the MMDevice to create a new StreamCtrl, /// and call bind_devs on it virtual AVStreams::StreamCtrl_ptr bind (AVStreams::MMDevice_ptr peer_device, AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -949,8 +948,8 @@ public: virtual AVStreams::StreamCtrl_ptr bind_mcast (AVStreams::MMDevice_ptr first_peer, AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -962,8 +961,8 @@ public: AVStreams::streamQoS &the_qos, CORBA::Boolean_out met_qos, char *&named_vdev, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -977,8 +976,8 @@ public: AVStreams::streamQoS &the_qos, CORBA::Boolean_out met_qos, char *&named_vdev, - const AVStreams::flowSpec &the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -988,28 +987,28 @@ public: /// Remove the StreamEndPoint and the related vdev virtual void destroy (AVStreams::StreamEndPoint_ptr the_ep, - const char *vdev_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const char *vdev_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); /// Not supported in the light profile, raises notsupported - virtual char * add_fdev (CORBA::Object_ptr the_fdev, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual char * add_fdev (CORBA::Object_ptr the_fdev + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); /// Not supported in the light profile, raises notsupported - virtual CORBA::Object_ptr get_fdev (const char *flow_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Object_ptr get_fdev (const char *flow_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow)); /// Not supported in the light profile, raises notsupported - virtual void remove_fdev (const char *flow_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void remove_fdev (const char *flow_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow, @@ -1020,8 +1019,8 @@ public: protected: /// Helper method to implement add_fdev() - char* add_fdev_i (AVStreams::FDev_ptr fdev, - CORBA::Environment &ACE_TRY_ENV) + char* add_fdev_i (AVStreams::FDev_ptr fdev + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); @@ -1070,42 +1069,42 @@ public: TAO_FlowConnection (void); /// stop this flow. - virtual void stop (CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// start this flow. - virtual void start (CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// destroy this flow. - virtual void destroy (CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// modify the QoS for this flow. - virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed)); /// use the specified flow protocol for this flow. virtual CORBA::Boolean use_flow_protocol (const char * fp_name, - const CORBA::Any & fp_settings, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const CORBA::Any & fp_settings + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::FPError, AVStreams::notSupported)); /// pushes an event , to be handled by the application. - virtual void push_event (const AVStreams::streamEvent & the_event, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void push_event (const AVStreams::streamEvent & the_event + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// connect 2 Flow Devices. virtual CORBA::Boolean connect_devs (AVStreams::FDev_ptr a_party, AVStreams::FDev_ptr b_party, - AVStreams::QoS & the_qos, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -1114,35 +1113,35 @@ public: /// Connect a flow producer and consumer under this flow connection. virtual CORBA::Boolean connect (AVStreams::FlowProducer_ptr flow_producer, AVStreams::FlowConsumer_ptr flow_consumer, - AVStreams::QoS & the_qos, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::formatMismatch, AVStreams::FEPMismatch, AVStreams::alreadyConnected)); /// disconnect this flow connection. - virtual CORBA::Boolean disconnect (CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Boolean disconnect (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// adds the producer to this flow connection. virtual CORBA::Boolean add_producer (AVStreams::FlowProducer_ptr flow_producer, - AVStreams::QoS & the_qos, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::alreadyConnected, AVStreams::notSupported)); /// adds a consumer to this flow connection. virtual CORBA::Boolean add_consumer (AVStreams::FlowConsumer_ptr flow_consumer, - AVStreams::QoS & the_qos, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::alreadyConnected)); /// drops a flow endpoint from the flow. - virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notConnected)); @@ -1172,7 +1171,7 @@ protected: /** * @class TAO_FlowEndPoint - * @brief This class is used per flow e.g video flow and an audio flow + * @brief This class is used per flow e.g video flow and an audio flow * to encapsulate the transport details. */ class TAO_AV_Export TAO_FlowEndPoint : @@ -1204,82 +1203,75 @@ public: TAO_AV_Protocol_Object *object); /// lock the flow endpoint for a particular flow. - virtual CORBA::Boolean lock (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual CORBA::Boolean lock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// unlock the flow endpoint for subsequent use. - virtual void unlock (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual void unlock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// destroy this flow. - virtual void destroy (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// get method for the related streamendpoint under which this /// flowendpoint is. - virtual AVStreams::StreamEndPoint_ptr related_sep(CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual AVStreams::StreamEndPoint_ptr related_sep(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// set method for the related streamendpoint under which this /// flowendpoint is. - virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual AVStreams::FlowConnection_ptr related_flow_connection(CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual AVStreams::FlowConnection_ptr related_flow_connection(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // accessor for the related flow connection attribute. /// set method for the related flow connection attribute. - virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// returns the other flowendpoint to which this is connected. - virtual AVStreams::FlowEndPoint_ptr get_connected_fep (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual AVStreams::FlowEndPoint_ptr get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notConnected, AVStreams::notSupported)); //// use the specified flow protocol. virtual CORBA::Boolean use_flow_protocol (const char * fp_name, - const CORBA::Any & fp_settings, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const CORBA::Any & fp_settings + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::FPError, AVStreams::notSupported)); /// sets the data format. - virtual void set_format (const char * format, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void set_format (const char * format + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); /// sets the device parameters. - virtual void set_dev_params (const CosPropertyService::Properties & new_settings, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void set_dev_params (const CosPropertyService::Properties & new_settings + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)); /// sets the list of protocols to be used. - virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); /// checks whether the passed flowendpoint is compatible with this. - virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::formatMismatch, AVStreams::deviceQosMismatch)); @@ -1287,8 +1279,8 @@ public: /// sets the peer flowendpoint. virtual CORBA::Boolean set_peer (AVStreams::FlowConnection_ptr the_fc, AVStreams::FlowEndPoint_ptr the_peer_fep, - AVStreams::QoS & the_qos, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)); @@ -1296,9 +1288,8 @@ public: /// sets the multicast peer flowendpoint, not implemented. virtual CORBA::Boolean set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc, AVStreams::MCastConfigIf_ptr a_mcastconfigif, - AVStreams::QoS & the_qos, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + AVStreams::QoS & the_qos + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed)); @@ -1310,9 +1301,8 @@ public: */ virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, - const char * use_flow_protocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + const char * use_flow_protocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -1322,9 +1312,8 @@ public: virtual CORBA::Boolean connect_to_peer_i (TAO_FlowSpec_Entry::Role role, AVStreams::QoS & the_qos, const char * address, - const char * use_flow_protocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + const char * use_flow_protocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -1338,9 +1327,8 @@ public: virtual char * go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, - char *& flowProtocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + char *& flowProtocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1351,9 +1339,8 @@ public: AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, - char *& flowProtocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + char *& flowProtocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1409,26 +1396,23 @@ public: * UDP if the producer is listening and the consumer connects (logically) then the producer needs to * know the reverse channel on its peer fep to send data to. */ - virtual char * get_rev_channel (const char * pcol_name, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual char * get_rev_channel (const char * pcol_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// stop this flow, to be overridden by the application. - virtual void stop (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// start this flow, to be overridden by the application. - virtual void start (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, - char *& flowProtocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + char *& flowProtocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1436,9 +1420,8 @@ public: virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, - const char * use_flow_protocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + const char * use_flow_protocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -1448,8 +1431,8 @@ public: virtual char * connect_mcast (AVStreams::QoS & the_qos, CORBA::Boolean_out is_met, const char * address, - const char * use_flow_protocol, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + const char * use_flow_protocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::notSupported, @@ -1459,14 +1442,14 @@ public: /// sets the public key to be used for encryption of the data. - virtual void set_key (const AVStreams::key & the_key, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void set_key (const AVStreams::key & the_key + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// sets the source id of this flow producer so that it can be used /// to distinguish this producer from others in the multicast case. - virtual void set_source_id (CORBA::Long source_id, - CORBA::Environment &env =CORBA::Environment::default_environment()) + virtual void set_source_id (CORBA::Long source_id + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -1489,21 +1472,18 @@ public: const char *format); /// stop this flow, to be overridden by the application. - virtual void stop (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// start this flow, to be overridden by the application. - virtual void start (CORBA::Environment &env = - CORBA::Environment::default_environment ()) + virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, - char *& flowProtocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + char *& flowProtocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1511,16 +1491,15 @@ public: virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, - const char * use_flow_protocol, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + const char * use_flow_protocol + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, AVStreams::QoSRequestFailed)); }; -/** +/** * @class TAO_MediaControl * @brief Abstract Mediacontrol class. * The following are to be handled by the specialized media control @@ -1536,34 +1515,34 @@ public: TAO_MediaControl (void); virtual AVStreams::Position get_media_position (AVStreams::PositionOrigin an_origin, - AVStreams::PositionKey a_key, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + AVStreams::PositionKey a_key + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::MediaControl::PostionKeyNotSupported)) =0; - virtual void set_media_position (const AVStreams::Position & a_position, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void set_media_position (const AVStreams::Position & a_position + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::MediaControl::PostionKeyNotSupported, AVStreams::InvalidPosition)) =0; - virtual void start (const AVStreams::Position & a_position, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void start (const AVStreams::Position & a_position + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; - virtual void pause (const AVStreams::Position & a_position, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void pause (const AVStreams::Position & a_position + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; - virtual void resume (const AVStreams::Position & a_position, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void resume (const AVStreams::Position & a_position + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; - virtual void stop (const AVStreams::Position & a_position, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + virtual void stop (const AVStreams::Position & a_position + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 7d7a1e21c25..ec9354ae1d0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -148,8 +148,8 @@ TAO_AV_Core::reactor (void) int TAO_AV_Core::init (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - CORBA::Environment&) + PortableServer::POA_ptr poa + TAO_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Core::init ")); this->orb_ = CORBA::ORB::_duplicate (orb); @@ -168,7 +168,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_AV_Core::init_forward_flows\n")); + "TAO_AV_Core::init_forward_flows\n")); TAO_AV_FlowSpecSet address_flow_set; TAO_AV_FlowSpecSet flow_set; @@ -184,17 +184,17 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, switch (entry->direction ()) { case TAO_FlowSpec_Entry::TAO_AV_DIR_IN: - { - entry->role (TAO_FlowSpec_Entry::TAO_AV_CONSUMER); - break; - } + { + entry->role (TAO_FlowSpec_Entry::TAO_AV_CONSUMER); + break; + } case TAO_FlowSpec_Entry::TAO_AV_DIR_OUT: - { - entry->role (TAO_FlowSpec_Entry::TAO_AV_PRODUCER); - break; - } + { + entry->role (TAO_FlowSpec_Entry::TAO_AV_PRODUCER); + break; + } } - break; + break; } case TAO_AV_Core::TAO_AV_ENDPOINT_A: { @@ -216,9 +216,9 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, if (address != 0) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "address given for flow %s", - entry->flowname ())); + ACE_DEBUG ((LM_DEBUG, + "address given for flow %s", + entry->flowname ())); address_flow_set.insert (entry); } @@ -238,8 +238,8 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, address_flow_set); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, - "TAO_AV_Core::init_forward_flows::acceptor_registry::open failed\n"), - -1); + "TAO_AV_Core::init_forward_flows::acceptor_registry::open failed\n"), + -1); TAO_AV_FlowSpecSetItor end = address_flow_set.end (); for (TAO_AV_FlowSpecSetItor start = address_flow_set.begin (); start != end; ++start) @@ -251,16 +251,16 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, { if (entry->handler () != 0) { - //Yamuna:PLEASE CHECK THIS LATER + //Yamuna:PLEASE CHECK THIS LATER #ifndef ACE_HAS_RAPI // For IN flows on the A side we should remove the handlers from the reactor. - ACE_Event_Handler *event_handler = entry->handler ()->event_handler (); - result = event_handler->reactor ()->remove_handler (event_handler, - ACE_Event_Handler::READ_MASK); - if (result < 0) + ACE_Event_Handler *event_handler = entry->handler ()->event_handler (); + result = event_handler->reactor ()->remove_handler (event_handler, + ACE_Event_Handler::READ_MASK); + if (result < 0) if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "TAO_AV_Core::init_forward_flows: remove_handler failed\n")); + ACE_DEBUG ((LM_DEBUG, + "TAO_AV_Core::init_forward_flows: remove_handler failed\n")); #endif /*ACE_HAS_RAPI*/ } @@ -274,9 +274,9 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, { // entry doesn't exist so add it. flow_spec_set.insert (entry); - // size_t len = flow_spec.length (); - // flow_spec.length (len+1); - // flow_spec [len] = entry->entry_to_string (); + // size_t len = flow_spec.length (); + // flow_spec.length (len+1); + // flow_spec [len] = entry->entry_to_string (); } } } @@ -285,8 +285,8 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, { if (address_flow_set.size () > 0) { - ACE_DEBUG ((LM_DEBUG, - "This connector registry is called ONE\n")); + ACE_DEBUG ((LM_DEBUG, + "This connector registry is called ONE\n")); result = this->connector_registry_->open (endpoint, this, @@ -507,11 +507,11 @@ TAO_AV_Core::init_reverse_flows (TAO_Base_StreamEndPoint *endpoint, case TAO_AV_Core::TAO_AV_ENDPOINT_A: { - result = this->connector_registry_->open (endpoint, - this, - connector_flow_set); + result = this->connector_registry_->open (endpoint, + this, + connector_flow_set); } - break; + break; default: break; } @@ -636,74 +636,74 @@ TAO_AV_Core::load_default_transport_factories (void) if (udp_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, - "(%P|%t) WARNING - No %s found in Service Repository." - " Using default instance.\n", - "UDP Factory")); + ACE_ERROR ((LM_WARNING, + "(%P|%t) WARNING - No %s found in Service Repository." + " Using default instance.\n", + "UDP Factory")); ACE_NEW_RETURN (udp_factory, - TAO_AV_UDP_Factory, - -1); + TAO_AV_UDP_Factory, + -1); } else udp_factory->ref_count = 1; - + ACE_NEW_RETURN (udp_item, TAO_AV_Transport_Item ("UDP_Factory"), -1); udp_item->factory (udp_factory); - + this->transport_factories_.insert (udp_item); - + TAO_AV_Transport_Factory *tcp_factory = 0; TAO_AV_Transport_Item *tcp_item = 0; - + tcp_factory = ACE_Dynamic_Service<TAO_AV_Transport_Factory>::instance (tcp_factory_str); if (tcp_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, - "(%P|%t) WARNING - No %s found in Service Repository." - " Using default instance.\n", - "TCP Factory")); + ACE_ERROR ((LM_WARNING, + "(%P|%t) WARNING - No %s found in Service Repository." + " Using default instance.\n", + "TCP Factory")); ACE_NEW_RETURN (tcp_factory, - TAO_AV_TCP_Factory, + TAO_AV_TCP_Factory, -1); } else tcp_factory->ref_count = 1; - + ACE_NEW_RETURN (tcp_item, TAO_AV_Transport_Item ("TCP_Factory"), -1); tcp_item->factory (tcp_factory); - + this->transport_factories_.insert (tcp_item); - + #ifdef ACE_HAS_RAPI const char *udp_qos_factory_str = "UDP_QoS_Factory"; - + TAO_AV_Transport_Factory *udp_qos_factory = 0; TAO_AV_Transport_Item *udp_qos_item = 0; - + udp_qos_factory = ACE_Dynamic_Service<TAO_AV_Transport_Factory>::instance (udp_qos_factory_str); if (udp_qos_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, - "(%P|%t) WARNING - No %s found in Service Repository." - " Using default instance.\n", - "UDP QoS Factory")); - + ACE_ERROR ((LM_WARNING, + "(%P|%t) WARNING - No %s found in Service Repository." + " Using default instance.\n", + "UDP QoS Factory")); + ACE_NEW_RETURN (udp_qos_factory, TAO_AV_UDP_QoS_Factory, -1); } else udp_qos_factory->ref_count = 1; - ACE_NEW_RETURN (udp_qos_item, + ACE_NEW_RETURN (udp_qos_item, TAO_AV_Transport_Item ("UDP_QoS_Factory"), -1); - + udp_qos_item->factory (udp_qos_factory); - + this->transport_factories_.insert (udp_qos_item); #endif /*ACE_HAS_RAPI*/ @@ -719,9 +719,9 @@ TAO_AV_Core::init_transport_factories (void) if (factory == end) { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Loading default transport protocols\n")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Loading default transport protocols\n")); this->load_default_transport_factories (); } else @@ -729,11 +729,11 @@ TAO_AV_Core::init_transport_factories (void) for (; factory != end; factory++) { const ACE_CString &name = (*factory)->name (); - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s \n", name.c_str ())); - + (*factory)->factory ( ACE_Dynamic_Service<TAO_AV_Transport_Factory>::instance (name.c_str ())); if ((*factory)->factory () == 0) @@ -753,9 +753,8 @@ TAO_AV_Core::init_transport_factories (void) name.c_str ())); } } - } - + return 0; } @@ -776,14 +775,14 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) if (udp_flow_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, - "(%P|%t) WARNING - No %s found in Service Repository." - " Using default instance.\n", - "UDP Flow Factory")); + ACE_ERROR ((LM_WARNING, + "(%P|%t) WARNING - No %s found in Service Repository." + " Using default instance.\n", + "UDP Flow Factory")); ACE_NEW_RETURN (udp_flow_factory, - TAO_AV_UDP_Flow_Factory, - -1); + TAO_AV_UDP_Flow_Factory, + -1); } else udp_flow_factory->ref_count = 1; @@ -803,14 +802,14 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) if (udp_qos_flow_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, - "(%P|%t) WARNING - No %s found in Service Repository." - " Using default instance.\n", - "UDP QoS Flow Factory")); + ACE_ERROR ((LM_WARNING, + "(%P|%t) WARNING - No %s found in Service Repository." + " Using default instance.\n", + "UDP QoS Flow Factory")); ACE_NEW_RETURN (udp_qos_flow_factory, - TAO_AV_UDP_QoS_Flow_Factory, - -1); + TAO_AV_UDP_QoS_Flow_Factory, + -1); } else udp_qos_flow_factory->ref_count = 1; @@ -829,14 +828,14 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) if (tcp_flow_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, - "(%P|%t) WARNING - No %s found in Service Repository." - " Using default instance.\n", - "TCP Flow Factory")); + ACE_ERROR ((LM_WARNING, + "(%P|%t) WARNING - No %s found in Service Repository." + " Using default instance.\n", + "TCP Flow Factory")); ACE_NEW_RETURN (tcp_flow_factory, - TAO_AV_TCP_Flow_Factory, - -1); + TAO_AV_TCP_Flow_Factory, + -1); } else tcp_flow_factory->ref_count = 1; @@ -853,14 +852,14 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) if (rtp_flow_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, - "(%P|%t) WARNING - No %s found in Service Repository." - " Using default instance.\n", - "RTP Flow Factory")); + ACE_ERROR ((LM_WARNING, + "(%P|%t) WARNING - No %s found in Service Repository." + " Using default instance.\n", + "RTP Flow Factory")); ACE_NEW_RETURN (rtp_flow_factory, - TAO_AV_RTP_Flow_Factory, - -1); + TAO_AV_RTP_Flow_Factory, + -1); } else rtp_flow_factory->ref_count = 1; @@ -877,14 +876,14 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) if (rtcp_flow_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, - "(%P|%t) WARNING - No %s found in Service Repository." - " Using default instance.\n", - "RTCP Flow Factory")); + ACE_ERROR ((LM_WARNING, + "(%P|%t) WARNING - No %s found in Service Repository." + " Using default instance.\n", + "RTCP Flow Factory")); ACE_NEW_RETURN (rtcp_flow_factory, - TAO_AV_RTCP_Flow_Factory, - -1); + TAO_AV_RTCP_Flow_Factory, + -1); } else rtcp_flow_factory->ref_count = 1; @@ -901,14 +900,14 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) if (sfp_flow_factory == 0) { if (TAO_debug_level) - ACE_ERROR ((LM_WARNING, - "(%P|%t) WARNING - No %s found in Service Repository." - " Using default instance.\n", - "SFP Flow Factory")); + ACE_ERROR ((LM_WARNING, + "(%P|%t) WARNING - No %s found in Service Repository." + " Using default instance.\n", + "SFP Flow Factory")); ACE_NEW_RETURN (sfp_flow_factory, - TAO_AV_SFP_Factory, - -1); + TAO_AV_SFP_Factory, + -1); } else sfp_flow_factory->ref_count = 1; @@ -925,11 +924,11 @@ TAO_AV_Core::init_flow_protocol_factories (void) { TAO_AV_Flow_ProtocolFactorySetItor end = this->flow_protocol_factories_.end (); TAO_AV_Flow_ProtocolFactorySetItor factory = this->flow_protocol_factories_.begin (); - + if (factory == end) { ACE_DEBUG ((LM_DEBUG, - "Loading default flow protocol factories\n")); + "Loading default flow protocol factories\n")); this->load_default_flow_protocol_factories (); } @@ -938,7 +937,7 @@ TAO_AV_Core::init_flow_protocol_factories (void) for (; factory != end; factory++) { const ACE_CString &name = (*factory)->name (); - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s \n", name.c_str ())); @@ -953,7 +952,7 @@ TAO_AV_Core::init_flow_protocol_factories (void) name.c_str (), ""), -1); } - + (*factory)->factory ()->ref_count = 1; if (TAO_debug_level > 0) @@ -963,7 +962,6 @@ TAO_AV_Core::init_flow_protocol_factories (void) name.c_str ())); } } - } return 0; @@ -977,18 +975,18 @@ TAO_AV_Core::deactivate_servant (PortableServer::Servant servant) // the servant when all pending requests on this servant are // complete. - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - PortableServer::POA_var poa = servant->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (servant, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (servant + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h index 04fe9fb7c88..67b44fd1fd1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -85,8 +85,8 @@ public: ~TAO_AV_Core (void); int init (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - CORBA::Environment &env); + PortableServer::POA_ptr poa + TAO_ENV_ARG_DECL); int run (void); int stop_run (void); int init_forward_flows (TAO_Base_StreamEndPoint *endpoint, diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index 8919ca23faf..fe0fb2884ad 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -52,8 +52,8 @@ TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void) // and the remaining calls will fail automagically int TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_endpoint */, - AVStreams::VDev_ptr & /* vdev */, - CORBA::Environment &) + AVStreams::VDev_ptr & /* vdev */ + TAO_ENV_ARG_DECL_NOT_USED) { ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error creating A endpoint\n"), @@ -66,8 +66,8 @@ TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_ // and the remaining calls will fail automagically int TAO_AV_Endpoint_Strategy::create_B (AVStreams::StreamEndPoint_B_ptr & /* stream_endpoint */, - AVStreams::VDev_ptr & /*vdev */, - CORBA::Environment &) + AVStreams::VDev_ptr & /*vdev */ + TAO_ENV_ARG_DECL_NOT_USED) { ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error creating B endpoint\n"), @@ -156,19 +156,19 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) "remove"), -1); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Get ourselves a Naming service - this->bind_to_naming_service (ACE_TRY_ENV); + this->bind_to_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the stream endpoint created by the child from the naming service - this->get_stream_endpoint (ACE_TRY_ENV); + this->get_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Vdev created by the child from the naming service - this->get_vdev (ACE_TRY_ENV); + this->get_vdev (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -183,7 +183,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) // Get ourselves a Naming service reference int -TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -191,7 +191,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &AC return 0; CORBA::Object_var naming_obj = - TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService", ACE_TRY_ENV); + TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -199,8 +199,8 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &AC " (%P|%t) Unable to resolve the Name Service.\n"), -1); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -215,7 +215,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &AC // Get the VDev created in the child process from the namingservice int -TAO_AV_Endpoint_Process_Strategy::get_vdev (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Process_Strategy::get_vdev (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -235,14 +235,14 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (CORBA::Environment &ACE_TRY_ENV) // Get the CORBA::Object CORBA::Object_var vdev = - this->naming_context_->resolve (VDev_Name, - ACE_TRY_ENV); + this->naming_context_->resolve (VDev_Name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow it this->vdev_ = - AVStreams::VDev::_narrow (vdev.in (), - ACE_TRY_ENV); + AVStreams::VDev::_narrow (vdev.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check if valid @@ -279,8 +279,8 @@ TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A (void) // the "A" type endpoint creator int TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, - AVStreams::VDev_ptr &vdev, - CORBA::Environment &) + AVStreams::VDev_ptr &vdev + TAO_ENV_ARG_DECL_NOT_USED) { // use the baseclass activate if (this->activate () == -1) @@ -297,7 +297,7 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s // Gets the stream endpoint object reference from the naming service int -TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -318,14 +318,14 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (CORBA::Environment &ACE // Get the CORBA::Object CORBA::Object_var stream_endpoint_a = - this->naming_context_->resolve (Stream_Endpoint_A_Name, - ACE_TRY_ENV); + this->naming_context_->resolve (Stream_Endpoint_A_Name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the reference this->stream_endpoint_a_ = - AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in (), - ACE_TRY_ENV); + AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check for validity @@ -362,8 +362,8 @@ TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B (void) // Creates and returns a "B" type endpoint int TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, - AVStreams::VDev_ptr &vdev, - CORBA::Environment &ACE_TRY_ENV) + AVStreams::VDev_ptr &vdev + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -373,8 +373,8 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s -1); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is:%s\n", - TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_, - ACE_TRY_ENV))); + TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_ + TAO_ENV_ARG_PARAMETER))); ACE_TRY_CHECK; stream_endpoint = this->stream_endpoint_b_; vdev = this->vdev_; @@ -391,7 +391,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s // Gets the B type stream_endpoint from the Naming service int -TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -412,14 +412,14 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (CORBA::Environment &ACE // Get the CORBA::Object reference CORBA::Object_var stream_endpoint_b = - this->naming_context_->resolve (Stream_Endpoint_B_Name, - ACE_TRY_ENV); + this->naming_context_->resolve (Stream_Endpoint_B_Name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the reference this->stream_endpoint_b_ = - AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in (), - ACE_TRY_ENV); + AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check for validity diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h index 57038d447f8..7323dd79bcb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h @@ -43,13 +43,13 @@ public: /// Called by the MMDevice, when it needs to create an A type endpoint virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, - AVStreams::VDev_ptr &vdev, - CORBA::Environment &env); + AVStreams::VDev_ptr &vdev + TAO_ENV_ARG_DECL); /// Called by the MMDevice, when it needs to create an B type endpoint virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, - AVStreams::VDev_ptr &vdev, - CORBA::Environment &env); + AVStreams::VDev_ptr &vdev + TAO_ENV_ARG_DECL); protected: /// The "A" stream endpoint @@ -87,18 +87,18 @@ public: protected: /// Bind to the naming service - virtual int bind_to_naming_service (CORBA::Environment &env); + virtual int bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL); /** * Get the object reference for the newly created stream * endpoint (which will be in the child process) * Subclasses will define the functionality for this */ - virtual int get_stream_endpoint (CORBA::Environment &env) = 0; + virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) = 0; /// Get the Vdev object reference for the newly created /// endpoint - virtual int get_vdev (CORBA::Environment &env); + virtual int get_vdev (TAO_ENV_SINGLE_ARG_DECL); /// Naming context CosNaming::NamingContext_var naming_context_; @@ -134,11 +134,11 @@ public: protected: /// Creates an "A" type stream endpoint, and a vdev virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, - AVStreams::VDev_ptr &vdev, - CORBA::Environment &env); + AVStreams::VDev_ptr &vdev + TAO_ENV_ARG_DECL); /// Gets the "A" type stream endpoint from the child process - virtual int get_stream_endpoint (CORBA::Environment &env); + virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); }; @@ -162,12 +162,12 @@ public: protected: /// Creates a "B" type stream endpoint, and a vdev virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, - AVStreams::VDev_ptr &vdev, - CORBA::Environment &env); + AVStreams::VDev_ptr &vdev + TAO_ENV_ARG_DECL); /// Gets the object reference of the "B" type streamendpoint. - virtual int get_stream_endpoint (CORBA::Environment &env); + virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); }; diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index dbeadcf634a..7d552cc5bfe 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -32,15 +32,15 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->activate_stream_endpoint (ACE_TRY_ENV); + this->activate_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated stream_endpoint\n")); - this->activate_vdev (ACE_TRY_ENV); + this->activate_vdev (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated vdev\n")); - this->activate_mediactrl (ACE_TRY_ENV); + this->activate_mediactrl (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated mediactrl\n")); } @@ -56,22 +56,22 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> char * -TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL) { PortableServer::ObjectId_var id = - this->poa_->activate_object (servant, - ACE_TRY_ENV); + this->poa_->activate_object (servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Object_var obj = - this->poa_->id_to_reference (id.in (), - ACE_TRY_ENV); + this->poa_->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::String_var str = - this->orb_->object_to_string (obj.in (), - ACE_TRY_ENV); + this->orb_->object_to_string (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return str._retn (); @@ -81,7 +81,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ // Activate VDev into the POA template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int -TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -91,16 +91,16 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ return -1; // Activate the object under the root poa. - CORBA::String_var vdev_ior = this->activate_with_poa (vdev, - ACE_TRY_ENV); + CORBA::String_var vdev_ior = this->activate_with_poa (vdev + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_vdev, vdev ior is:%s\n", vdev_ior. in ())); // Save the object reference, so that create_A can return it - this->vdev_ = vdev->_this (ACE_TRY_ENV); + this->vdev_ = vdev->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - vdev->_remove_ref (ACE_TRY_ENV); + vdev->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -117,7 +117,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ // Activate the media_controller template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int -TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -127,8 +127,8 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ return -1; // Activate the mediactrl object under the root poa. - CORBA::String_var mediactrl_ior = this->activate_with_poa (media_ctrl, - ACE_TRY_ENV); + CORBA::String_var mediactrl_ior = this->activate_with_poa (media_ctrl + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl , media_ctrl ior is :%s\n", @@ -138,18 +138,18 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ // Associate the media controller object reference with the vdev, as per the OMG spec CORBA::Any anyval; CORBA::Object_var media_ctrl_obj - = media_ctrl->_this (ACE_TRY_ENV); + = media_ctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - media_ctrl->_remove_ref (ACE_TRY_ENV); + media_ctrl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - anyval <<= this->orb_->object_to_string (media_ctrl_obj.in (), - ACE_TRY_ENV); + anyval <<= this->orb_->object_to_string (media_ctrl_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->vdev_->define_property ("Related_MediaCtrl", - anyval, - ACE_TRY_ENV); + anyval + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -231,8 +231,8 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::ini template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, - AVStreams::VDev_ptr &vdev, - CORBA::Environment &/* ACE_TRY_ENV */) + AVStreams::VDev_ptr &vdev + TAO_ENV_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */) { if (this->activate () == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -248,7 +248,7 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea // Put the stream_endpoint into the POA template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int -TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -258,15 +258,15 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act if (this->make_stream_endpoint (stream_endpoint_a) == -1) return -1; - CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_a, - ACE_TRY_ENV); + CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_a + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ())); // Save the object references, so that create_a can return them - this->stream_endpoint_a_ = stream_endpoint_a->_this (ACE_TRY_ENV); + this->stream_endpoint_a_ = stream_endpoint_a->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - stream_endpoint_a->_remove_ref (ACE_TRY_ENV); + stream_endpoint_a->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -309,7 +309,7 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::ini // Activate stream_endpoint template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int -TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -317,14 +317,14 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act if (this->make_stream_endpoint (stream_endpoint_b) == -1) return -1; - CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_b, - ACE_TRY_ENV); + CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_b + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ())); - this->stream_endpoint_b_ = stream_endpoint_b->_this (ACE_TRY_ENV); + this->stream_endpoint_b_ = stream_endpoint_b->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - stream_endpoint_b->_remove_ref (ACE_TRY_ENV); + stream_endpoint_b->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -341,8 +341,8 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int TAO_AV_Endpoint_Reactive_Strategy_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, - AVStreams::VDev_ptr &vdev, - CORBA::Environment &/* ACE_TRY_ENV */) + AVStreams::VDev_ptr &vdev + TAO_ENV_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */) { if (this->activate () == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -389,20 +389,20 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc, // create the objects and activate them in the poa this->activate_objects (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get ourselves a naming_service object reference - this->bind_to_naming_service (ACE_TRY_ENV); + this->bind_to_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Register the vdev with the naming service - this->register_vdev (ACE_TRY_ENV); + this->register_vdev (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // register the stream_endpoing with the naming_service - this->register_stream_endpoint (ACE_TRY_ENV); + this->register_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -423,23 +423,23 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc, template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> char * -TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant, - CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant + TAO_ENV_ARG_DECL) { PortableServer::ObjectId_var id = - this->poa_->activate_object (servant, - ACE_TRY_ENV); + this->poa_->activate_object (servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Object_var obj = - this->poa_->id_to_reference (id.in (), - ACE_TRY_ENV); + this->poa_->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::String_var str = - this->orb_->object_to_string (obj.in (), - ACE_TRY_ENV); + this->orb_->object_to_string (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return str._retn (); @@ -449,8 +449,8 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects (int /*argc*/, - char ** /*argv*/, - CORBA::Environment &ACE_TRY_ENV) + char ** /*argv*/ + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -467,24 +467,24 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects return -1; // activate the stream_endpoint - CORBA::String_var stream_endpoint_ior = this->activate_with_poa (this->stream_endpoint_, - ACE_TRY_ENV); + CORBA::String_var stream_endpoint_ior = this->activate_with_poa (this->stream_endpoint_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t)TAO_AV_Child_Process::activate_objects,stream_endpoint_ior :%s\n", stream_endpoint_ior.in ())); // activate the vdev - CORBA::String_var vdev_ior = this->activate_with_poa (this->vdev_, - ACE_TRY_ENV); + CORBA::String_var vdev_ior = this->activate_with_poa (this->vdev_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t)TAO_AV_Child_Process::activate_objects, vdev ior is :%s\n", vdev_ior.in ())); // activate the media controller - CORBA::String_var media_ctrl_ior = this->activate_with_poa (this->media_ctrl_, - ACE_TRY_ENV); + CORBA::String_var media_ctrl_ior = this->activate_with_poa (this->media_ctrl_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,media_ctrl_ior is: %s\n",media_ctrl_ior.in ())); @@ -502,12 +502,12 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects // Bind to the namingservice template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int -TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references ("NameService", ACE_TRY_ENV); + this->orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -515,8 +515,8 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_se -1); // if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__)); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -532,7 +532,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_se // register the vdev with the naming service template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int -TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_ptr vdev_obj = CORBA::Object::_nil (); ACE_TRY @@ -552,26 +552,26 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (CO // make the media controller a property of the vdev CORBA::Any media_ctrl_property; CORBA::Object_var media_ctrl_obj = - this->media_ctrl_->_this (ACE_TRY_ENV); + this->media_ctrl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - media_ctrl_property <<= this->orb_->object_to_string (media_ctrl_obj.in (), - ACE_TRY_ENV); + media_ctrl_property <<= this->orb_->object_to_string (media_ctrl_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->vdev_->define_property ("Related_MediaCtrl", - media_ctrl_property, - ACE_TRY_ENV); + media_ctrl_property + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - vdev_obj = this->vdev_->_this (ACE_TRY_ENV); + vdev_obj = this->vdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->vdev_->_remove_ref (ACE_TRY_ENV); + this->vdev_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_TRY_EX (bind) { // Register the vdev with the naming server. this->naming_context_->bind (this->vdev_name_, - vdev_obj, - ACE_TRY_ENV); + vdev_obj + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (bind); } ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex) @@ -579,8 +579,8 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (CO // If the object was already there, replace the older reference // with this one this->naming_context_->rebind (this->vdev_name_, - vdev_obj, - ACE_TRY_ENV); + vdev_obj + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -609,7 +609,7 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::run (ACE_Time_V ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (tv, ACE_TRY_ENV); + this->orb_->run (tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -657,30 +657,30 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho // register the stream_endpoint with the naming service template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> int -TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (CORBA::Environment &ACE_TRY_ENV) +TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_ptr stream_endpoint_obj = CORBA::Object::_nil (); ACE_TRY { - stream_endpoint_obj = this->stream_endpoint_->_this (ACE_TRY_ENV); + stream_endpoint_obj = this->stream_endpoint_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->stream_endpoint_->_remove_ref (ACE_TRY_ENV); + this->stream_endpoint_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__)); // Create a name for the video control object // subclasses can define their own name for the streamendpoint // Register the stream endpoint object with the naming server. this->naming_context_->bind (this->stream_endpoint_name_, - stream_endpoint_obj, - ACE_TRY_ENV); + stream_endpoint_obj + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex) { // if the name was already there, replace the reference with the new one this->naming_context_->rebind (this->stream_endpoint_name_, - stream_endpoint_obj, - ACE_TRY_ENV); + stream_endpoint_obj + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -738,12 +738,12 @@ TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::unbind_names (void) { if (CORBA::is_nil (this->naming_context_.in ()) == 0) return 0; - this->naming_context_->unbind (this->stream_endpoint_name_, - ACE_TRY_ENV); + this->naming_context_->unbind (this->stream_endpoint_name_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->naming_context_->unbind (this->vdev_name_, - ACE_TRY_ENV); + this->naming_context_->unbind (this->vdev_name_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h index bc1a20f5b10..f4cb2acefd7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -7,7 +7,7 @@ * * $Id$ * - * @author Sumedh Mungee <sumedh@cs.wustl.edu> + * @author Sumedh Mungee <sumedh@cs.wustl.edu> * @author Nagarajan Surendran <naga@cs.wustl.edu> */ //============================================================================= @@ -42,15 +42,15 @@ protected: virtual int activate (void); /// activates the stream_endpoint with the POA - virtual int activate_stream_endpoint (CORBA::Environment &env) = 0; + virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) = 0; /// activates the vdev with the POA - virtual int activate_vdev (CORBA::Environment &env); + virtual int activate_vdev (TAO_ENV_SINGLE_ARG_DECL); /// activates the media controller with the POA - virtual int activate_mediactrl (CORBA::Environment &env); + virtual int activate_mediactrl (TAO_ENV_SINGLE_ARG_DECL); /// Bridge method to create a vdev, a la Acceptor. Applications /// can override this @@ -65,10 +65,10 @@ protected: virtual int make_mediactrl (T_MediaCtrl *&media_ctrl); - char* activate_with_poa (PortableServer::Servant servant, CORBA::Environment &env); - + char* activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL); + CORBA::ORB_var orb_; - + PortableServer::POA_var poa_; }; @@ -95,12 +95,12 @@ public: /// Overrides the base class stream_endpoint activator, to activate /// an "A" type endpoint - virtual int activate_stream_endpoint (CORBA::Environment &env); + virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); /// Called by the MMDevice, when it needs to create an A type endpoint virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, - AVStreams::VDev_ptr &vdev, - CORBA::Environment &env); + AVStreams::VDev_ptr &vdev + TAO_ENV_ARG_DECL); }; @@ -126,12 +126,12 @@ public: /// Overrides the base class stream_endpoint activator, to activate /// a "B" type endpoint - virtual int activate_stream_endpoint (CORBA::Environment &env); + virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); /// Called by the MMDevice, when it needs to create a B type endpoint virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, - AVStreams::VDev_ptr &vdev, - CORBA::Environment &env); + AVStreams::VDev_ptr &vdev + TAO_ENV_ARG_DECL); }; // ---------------------------------------------------------------------- @@ -139,7 +139,7 @@ public: /** * @class TAO_AV_Child_Process * - * @brief Helper class for the child process created in + * @brief Helper class for the child process created in * TAO_AV_Endpoint_Process_Strategy */ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> @@ -167,23 +167,23 @@ protected: * return them to the client */ int activate_objects (int argc, - char **argv, - CORBA::Environment &env); + char **argv + TAO_ENV_ARG_DECL); ///activate the servant with the poa - char* activate_with_poa (PortableServer::Servant servant, CORBA::Environment &env); + char* activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL); /// Removes the vdev and streamendpoint names from the naming service. int unbind_names (void); /// Binds to the naming service - int bind_to_naming_service (CORBA::Environment &env); + int bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL); /// Registers vdev with the naming service - int register_vdev (CORBA::Environment &env); + int register_vdev (TAO_ENV_SINGLE_ARG_DECL); /// Registers stream_endpoint with the naming service - int register_stream_endpoint (CORBA::Environment &env); + int register_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); /// Releases the semaphore on which the parent is waiting on int release_semaphore (); @@ -225,7 +225,7 @@ protected: char host_[MAXHOSTNAMELEN]; CORBA::ORB_ptr orb_; - + PortableServer::POA_ptr poa_; }; diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index b3ba91ba109..1fa9ad94fda 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -129,7 +129,7 @@ TAO_FlowSpec_Entry::set_protocol (void) else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"UDP") == 0) this->protocol_ = TAO_AV_Core::TAO_AV_UDP; else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"QoS_UDP") == 0) - this->protocol_ = TAO_AV_Core::TAO_AV_QOS_UDP; + this->protocol_ = TAO_AV_Core::TAO_AV_QOS_UDP; else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"AAL5") == 0) this->protocol_ = TAO_AV_Core::TAO_AV_AAL5; else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"AAL3_4") == 0) diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i index d5c25a71e12..631e07e676b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ // FlowSpec_Entry.i @@ -26,11 +27,11 @@ TAO_FlowSpec_Entry::parse_flow_protocol_string (const char *flow_string) { if (flow_string == 0) return 0; - + this->use_flow_protocol_ = 1; // do some flow protocol processing. this->flow_protocol_ = flow_string; - + return 0; } diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp index 29934d8b234..e26e6bc7116 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp @@ -27,8 +27,8 @@ TAO_FDev<T_Producer, T_Consumer>::TAO_FDev (const char *flowname) 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; } ACE_CATCHANY @@ -62,8 +62,8 @@ TAO_FDev<T_Producer, T_Consumer>::flowname (const char *flow_name) CORBA::Any flowname_any; flowname_any <<= flow_name; this->define_property ("Flow", - flowname_any, - ACE_TRY_ENV); + flowname_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -80,8 +80,8 @@ AVStreams::FlowProducer_ptr TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr the_requester, AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, - char *& named_fdev, - CORBA::Environment &ACE_TRY_ENV) + char *& named_fdev + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -92,8 +92,8 @@ TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr return this->make_producer (the_requester, the_qos, met_qos, - named_fdev, - ACE_TRY_ENV); + named_fdev + TAO_ENV_ARG_PARAMETER); } template <class T_Producer, class T_Consumer> @@ -102,8 +102,8 @@ AVStreams::FlowProducer_ptr TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr /* the_requester */, AVStreams::QoS & /* the_qos */, CORBA::Boolean_out /* met_qos */, - char *& /* named_fdev */, - CORBA::Environment &ACE_TRY_ENV) + char *& /* named_fdev */ + TAO_ENV_ARG_DECL) { AVStreams::FlowProducer_ptr producer = AVStreams::FlowProducer::_nil (); ACE_TRY @@ -114,7 +114,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr / T_Producer, 0); this->producer_list_.insert_tail (producer_i); - producer = producer_i->_this (ACE_TRY_ENV); + producer = producer_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -133,8 +133,8 @@ AVStreams::FlowConsumer_ptr TAO_FDev<T_Producer, T_Consumer>::make_consumer (AVStreams::FlowConnection_ptr /* the_requester */, AVStreams::QoS & /* the_qos */, CORBA::Boolean_out /* met_qos */, - char *& /* named_fdev */, - CORBA::Environment &ACE_TRY_ENV) + char *& /* named_fdev */ + TAO_ENV_ARG_DECL) { AVStreams::FlowConsumer_ptr consumer = AVStreams::FlowConsumer::_nil (); ACE_TRY @@ -145,7 +145,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_consumer (AVStreams::FlowConnection_ptr / T_Consumer, 0); this->consumer_list_.insert_tail (consumer_i); - consumer = consumer_i->_this (ACE_TRY_ENV); + consumer = consumer_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -163,8 +163,8 @@ AVStreams::FlowConsumer_ptr TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr the_requester, AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, - char *& named_fdev, - CORBA::Environment &ACE_TRY_ENV) + char *& named_fdev + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -174,8 +174,8 @@ TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr return this->make_consumer (the_requester, the_qos, met_qos, - named_fdev, - ACE_TRY_ENV); + named_fdev + TAO_ENV_ARG_PARAMETER); } template <class T_Producer, class T_Consumer> @@ -183,8 +183,8 @@ template <class T_Producer, class T_Consumer> AVStreams::FlowConnection_ptr TAO_FDev<T_Producer, T_Consumer>::bind (AVStreams::FDev_ptr peer_device, AVStreams::QoS & the_qos, - CORBA::Boolean_out is_met, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean_out is_met + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::QoSRequestFailed)) @@ -192,7 +192,6 @@ TAO_FDev<T_Producer, T_Consumer>::bind (AVStreams::FDev_ptr peer_device, ACE_UNUSED_ARG (peer_device); ACE_UNUSED_ARG (the_qos); ACE_UNUSED_ARG (is_met); - ACE_UNUSED_ARG (ACE_TRY_ENV); ACE_CHECK_RETURN (0); return 0; } @@ -202,8 +201,8 @@ template <class T_Producer, class T_Consumer> AVStreams::FlowConnection_ptr TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer, AVStreams::QoS & the_qos, - CORBA::Boolean_out is_met, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean_out is_met + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::QoSRequestFailed)) @@ -211,7 +210,6 @@ TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer, ACE_UNUSED_ARG (first_peer); ACE_UNUSED_ARG (the_qos); ACE_UNUSED_ARG (is_met); - ACE_UNUSED_ARG (ACE_TRY_ENV); ACE_CHECK_RETURN (0); return 0; } @@ -219,8 +217,8 @@ TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer, template <class T_Producer, class T_Consumer> void TAO_FDev<T_Producer, T_Consumer>::destroy (AVStreams::FlowEndPoint_ptr /* the_ep */, - const char * /* fdev_name */, - CORBA::Environment &/*ACE_TRY_ENV*/) + const char * /* fdev_name */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h index 2277277f4cd..b227851f3e7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h @@ -47,8 +47,8 @@ public: AVStreams::FlowProducer_ptr create_producer (AVStreams::FlowConnection_ptr the_requester, AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, - char *& named_fdev, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + char *& named_fdev + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -60,15 +60,15 @@ public: virtual AVStreams::FlowProducer_ptr make_producer (AVStreams::FlowConnection_ptr the_requester, AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, - char *& named_fdev, - CORBA::Environment &env = CORBA::Environment::default_environment ()); + char *& named_fdev + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// create a flow consumer object. virtual AVStreams::FlowConsumer_ptr create_consumer (AVStreams::FlowConnection_ptr the_requester, AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, - char *& named_fdev, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + char *& named_fdev + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -80,14 +80,14 @@ public: virtual AVStreams::FlowConsumer_ptr make_consumer (AVStreams::FlowConnection_ptr the_requester, AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, - char *& named_fdev, - CORBA::Environment &env = CORBA::Environment::default_environment ()); + char *& named_fdev + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// bind this FDev with another FDev. virtual AVStreams::FlowConnection_ptr bind (AVStreams::FDev_ptr peer_device, AVStreams::QoS & the_qos, - CORBA::Boolean_out is_met, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + CORBA::Boolean_out is_met + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::QoSRequestFailed)); @@ -95,17 +95,16 @@ public: /// multicast bind is not implemented yet. virtual AVStreams::FlowConnection_ptr bind_mcast (AVStreams::FDev_ptr first_peer, AVStreams::QoS & the_qos, - CORBA::Boolean_out is_met, - CORBA::Environment &env = CORBA::Environment::default_environment ()) + CORBA::Boolean_out is_met + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::QoSRequestFailed)); /// destroys this FDev. virtual void destroy (AVStreams::FlowEndPoint_ptr the_ep, - const char * fdev_name, - CORBA::Environment &env = - CORBA::Environment::default_environment ()) + const char * fdev_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)); diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index dcf151a4691..dbeb3e615f0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -20,7 +20,7 @@ static int resv_confirm = 0; int FillQoSParams (ACE_QoS_Params &qos_params, - iovec* iov, + iovec* iov, ACE_QoS* qos) { qos_params.callee_data (iov); @@ -43,98 +43,98 @@ TAO_AV_UDP_QoS_Session_Helper::~TAO_AV_UDP_QoS_Session_Helper (void) int TAO_AV_UDP_QoS_Session_Helper::set_qos (ACE_Flow_Spec &ace_flow_spec, - TAO_AV_UDP_QoS_Flow_Handler *handler) + TAO_AV_UDP_QoS_Flow_Handler *handler) { ACE_QoS* ace_qos = 0; ACE_NEW_RETURN (ace_qos, - ACE_QoS, - -1); - + ACE_QoS, + -1); + Fill_ACE_QoS fill_ace_qos; - + if (handler->flowspec_entry ()->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER) { if (fill_ace_qos.fill_simplex_sender_qos (*ace_qos, - &ace_flow_spec) !=0) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to fill simplex sender qos (%N|%l)\n"), - -1); + &ace_flow_spec) !=0) + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to fill simplex sender qos (%N|%l)\n"), + -1); else - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Filled up the Sender QoS parameters\n")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Filled up the Sender QoS parameters\n")); } else if (handler->flowspec_entry ()->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER) { if (fill_ace_qos.fill_simplex_receiver_qos (*ace_qos, - &ace_flow_spec) !=0) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to fill simplex receiver qos (%N|%l)\n"), - -1); + &ace_flow_spec) !=0) + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to fill simplex receiver qos (%N|%l)\n"), + -1); else - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Filled up the Receiver QoS parameters\n")); + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Filled up the Receiver QoS parameters\n")); } - + ACE_QoS_Manager qos_manager = handler->get_socket ()->qos_manager (); - + // Set the QoS for the session. Replaces the ioctl () call that // was being made previously. if (handler->qos_session ()->qos (handler->get_socket (), - &qos_manager, - *ace_qos) == -1) + &qos_manager, + *ace_qos) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "Unable to set QoS (%N|%l)\n"), - -1); + "Unable to set QoS (%N|%l)\n"), + -1); else ACE_DEBUG ((LM_DEBUG, - "Setting QOS succeeds\n")); + "Setting QOS succeeds\n")); return 0; } ACE_QoS_Session * TAO_AV_UDP_QoS_Session_Helper::open_qos_session (TAO_AV_UDP_QoS_Flow_Handler *handler, - ACE_INET_Addr &addr) + ACE_INET_Addr &addr) { ACE_QoS_Params qos_params; - + ACE_QoS* ace_qos = 0; - - FillQoSParams (qos_params, - 0, - ace_qos); - - + + FillQoSParams (qos_params, + 0, + ace_qos); + + // Create a QoS Session Factory. ACE_QoS_Session_Factory session_factory; - + // Ask the factory to create a QoS session. This could be RAPI or // GQoS based on the parameter passed. - + //@@YAmuna : Later make this generic for GQoS ACE_QoS_Session *qos_session = session_factory.create_session (ACE_QoS_Session_Factory::ACE_RAPI_SESSION); - + // Create a destination address for the QoS session. The same // address should be used for the subscribe call later. A copy // is made below only to distinguish the two usages of the dest // address. ACE_INET_Addr dest_addr (addr); - + // A QoS session is defined by the 3-tuple [DestAddr, DestPort, // Protocol]. Initialize the QoS session. if (qos_session->open (dest_addr, - IPPROTO_UDP) == -1) + IPPROTO_UDP) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "Error in opening the QoS session\n"), - 0); + "Error in opening the QoS session\n"), + 0); else ACE_DEBUG ((LM_DEBUG, - "QoS session opened successfully\n")); - + "QoS session opened successfully\n")); + if (handler->flowspec_entry ()->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER) { // This is a sender @@ -151,34 +151,34 @@ TAO_AV_UDP_QoS_Session_Helper::open_qos_session (TAO_AV_UDP_QoS_Flow_Handler *ha int TAO_AV_UDP_QoS_Session_Helper::activate_qos_handler (ACE_QoS_Session *qos_session, - TAO_AV_UDP_QoS_Flow_Handler *handler) + TAO_AV_UDP_QoS_Flow_Handler *handler) { ACE_QoS_Decorator* qos_decorator; - - // Decorate the above handler with QoS functionality. + + // Decorate the above handler with QoS functionality. ACE_NEW_RETURN (qos_decorator, - ACE_QoS_Decorator (handler, - qos_session, - handler->av_core ()->reactor ()), + ACE_QoS_Decorator (handler, + qos_session, + handler->av_core ()->reactor ()), -1); - + // Initialize the Decorator. if (qos_decorator->init () != 0) ACE_ERROR_RETURN ((LM_ERROR, - "QoS Decorator init () failed (%N|%l)\n"), - -1); - + "QoS Decorator init () failed (%N|%l)\n"), + -1); + // Register the decorated Event Handler with the Reactor. int result = handler->av_core ()->reactor ()->register_handler (qos_decorator, - ACE_Event_Handler::QOS_MASK | - ACE_Event_Handler::READ_MASK); + ACE_Event_Handler::QOS_MASK | + ACE_Event_Handler::READ_MASK); if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, - "Error in registering the Decorator with the Reactor (%N|%l)\n"), - -1); - + "Error in registering the Decorator with the Reactor (%N|%l)\n"), + -1); + return 0; - + } TAO_AV_UDP_QoS_Flow_Handler::TAO_AV_UDP_QoS_Flow_Handler (void) @@ -207,7 +207,7 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_input (ACE_HANDLE /*fd*/) int TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_params, - ACE_Flow_Spec *ace_flow_spec) + ACE_Flow_Spec *ace_flow_spec) { for (unsigned int i = 0; i < qos_params.length (); @@ -220,7 +220,7 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_para ace_flow_spec->service_type (type); } else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Rate") == 0) - { + { CORBA::ULong tok_rate; qos_params [i].property_value >>= tok_rate; ace_flow_spec->token_rate (tok_rate); @@ -231,7 +231,7 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_para qos_params [i].property_value >>= tok_buck_size; ace_flow_spec->token_bucket_size (tok_buck_size); } - else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0) + else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0) { CORBA::ULong peak_bw; qos_params [i].property_value >>= peak_bw; @@ -280,7 +280,7 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_para int TAO_AV_UDP_QoS_Flow_Handler::translate (ACE_Flow_Spec *ace_flow_spec, - CosPropertyService::Properties &qos_params) + CosPropertyService::Properties &qos_params) { qos_params.length (9); @@ -289,10 +289,10 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (ACE_Flow_Spec *ace_flow_spec, qos_params [1].property_name = CORBA::string_dup ("Token_Rate"); qos_params [1].property_value <<= (CORBA::ULong) ace_flow_spec->token_rate (); - + qos_params [2].property_name = CORBA::string_dup ("Token_Bucket_Size"); qos_params [2].property_value <<= (CORBA::ULong) ace_flow_spec->token_bucket_size (); - + qos_params [3].property_name = CORBA::string_dup ("Peak_Bandwidth"); qos_params [3].property_value <<= (CORBA::ULong) ace_flow_spec->peak_bandwidth (); @@ -301,10 +301,10 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (ACE_Flow_Spec *ace_flow_spec, qos_params [5].property_name = CORBA::string_dup ("Delay_Variation"); qos_params [5].property_value <<= (CORBA::ULong) ace_flow_spec->delay_variation (); - + qos_params [6].property_name = CORBA::string_dup ("Max_SDU_Size"); qos_params [6].property_value <<= (CORBA::ULong) ace_flow_spec->max_sdu_size (); - + qos_params [7].property_name = CORBA::string_dup ("Minimum_Policed_Size"); qos_params [7].property_value <<= (CORBA::ULong) ace_flow_spec->minimum_policed_size (); @@ -318,14 +318,14 @@ int TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n")); + "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n")); if (this->qos_session_->update_qos () == -1) ACE_ERROR_RETURN ((LM_ERROR, - "Error in updating QoS\n"), + "Error in updating QoS\n"), -1); else { @@ -349,51 +349,51 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/) if (this->qos_session_->rsvp_event_type () == ACE_QoS_Session::RSVP_RESV_EVENT) { if( TAO_debug_level > 0 ) - { - ACE_DEBUG ((LM_DEBUG, - "(%N,%l) Resv Event Received\n")); - } - if (!CORBA::is_nil (this->negotiator_)) - { + { + ACE_DEBUG ((LM_DEBUG, + "(%N,%l) Resv Event Received\n")); + } + if (!CORBA::is_nil (this->negotiator_)) + { if( TAO_debug_level > 0 ) - { - ACE_DEBUG ((LM_DEBUG, - "(%N,%l) Negotiator Specified\n")); - } - - AVStreams::streamQoS new_qos; - ACE_Flow_Spec *ace_flow_spec = - this->qos_session_->qos ().sending_flowspec (); - - if (ace_flow_spec != 0) - { - new_qos.length (1); - this->translate (ace_flow_spec, - new_qos [0].QoSParams); - } - - AVStreams::Negotiator_var remote_negotiator; - this->negotiator_->negotiate (remote_negotiator.in (), - new_qos, - ACE_TRY_ENV); - } + { + ACE_DEBUG ((LM_DEBUG, + "(%N,%l) Negotiator Specified\n")); + } + + AVStreams::streamQoS new_qos; + ACE_Flow_Spec *ace_flow_spec = + this->qos_session_->qos ().sending_flowspec (); + + if (ace_flow_spec != 0) + { + new_qos.length (1); + this->translate (ace_flow_spec, + new_qos [0].QoSParams); + } + + AVStreams::Negotiator_var remote_negotiator; + this->negotiator_->negotiate (remote_negotiator.in (), + new_qos + TAO_ENV_ARG_PARAMETER); + } } } else if (this->qos_session_->flags () == ACE_QoS_Session::ACE_QOS_RECEIVER) { if (this->qos_session_->rsvp_event_type () == ACE_QoS_Session::RSVP_PATH_EVENT) - { - ACE_QoS_Manager qos_manager = - this->get_socket ()->qos_manager (); - - ACE_QoS ace_qos = this->qos_session_->qos (); - - this->qos_session_->qos (this->get_socket (), - &qos_manager, - ace_qos); - } + { + ACE_QoS_Manager qos_manager = + this->get_socket ()->qos_manager (); + + ACE_QoS ace_qos = this->qos_session_->qos (); + + this->qos_session_->qos (this->get_socket (), + &qos_manager, + ace_qos); + } } - + return 0; } @@ -403,74 +403,74 @@ TAO_AV_UDP_QoS_Flow_Handler::change_qos (AVStreams::QoS new_qos) if( TAO_debug_level > 0 ) { ACE_DEBUG ((LM_DEBUG, - "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::change_qos\n")); + "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::change_qos\n")); } ACE_QoS* ace_qos = 0; ACE_NEW_RETURN (ace_qos, - ACE_QoS, - -1); - + ACE_QoS, + -1); + if (new_qos.QoSParams.length () != 0) { ACE_DEBUG ((LM_DEBUG, - "New QoS Params are not Empty\n")); + "New QoS Params are not Empty\n")); ACE_Flow_Spec *ace_flow_spec; - + ACE_NEW_RETURN (ace_flow_spec, - ACE_Flow_Spec, - -1); - + ACE_Flow_Spec, + -1); + this->translate (new_qos.QoSParams, - ace_flow_spec); - - + ace_flow_spec); + + Fill_ACE_QoS fill_ace_qos; if (this->qos_session_->flags () == ACE_QoS_Session::ACE_QOS_SENDER) - { - if (fill_ace_qos.fill_simplex_sender_qos (*ace_qos, - ace_flow_spec) !=0) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to fill simplex sender qos\n"), - -1); - else - { - if( TAO_debug_level > 0 ) - ACE_DEBUG ((LM_DEBUG, - "(%N,%l) Filled up the Sender QoS parameters\n")); - } - } + { + if (fill_ace_qos.fill_simplex_sender_qos (*ace_qos, + ace_flow_spec) !=0) + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to fill simplex sender qos\n"), + -1); + else + { + if( TAO_debug_level > 0 ) + ACE_DEBUG ((LM_DEBUG, + "(%N,%l) Filled up the Sender QoS parameters\n")); + } + } else if (this->qos_session_->flags () == ACE_QoS_Session::ACE_QOS_RECEIVER) - { - if (fill_ace_qos.fill_simplex_receiver_qos (*ace_qos, - ace_flow_spec) !=0) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to fill simplex receiver qos\n"), - -1); - else - { - if( TAO_debug_level > 0 ) - ACE_DEBUG ((LM_DEBUG, - "(%N,%l) Filled up the Receiver QoS parameters\n")); - } - - } - + { + if (fill_ace_qos.fill_simplex_receiver_qos (*ace_qos, + ace_flow_spec) !=0) + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to fill simplex receiver qos\n"), + -1); + else + { + if( TAO_debug_level > 0 ) + ACE_DEBUG ((LM_DEBUG, + "(%N,%l) Filled up the Receiver QoS parameters\n")); + } + + } + ACE_QoS_Params qos_params; - FillQoSParams (qos_params, - 0, - ace_qos); + FillQoSParams (qos_params, + 0, + ace_qos); } ACE_QoS_Manager qos_manager = this->get_socket ()->qos_manager (); - + int result = this->qos_session_->qos (this->get_socket (), - &qos_manager, - *ace_qos); + &qos_manager, + *ace_qos); if (result != 0) return result; @@ -478,7 +478,7 @@ TAO_AV_UDP_QoS_Flow_Handler::change_qos (AVStreams::QoS new_qos) } int -TAO_AV_UDP_QoS_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, +TAO_AV_UDP_QoS_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, const void *arg) { return TAO_AV_Flow_Handler::handle_timeout (tv,arg); @@ -487,41 +487,41 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, int TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) { - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::set_remote_address\n")); + "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::set_remote_address\n")); - ACE_INET_Addr *inet_addr = + ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,address); this->peer_addr_ = *inet_addr; - TAO_AV_UDP_QoS_Transport *transport = + TAO_AV_UDP_QoS_Transport *transport = ACE_dynamic_cast (TAO_AV_UDP_QoS_Transport*,this->transport_); - + if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER) { TAO_AV_UDP_QoS_Session_Helper helper; this->qos_session_ = helper.open_qos_session (this, - *inet_addr); - + *inet_addr); + if (this->qos_session_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "QoS Session Open Failed (%N|%l)\n"), - -1); - + ACE_ERROR_RETURN ((LM_ERROR, + "QoS Session Open Failed (%N|%l)\n"), + -1); + ACE_INET_Addr local_addr; this->get_socket ()->get_local_addr (local_addr); this->qos_session_->source_port (local_addr.get_port_number ()); if (helper.activate_qos_handler (this->qos_session_, - this) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Activating QoS Handler Failed (%N|%l)\n"), - -1); + this) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + "Activating QoS Handler Failed (%N|%l)\n"), + -1); } return transport->set_remote_address (*inet_addr); } @@ -530,10 +530,10 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) ACE_HANDLE TAO_AV_UDP_QoS_Flow_Handler::get_handle (void) const { - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::get_handle:%d\n", - this->qos_sock_dgram_.get_handle ())); + "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::get_handle:%d\n", + this->qos_sock_dgram_.get_handle ())); return this->qos_sock_dgram_.get_handle () ; } @@ -589,8 +589,8 @@ TAO_AV_UDP_QoS_Transport::get_peer_addr (void) } ssize_t -TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk, - ACE_Time_Value *) +TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk, + ACE_Time_Value *) { // For the most part this was copied from GIOP::send_request and // friends. @@ -617,34 +617,34 @@ TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk, // the data into a buffer and call send_n(). In other cases // there may be some limits on the size of the iovec, there // we should set IOV_MAX to that limit. - - size_t bytes_sent = 0; + + size_t bytes_sent = 0; if (iovcnt == IOV_MAX) { if (this->handler_->get_socket ()->send (iov, - 1, - bytes_sent, - 0, - this->handler_->qos_session ()->dest_addr (), - 0, - 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Error in dgram_mcast.send () (%N|%l)\n"), - -1); - else - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Using ACE_OS::sendto () : Bytes sent : %d", - bytes_sent)); - - if (n < 1) + 1, + bytes_sent, + 0, + this->handler_->qos_session ()->dest_addr (), + 0, + 0) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + "Error in dgram_mcast.send () (%N|%l)\n"), + -1); + else + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Using ACE_OS::sendto () : Bytes sent : %d", + bytes_sent)); + + if (n < 1) return n; - - nbytes += bytes_sent; - iovcnt = 0; - } - } + + nbytes += bytes_sent; + iovcnt = 0; + } + } } size_t bytes_sent = 0; @@ -653,21 +653,21 @@ TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk, if (iovcnt != 0) { if (this->handler_->get_socket ()->send (iov, - 1, - bytes_sent, - 0, - this->handler_->qos_session ()->dest_addr (), - 0, - 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Error in dgram_mcast.send ()\n"), - -1); + 1, + bytes_sent, + 0, + this->handler_->qos_session ()->dest_addr (), + 0, + 0) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + "Error in dgram_mcast.send ()\n"), + -1); else if( TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "(%N,%l) Using ACE_OS::sendto () : Bytes sent : %d", - bytes_sent)); - + ACE_DEBUG ((LM_DEBUG, + "(%N,%l) Using ACE_OS::sendto () : Bytes sent : %d", + bytes_sent)); + if (n < 1) return n; @@ -684,36 +684,36 @@ TAO_AV_UDP_QoS_Transport::send (const char *buf, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "(%N,%l) TAO_AV_UDP_QoS_Transport::send ")); + "(%N,%l) TAO_AV_UDP_QoS_Transport::send ")); char addr [BUFSIZ]; this->peer_addr_.addr_to_string (addr,BUFSIZ); - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "(%N,%l) to %s\n", - addr)); + "(%N,%l) to %s\n", + addr)); return this->handler_->get_socket ()->send (buf, - len, - this->handler_->qos_session ()->dest_addr (), - 0, - 0, - 0); + len, + this->handler_->qos_session ()->dest_addr (), + 0, + 0, + 0); } ssize_t TAO_AV_UDP_QoS_Transport::send (const iovec *iov, - int /*iovcnt*/, - ACE_Time_Value *) + int /*iovcnt*/, + ACE_Time_Value *) { size_t bytes_sent = 0; if (this->handler_->get_socket ()->send (iov, - 1, - bytes_sent, - 0, - this->handler_->qos_session ()->dest_addr (), - 0, - 0) == -1) + 1, + bytes_sent, + 0, + this->handler_->qos_session ()->dest_addr (), + 0, + 0) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Error in dgram_mcast.send ()\n"), -1); @@ -722,10 +722,10 @@ TAO_AV_UDP_QoS_Transport::send (const iovec *iov, if( TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%N,%l) Using ACE_OS::sendto () : Bytes sent : %d", - bytes_sent)); + bytes_sent)); } - + return bytes_sent; } @@ -775,20 +775,20 @@ int TAO_AV_UDP_QoS_Acceptor::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *handler) { int result = 0; - + if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "(%N,%l) Acceptor Svc Handler QOS ENABLED \n")); + ACE_DEBUG ((LM_DEBUG, + "(%N,%l) Acceptor Svc Handler QOS ENABLED \n")); TAO_AV_UDP_QoS_Session_Helper helper; result = helper.activate_qos_handler (handler->qos_session (), - handler); + handler); if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, - "Error in registering the Decorator with the Reactor\n"), - -1); - + "Error in registering the Decorator with the Reactor\n"), + -1); + return result; } @@ -801,9 +801,9 @@ TAO_AV_UDP_QoS_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, { ACE_UNUSED_ARG (flow_comp); - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "(%N,%l) TAO_AV_UDP_QoS_Acceptor::open ")); + "(%N,%l) TAO_AV_UDP_QoS_Acceptor::open ")); this->av_core_ = av_core; this->endpoint_ = endpoint; @@ -818,10 +818,10 @@ TAO_AV_UDP_QoS_Acceptor::open (TAO_Base_StreamEndPoint *endpoint, char buf[BUFSIZ]; inet_addr->addr_to_string (buf, BUFSIZ); - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "(%N,%l) TAO_AV_UDP_QoS_Acceptor::open: %s", - buf)); + "(%N,%l) TAO_AV_UDP_QoS_Acceptor::open: %s", + buf)); int result = this->open_i (inet_addr); @@ -847,7 +847,7 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, this->flowname_ = entry->flowname (); char buf [BUFSIZ]; ACE_OS::hostname (buf, - BUFSIZ); + BUFSIZ); ACE_CString addr (buf); addr += ":8000"; ACE_INET_Addr *address; @@ -856,10 +856,10 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, -1); address->addr_to_string (buf, - BUFSIZ); + BUFSIZ); ACE_DEBUG ((LM_DEBUG, - "(%N,%l) ADDRESS IS %s\n", - buf)); + "(%N,%l) ADDRESS IS %s\n", + buf)); int result = this->open_i (address); if (result < 0) @@ -871,66 +871,66 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, int TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; int result = 0; - - // TAO_AV_Callback *callback = 0; + + // TAO_AV_Callback *callback = 0; // this->endpoint_->get_callback (this->flowname_.c_str (), // callback); ACE_INET_Addr *local_addr; ACE_NEW_RETURN (local_addr, - ACE_INET_Addr (*inet_addr), - -1); + ACE_INET_Addr (*inet_addr), + -1); ACE_QoS_Params qos_params; ACE_QoS* ace_qos = 0; - FillQoSParams (qos_params, - 0, - ace_qos); + FillQoSParams (qos_params, + 0, + ace_qos); + - TAO_AV_UDP_QoS_Flow_Handler* handler; ACE_NEW_RETURN (handler, - TAO_AV_UDP_QoS_Flow_Handler, - -1); - - + TAO_AV_UDP_QoS_Flow_Handler, + -1); + + TAO_AV_Flow_Handler *flow_handler = 0; flow_handler = handler; - + handler->endpoint (this->endpoint_); handler->flowspec_entry (this->entry_); handler->av_core (this->av_core_); if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER) { - + TAO_AV_UDP_QoS_Session_Helper helper; - + int result = handler->get_socket ()->open (*inet_addr, - qos_params, - AF_INET, - 0, - 0, - 0, - ACE_OVERLAPPED_SOCKET_FLAG - | ACE_FLAG_MULTIPOINT_C_LEAF - | ACE_FLAG_MULTIPOINT_D_LEAF, - 1); - + qos_params, + AF_INET, + 0, + 0, + 0, + ACE_OVERLAPPED_SOCKET_FLAG + | ACE_FLAG_MULTIPOINT_C_LEAF + | ACE_FLAG_MULTIPOINT_D_LEAF, + 1); + if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, - "TAO_AV_QOS_UDP_MCast_Acceptor data socket open failed (%N|%l)\n"), - -1); + ACE_ERROR_RETURN ((LM_ERROR, + "TAO_AV_QOS_UDP_MCast_Acceptor data socket open failed (%N|%l)\n"), + -1); result = handler->get_socket ()->get_local_addr (*local_addr); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Error in getting Local Address (%N|%l)\n"), - -1); + ACE_ERROR_RETURN ((LM_ERROR, + "Error in getting Local Address (%N|%l)\n"), + -1); // Create a destination address for the QoS session. The same // address should be used for the subscribe call later. A copy @@ -938,89 +938,89 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) // address. ACE_INET_Addr dest_addr; dest_addr.set (local_addr->get_port_number (), - local_addr->get_host_name ()); - + local_addr->get_host_name ()); + char dest_buf [BUFSIZ]; dest_addr.addr_to_string (dest_buf, - BUFSIZ); + BUFSIZ); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Session Address is %s\n", - dest_buf)); - + ACE_DEBUG ((LM_DEBUG, + "Session Address is %s\n", + dest_buf)); + this->qos_session_ = helper.open_qos_session (handler, - dest_addr); + dest_addr); if (this->qos_session_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "QoS Session Open Failed (%N|%l)\n"), - -1); + ACE_ERROR_RETURN ((LM_ERROR, + "QoS Session Open Failed (%N|%l)\n"), + -1); handler->qos_session (this->qos_session_); if (this->activate_svc_handler (handler) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Activate Svc Handler Failed (%N|%l)\n"), - -1); + ACE_ERROR_RETURN ((LM_ERROR, + "Activate Svc Handler Failed (%N|%l)\n"), + -1); AVStreams::QoS qos; - int qos_available = this->endpoint_->qos ().get_flow_qos (this->flowname_.c_str (), - qos); - + int qos_available = this->endpoint_->qos ().get_flow_qos (this->flowname_.c_str (), + qos); + if (qos_available == 0) - { - - ACE_Flow_Spec *ace_flow_spec = 0; - ACE_NEW_RETURN (ace_flow_spec, - ACE_Flow_Spec, - -1); - - handler->translate (qos.QoSParams, - ace_flow_spec); - - if (helper.set_qos (*ace_flow_spec, - handler) == -1) - - ACE_ERROR_RETURN ((LM_ERROR, - "Set QoS Failed (%N|%l)\n"), - -1); - } + { + + ACE_Flow_Spec *ace_flow_spec = 0; + ACE_NEW_RETURN (ace_flow_spec, + ACE_Flow_Spec, + -1); + + handler->translate (qos.QoSParams, + ace_flow_spec); + + if (helper.set_qos (*ace_flow_spec, + handler) == -1) + + ACE_ERROR_RETURN ((LM_ERROR, + "Set QoS Failed (%N|%l)\n"), + -1); + } } else { - + int result = handler->get_socket ()->open (*inet_addr, - qos_params, - AF_INET, - 0, - 0, - 0, - ACE_OVERLAPPED_SOCKET_FLAG - | ACE_FLAG_MULTIPOINT_C_LEAF - | ACE_FLAG_MULTIPOINT_D_LEAF, - 1); + qos_params, + AF_INET, + 0, + 0, + 0, + ACE_OVERLAPPED_SOCKET_FLAG + | ACE_FLAG_MULTIPOINT_C_LEAF + | ACE_FLAG_MULTIPOINT_D_LEAF, + 1); if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, - "TAO_AV_QOS_UDP_MCast_Acceptor data socket open failed (%N|%l)\n"), - -1); + ACE_ERROR_RETURN ((LM_ERROR, + "TAO_AV_QOS_UDP_MCast_Acceptor data socket open failed (%N|%l)\n"), + -1); } - + TAO_AV_Protocol_Object *object = this->flow_protocol_factory_->make_protocol_object (this->entry_, - this->endpoint_, - flow_handler, - flow_handler->transport ()); + this->endpoint_, + flow_handler, + flow_handler->transport ()); flow_handler->protocol_object (object); - + AVStreams::Negotiator_ptr negotiator; - + ACE_TRY_EX (negotiator) { CORBA::Any_ptr negotiator_any = - this->endpoint_->get_property_value ("Negotiator", - ACE_TRY_ENV); + this->endpoint_->get_property_value ("Negotiator" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (negotiator); *negotiator_any >>= negotiator; @@ -1029,34 +1029,34 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "(%N,%l) Negotiator Not Found \n")); + "(%N,%l) Negotiator Not Found \n")); } ACE_ENDTRY; - + this->endpoint_->set_flow_handler (this->flowname_.c_str (),flow_handler); this->entry_->protocol_object (object); - + result = handler->get_socket ()->get_local_addr (*local_addr); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_Dgram_Connector::open: get_local_addr failed\n"),result); local_addr->set (local_addr->get_port_number (), - local_addr->get_host_name ()); + local_addr->get_host_name ()); if (TAO_debug_level > 0) { char buf [BUFSIZ]; local_addr->addr_to_string (buf, - BUFSIZ); + BUFSIZ); ACE_DEBUG ((LM_DEBUG, - "Local Address is %s\n", - buf)); + "Local Address is %s\n", + buf)); } this->entry_->set_local_addr (local_addr); this->entry_->handler (flow_handler); - + return 0; - + } int @@ -1080,11 +1080,11 @@ int TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core *av_core, TAO_AV_Flow_Protocol_Factory *factory) - + { - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Connector::open ")); + "TAO_AV_UDP_QoS_Connector::open ")); this->endpoint_ = endpoint; this->av_core_ = av_core; @@ -1094,7 +1094,7 @@ TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint, // int // TAO_AV_UDP_QoS_Connector::translate (CosPropertyService::Properties &qos_params, -// ACE_Flow_Spec *ace_flow_spec) +// ACE_Flow_Spec *ace_flow_spec) // { // for (unsigned int i = 0; // i < qos_params.length (); @@ -1107,7 +1107,7 @@ TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint, // ace_flow_spec->service_type (type); // } // else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Rate") == 0) -// { +// { // CORBA::ULong tok_rate; // qos_params [i].property_value >>= tok_rate; // ace_flow_spec->token_rate (tok_rate); @@ -1118,7 +1118,7 @@ TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint, // qos_params [i].property_value >>= tok_buck_size; // ace_flow_spec->token_bucket_size (tok_buck_size); // } -// else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0) +// else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0) // { // CORBA::ULong peak_bw; // qos_params [i].property_value >>= peak_bw; @@ -1138,7 +1138,7 @@ TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint, // } // } - + // return 0; // } @@ -1157,77 +1157,77 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, ACE_INET_Addr *local_addr; ACE_NEW_RETURN (local_addr, - ACE_INET_Addr ("0"), - -1); - + ACE_INET_Addr ("0"), + -1); + TAO_AV_Flow_Handler *flow_handler = 0; - + TAO_AV_UDP_QoS_Flow_Handler *handler; ACE_NEW_RETURN (handler, TAO_AV_UDP_QoS_Flow_Handler, -1); - + flow_handler = handler; handler->endpoint (this->endpoint_); handler->flowspec_entry (this->entry_); handler->av_core (this->av_core_); - + ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*, entry->address ()); ACE_QoS_Params qos_params; - + ACE_QoS* ace_qos = 0; - - FillQoSParams (qos_params, - 0, - ace_qos); - + + FillQoSParams (qos_params, + 0, + ace_qos); + result = handler->get_socket ()->open (*local_addr, - qos_params, - AF_INET, - 0, - 0, - 0, - ACE_OVERLAPPED_SOCKET_FLAG - | ACE_FLAG_MULTIPOINT_C_LEAF - | ACE_FLAG_MULTIPOINT_D_LEAF, - 1); + qos_params, + AF_INET, + 0, + 0, + 0, + ACE_OVERLAPPED_SOCKET_FLAG + | ACE_FLAG_MULTIPOINT_C_LEAF + | ACE_FLAG_MULTIPOINT_D_LEAF, + 1); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, - "Data socket open failed (%N|%l)\n"), - -1); - + "Data socket open failed (%N|%l)\n"), + -1); + result = handler->get_socket ()->get_local_addr (*local_addr); - + ACE_INET_Addr *session_addr = 0; if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER) { ACE_NEW_RETURN (session_addr, - ACE_INET_Addr, - -1); - + ACE_INET_Addr, + -1); + session_addr->set (local_addr->get_port_number (), - local_addr->get_host_name ()); - + local_addr->get_host_name ()); + } - else + else { session_addr = inet_addr; } - + char sess_buf [BUFSIZ]; session_addr->addr_to_string (sess_buf, - BUFSIZ); + BUFSIZ); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "Session Address is %s\n", - sess_buf)); + "Session Address is %s\n", + sess_buf)); // Create a destination address for the QoS session. The same // address should be used for the subscribe call later. A copy @@ -1238,54 +1238,54 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, TAO_AV_UDP_QoS_Session_Helper helper; this->qos_session_ = helper.open_qos_session (handler, - *session_addr); + *session_addr); if (this->qos_session_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - "QoS Session Open Failed (%N|%l)\n"), - -1); + "QoS Session Open Failed (%N|%l)\n"), + -1); else ACE_DEBUG ((LM_DEBUG, "QoS session opened successfully\n")); - + if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER) { this->qos_session_->source_port (local_addr->get_port_number ()); } handler->qos_session (this->qos_session_); - - this->qos_manager_ = + + this->qos_manager_ = handler->get_socket ()->qos_manager (); AVStreams::QoS qos; - int qos_available = this->endpoint_->qos ().get_flow_qos (this->flowname_.c_str (), - qos); + int qos_available = this->endpoint_->qos ().get_flow_qos (this->flowname_.c_str (), + qos); if (qos_available == 0) { ACE_Flow_Spec* ace_flow_spec; ACE_NEW_RETURN (ace_flow_spec, - ACE_Flow_Spec, - -1); - - handler->translate (qos.QoSParams, - ace_flow_spec); - + ACE_Flow_Spec, + -1); + + handler->translate (qos.QoSParams, + ace_flow_spec); + if (helper.set_qos (*ace_flow_spec, - handler) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Unable to set QoS (%N|%l)\n"), - -1); + handler) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + "Unable to set QoS (%N|%l)\n"), + -1); else { if( TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "(%N,%l) Setting QOS succeeds.\n")); + ACE_DEBUG ((LM_DEBUG, + "(%N,%l) Setting QOS succeeds.\n")); } } - + TAO_AV_Protocol_Object *object = this->flow_protocol_factory_->make_protocol_object (this->entry_, this->endpoint_, @@ -1297,50 +1297,50 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, ACE_TRY_EX (negotiator) { CORBA::Any_ptr negotiator_any = - this->endpoint_->get_property_value ("Negotiator", - ACE_TRY_ENV); + this->endpoint_->get_property_value ("Negotiator" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (negotiator); - + *negotiator_any >>= negotiator; handler->negotiator (negotiator); } ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Negotiator not found for flow %s\n", - this->entry_->flowname ())); + "Negotiator not found for flow %s\n", + this->entry_->flowname ())); } ACE_ENDTRY; - + flow_handler->protocol_object (object); this->endpoint_->set_flow_handler (this->flowname_.c_str (),flow_handler); this->entry_->protocol_object (object); - + result = handler->get_socket ()->get_local_addr (*local_addr); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, - "Get local addr failed (%N|%l)\n"), - result); + "Get local addr failed (%N|%l)\n"), + result); local_addr->set (local_addr->get_port_number (), - local_addr->get_host_name ()); + local_addr->get_host_name ()); if (TAO_debug_level > 0) { - char buf[BUFSIZ]; + char buf[BUFSIZ]; local_addr->addr_to_string (buf, - BUFSIZ); - + BUFSIZ); + ACE_DEBUG ((LM_DEBUG, - "Local Address is %s\n", - buf)); + "Local Address is %s\n", + buf)); } - + entry->set_local_addr (local_addr); entry->handler (flow_handler); transport = flow_handler->transport (); - + // call activate svc handler. return this->activate_svc_handler (handler); } @@ -1351,15 +1351,15 @@ TAO_AV_UDP_QoS_Connector::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *han int result = 0; TAO_AV_UDP_QoS_Session_Helper helper; - + result = helper.activate_qos_handler (this->qos_session_, - handler); + handler); if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, - "(%N,%l) Error in registering the Decorator with the Reactor\n"), - -1); - + "(%N,%l) Error in registering the Decorator with the Reactor\n"), + -1); + return result; } @@ -1377,7 +1377,7 @@ TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory (void) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory\n")); + "TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory\n")); } TAO_AV_UDP_QoS_Factory::~TAO_AV_UDP_QoS_Factory (void) @@ -1389,8 +1389,8 @@ TAO_AV_UDP_QoS_Factory::match_protocol (const char *protocol_string) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Factory::match_protocol\n")); - + "TAO_AV_UDP_QoS_Factory::match_protocol\n")); + if (ACE_OS::strcasecmp (protocol_string,"QoS_UDP") == 0) return 1; return 0; @@ -1399,9 +1399,9 @@ TAO_AV_UDP_QoS_Factory::match_protocol (const char *protocol_string) TAO_AV_Acceptor* TAO_AV_UDP_QoS_Factory::make_acceptor (void) { - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Factory::make_acceptor ")); + "TAO_AV_UDP_QoS_Factory::make_acceptor ")); TAO_AV_Acceptor *acceptor = 0; ACE_NEW_RETURN (acceptor, @@ -1413,9 +1413,9 @@ TAO_AV_UDP_QoS_Factory::make_acceptor (void) TAO_AV_Connector* TAO_AV_UDP_QoS_Factory::make_connector (void) { - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Factory::make_connector ")); + "TAO_AV_UDP_QoS_Factory::make_connector ")); TAO_AV_Connector *connector = 0; ACE_NEW_RETURN (connector, @@ -1439,7 +1439,7 @@ TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory (void) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory\n")); + "TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory\n")); } TAO_AV_UDP_QoS_Flow_Factory::~TAO_AV_UDP_QoS_Flow_Factory (void) diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h index 25c31cefe81..c95ca98493c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h @@ -218,5 +218,3 @@ private: #include "ace/post.h" #endif /* RTCP_CHANNEL_INCLUDE */ - - diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h index 18a3d9c6152..3f9331f0375 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h @@ -1,4 +1,5 @@ // $Id$ + #ifndef RTCP_PACKET_INCLUDE #define RTCP_PACKET_INCLUDE @@ -394,4 +395,3 @@ private: #include "ace/post.h" #endif /* RTCP_PACKET_INCLUDE */ - diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp index d1583f80aa0..18123f7afc0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -92,15 +92,15 @@ RTP_Packet::RTP_Packet(unsigned char padding, ACE_UINT32 ssrc, unsigned char csrc_count, ACE_UINT32 *csrc_list, - char *data, - ACE_UINT16 data_size) + char *data, + ACE_UINT16 data_size) :extension_bytes_(0) { //size of header (in octets) without contributing sources ACE_UINT16 size = 3*4; int index = 0; - if (data_size > RTP_MTU-12) + if (data_size > RTP_MTU-12) { data_size = RTP_MTU-12; ACE_DEBUG ((LM_DEBUG, "\n(%N,%l) RTP_Packet: Warning - packet truncated\n")); @@ -747,5 +747,3 @@ ACE_STATIC_SVC_DEFINE (TAO_AV_RTP_Flow_Factory, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) - - diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h index cca71e377a2..aff5ac38337 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.h +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h @@ -69,7 +69,7 @@ class TAO_AV_Flow_Protocol_Factory; /** * @class TAO_AV_Flow_Protocol_Item - * @brief + * @brief */ class TAO_AV_Export TAO_AV_Flow_Protocol_Item { diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index 5e4e869921f..594a3da8001 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -91,7 +91,7 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos) if( ACE_OS::strcmp( qos.QoSParams[i].property_name.in(), "Diffserv_Codepoint") == 0) { - qos.QoSParams[i].property_value >>= dscp; + qos.QoSParams[i].property_value >>= dscp; dscp_flag=1; // DSCP value can only be 6 bits wide if(!((dscp >= 0) && (dscp <= 63))) @@ -109,9 +109,9 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos) // IP Diffserv byte if(!((ecn >= 0) && (ecn <= 3))) { - ACE_DEBUG((LM_DEBUG, "(%N,%l) ECN value can only be (0-3) not %d\n", ecn)); + ACE_DEBUG((LM_DEBUG, "(%N,%l) ECN value can only be (0-3) not %d\n", ecn)); ecn = 0; - } + } } } @@ -139,8 +139,8 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos) if(ret < 0 ) { ACE_DEBUG((LM_DEBUG, "(%N,%l) errno: %p\n")); - } - } + } + } return ret; } @@ -430,7 +430,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr, this->entry_->is_multicast (), TAO_AV_UDP_Connection_Setup::ACCEPTOR); - if( result < 0) + if (result < 0) { ACE_DEBUG((LM_DEBUG,"(%N,%l) Error during connection setup: %d\n", result)); } diff --git a/TAO/orbsvcs/orbsvcs/AV/md5.h b/TAO/orbsvcs/orbsvcs/AV/md5.h index 034874fb852..4bcb01b04b4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/md5.h +++ b/TAO/orbsvcs/orbsvcs/AV/md5.h @@ -1,4 +1,5 @@ /* $Id$ */ + /* MD5.H - header file for MD5C.C */ @@ -46,4 +47,3 @@ void MD5Final (unsigned char digest[16], MD5_CTX *context); #ifdef __cplusplus } #endif - diff --git a/TAO/orbsvcs/orbsvcs/AV/md5c.c b/TAO/orbsvcs/orbsvcs/AV/md5c.c index 1b9158987b6..ad1865f947e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/md5c.c +++ b/TAO/orbsvcs/orbsvcs/AV/md5c.c @@ -324,4 +324,3 @@ static void MD5_memset (POINTER output, int value, unsigned int len) for (i = 0; i < len; i++) ((char *)output)[i] = (char)value; } - diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp index 9d986f321ed..f81818b7a51 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp @@ -12,28 +12,28 @@ ACE_RCSID(orbsvcs, Channel_Clients_T, "$Id$") #endif /* __ACE_INLINE__ */ template<class TARGET> void -ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events, - CORBA::Environment &TAO_IN_ENV) +ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - target_->push (events, TAO_IN_ENV); + target_->push (events TAO_ENV_ARG_PARAMETER); } template<class TARGET> void ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer ( - CORBA::Environment &TAO_IN_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - target_->disconnect_push_consumer (TAO_IN_ENV); + target_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); } template<class TARGET> void ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier ( - CORBA::Environment &TAO_IN_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - target_->disconnect_push_supplier (TAO_IN_ENV); + target_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); } #endif /* ACE_CHANNEL_CLIENTS_T_C */ diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h index 2c5e0760dbd..7b88fccc846 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h @@ -41,14 +41,12 @@ public: ACE_PushConsumer_Adapter (TARGET *target); // Forwards all calls to <owner>. - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &env = - TAO_default_environment ()) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); // Forwards to target_. - virtual void disconnect_push_consumer (CORBA::Environment &env = - TAO_default_environment ()) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); // Forwards to target_. @@ -73,8 +71,7 @@ public: ACE_PushSupplier_Adapter (TARGET *target); // Forwards all calls to <owner>. - virtual void disconnect_push_supplier (CORBA::Environment & env = - TAO_default_environment ()) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); // Forwards to target_. diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp index 8949a02b550..ea9dc033f6f 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp @@ -39,7 +39,7 @@ CC_Lock::~CC_Lock (void) } void -CC_Lock::lock (CORBA::Environment &) +CC_Lock::lock (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, "CC_Lock::lock\n")); @@ -47,7 +47,7 @@ CC_Lock::lock (CORBA::Environment &) } CORBA::Boolean -CC_Lock::try_lock (CORBA::Environment &ACE_TRY_ENV) +CC_Lock::try_lock (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "CC_Lock::try_lock. ")); @@ -82,7 +82,7 @@ CC_Lock::try_lock (CORBA::Environment &ACE_TRY_ENV) } void -CC_Lock::unlock (CORBA::Environment &ACE_TRY_ENV) +CC_Lock::unlock (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "CC_Lock::unlock\n")); @@ -102,8 +102,8 @@ CC_Lock::unlock (CORBA::Environment &ACE_TRY_ENV) } void -CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode, - CORBA::Environment &ACE_TRY_ENV) +CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode + TAO_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "CC_Lock::change_mode\n")); @@ -201,7 +201,7 @@ void CC_LockModeIterator::First (void) current_ = CosConcurrencyControl::intention_read; } -void CC_LockModeIterator::Next (CORBA::Environment &ACE_TRY_ENV) +void CC_LockModeIterator::Next (TAO_ENV_SINGLE_ARG_DECL) { switch (current_) { diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h index 8dcc9442005..dbc60939bbc 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h @@ -58,18 +58,18 @@ public: ~CC_Lock (void); // Deletes the lock - void lock (CORBA::Environment &env); + void lock (TAO_ENV_SINGLE_ARG_DECL); // Acquires this lock. Blocks until lock is obtained - CORBA::Boolean try_lock (CORBA::Environment &env); + CORBA::Boolean try_lock (TAO_ENV_SINGLE_ARG_DECL); // Tries to acquire this lock. If it is not possible to acquire the // lock, false is returned - void unlock (CORBA::Environment &env); + void unlock (TAO_ENV_SINGLE_ARG_DECL); // Releases this lock. - void change_mode (CosConcurrencyControl::lock_mode new_mode, - CORBA::Environment &env); + void change_mode (CosConcurrencyControl::lock_mode new_mode + TAO_ENV_ARG_DECL); // Changes the mode of this lock. void set_mode (CosConcurrencyControl::lock_mode mode); @@ -125,7 +125,7 @@ public: void First(void); // Reset the iterator to the first element - void Next(CORBA::Environment &_env); + void Next(TAO_ENV_SINGLE_ARG_DECL); // Advance the iterator to the next element // Throws exception if out of range diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index 1fd2e3cd945..f3afff015db 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -24,7 +24,7 @@ CC_LockSet::CC_LockSet (void) { ACE_TRY_NEW_ENV { - this->Init (ACE_TRY_ENV); + this->Init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -42,7 +42,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related) { ACE_TRY_NEW_ENV { - this->Init (ACE_TRY_ENV); + this->Init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -56,7 +56,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related) // Initialization. void -CC_LockSet::Init (CORBA::Environment &ACE_TRY_ENV) +CC_LockSet::Init (TAO_ENV_SINGLE_ARG_DECL) { // Set the mode of the statically allocated locks lock_[CC_IR] = 0; @@ -92,8 +92,8 @@ CORBA::Boolean CC_LockSet::compatible (CC_LockModeEnum mr) // Locks the lock in the desired mode. Blocks until success. void -CC_LockSet::lock (CosConcurrencyControl::lock_mode mode, - CORBA::Environment &ACE_TRY_ENV) +CC_LockSet::lock (CosConcurrencyControl::lock_mode mode + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "CC_LockSet::lock\n")); @@ -113,8 +113,8 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode, // Tries to lock. If it is not possible false is returned. CORBA::Boolean -CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode, - CORBA::Environment &) +CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockModeEnum lm = lmconvert (mode); @@ -154,8 +154,8 @@ CC_LockSet::lmconvert (CosConcurrencyControl::lock_mode mode) // Unlock the lock void -CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode, - CORBA::Environment &ACE_TRY_ENV) +CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosConcurrencyControl::LockNotHeld)) { @@ -199,8 +199,8 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode, void CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode, - CosConcurrencyControl::lock_mode new_mode, - CORBA::Environment &ACE_TRY_ENV) + CosConcurrencyControl::lock_mode new_mode + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosConcurrencyControl::LockNotHeld)) { @@ -213,7 +213,7 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode, ACE_THROW (CosConcurrencyControl::LockNotHeld()); else if (this->change_mode_i (lm_held, lm_new)==1) { - this->unlock (held_mode, ACE_TRY_ENV); + this->unlock (held_mode TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (semaphore_.acquire () == -1) diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h index 6264be36c1d..efd63a16c41 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -86,26 +86,26 @@ public: // Destructor. // = CosConcurrencyControl methods - virtual void lock (CosConcurrencyControl::lock_mode mode, - CORBA::Environment &env) + virtual void lock (CosConcurrencyControl::lock_mode mode + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Acquires this lock. Blocks until lock is obtained - virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode, - CORBA::Environment &env) + virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Tries to acquire this lock. If it is not possible to acquire the // lock, false is returned - virtual void unlock (CosConcurrencyControl::lock_mode mode, - CORBA::Environment &env) + virtual void unlock (CosConcurrencyControl::lock_mode mode + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosConcurrencyControl::LockNotHeld)); // Releases this lock. virtual void change_mode (CosConcurrencyControl::lock_mode held_mode, - CosConcurrencyControl::lock_mode new_mode, - CORBA::Environment &env) + CosConcurrencyControl::lock_mode new_mode + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosConcurrencyControl::LockNotHeld)); // Changes the mode of this lock. @@ -119,7 +119,7 @@ private: // Converts the CORBA specification's lock mode to the internal // representation - void Init (CORBA::Environment &_env); + void Init (TAO_ENV_SINGLE_ARG_DECL); // Initiatlizes the lock set array and acquires the initial // semaphore. diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp index e91e8fbc399..87bcc3c04f6 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp @@ -29,7 +29,7 @@ CC_LockSetFactory::~CC_LockSetFactory (void) } CosConcurrencyControl::LockSet_ptr -CC_LockSetFactory::create (CORBA::Environment &ACE_TRY_ENV) +CC_LockSetFactory::create (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockSet *ls = 0; @@ -41,25 +41,22 @@ CC_LockSetFactory::create (CORBA::Environment &ACE_TRY_ENV) CORBA::NO_MEMORY()); ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ()); - return ls->_this (ACE_TRY_ENV); + return ls->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } CosConcurrencyControl::LockSet_ptr -CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which, - CORBA::Environment &ACE_TRY_ENV) +CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockSet *ls = 0; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ()); - // @@ I commented out the following statement becuase it doesn't make any - // sense at all. -- Nanbor - // TAO_IN_ENV.exception (new CORBA::NO_MEMORY ()); ACE_NEW_THROW_EX (ls, CC_LockSet (which), CORBA::NO_MEMORY()); ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ()); - return ls->_this (ACE_TRY_ENV); + return ls->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h index ad2e6e6b2a5..538f11e3a63 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h @@ -46,12 +46,12 @@ public: // Destructor. virtual CosConcurrencyControl::LockSet_ptr create ( - CORBA::Environment &env) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosConcurrencyControl::LockSet_ptr create_related ( - CosConcurrencyControl::LockSet_ptr which, - CORBA::Environment &env) + CosConcurrencyControl::LockSet_ptr which + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp index 25ac44f4314..266ea7e4c3c 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -29,7 +29,7 @@ TAO_Concurrency_Server::TAO_Concurrency_Server (void) // Constructor which takes an ORB and POA. TAO_Concurrency_Server::TAO_Concurrency_Server (CORBA::ORB_var &orb, - PortableServer::POA_var &poa) + PortableServer::POA_var &poa) { this->init (orb, poa); } @@ -39,7 +39,7 @@ TAO_Concurrency_Server::TAO_Concurrency_Server (CORBA::ORB_var &orb, int TAO_Concurrency_Server::init (CORBA::ORB_var &orb, - PortableServer::POA_var &poa) + PortableServer::POA_var &poa) { ACE_TRY_NEW_ENV { @@ -49,24 +49,24 @@ TAO_Concurrency_Server::init (CORBA::ORB_var &orb, // ACE_TRY_CHECK; PortableServer::ObjectId_var id = - PortableServer::string_to_ObjectId ("ConcurrencyService"); + PortableServer::string_to_ObjectId ("ConcurrencyService"); poa->activate_object_with_id (id.in (), - &lock_set_factory_, - ACE_TRY_ENV); + &lock_set_factory_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringify the objref we'll be implementing, and print it to // stdout. Someone will take that string and give it to a // client. Then release the object. CORBA::Object_var obj = - poa->id_to_reference (id.in (), - ACE_TRY_ENV); + poa->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = - orb->object_to_string (obj.in (), - ACE_TRY_ENV); + orb->object_to_string (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index da7dc206cb2..164716520b0 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -32,90 +32,90 @@ TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin (void) } void -TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event + TAO_ENV_ARG_DECL) { TAO_CEC_Propagate_Event_Push push_worker (event); - this->push_admin_.for_each (&push_worker, - ACE_TRY_ENV); + this->push_admin_.for_each (&push_worker + TAO_ENV_ARG_PARAMETER); ACE_CHECK; TAO_CEC_Propagate_Event_Pull pull_worker (event); - this->pull_admin_.for_each (&pull_worker, - ACE_TRY_ENV); + this->pull_admin_.for_each (&pull_worker + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL) { - this->push_admin_.connected (supplier, ACE_TRY_ENV); + this->push_admin_.connected (supplier TAO_ENV_ARG_PARAMETER); } void -TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL) { - this->push_admin_.reconnected (supplier, ACE_TRY_ENV); + this->push_admin_.reconnected (supplier TAO_ENV_ARG_PARAMETER); } void -TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL) { - this->push_admin_.disconnected (supplier, ACE_TRY_ENV); + this->push_admin_.disconnected (supplier TAO_ENV_ARG_PARAMETER); } void -TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier + TAO_ENV_ARG_DECL) { - this->pull_admin_.connected (supplier, ACE_TRY_ENV); + this->pull_admin_.connected (supplier TAO_ENV_ARG_PARAMETER); } void -TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier + TAO_ENV_ARG_DECL) { - this->pull_admin_.reconnected (supplier, ACE_TRY_ENV); + this->pull_admin_.reconnected (supplier TAO_ENV_ARG_PARAMETER); } void -TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier + TAO_ENV_ARG_DECL) { - this->pull_admin_.disconnected (supplier, ACE_TRY_ENV); + this->pull_admin_.disconnected (supplier TAO_ENV_ARG_PARAMETER); } void -TAO_CEC_ConsumerAdmin::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ConsumerAdmin::shutdown (TAO_ENV_SINGLE_ARG_DECL) { - this->push_admin_.shutdown (ACE_TRY_ENV); + this->push_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->pull_admin_.shutdown (ACE_TRY_ENV); + this->pull_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ConsumerAdmin::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->push_admin_.obtain (ACE_TRY_ENV); + return this->push_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_pull_supplier (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ConsumerAdmin::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->pull_admin_.obtain (ACE_TRY_ENV); + return this->pull_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_CEC_ConsumerAdmin::_default_POA (CORBA::Environment&) +TAO_CEC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } @@ -123,19 +123,19 @@ TAO_CEC_ConsumerAdmin::_default_POA (CORBA::Environment&) // **************************************************************** void -TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL) { - supplier->push (this->event_, ACE_TRY_ENV); + supplier->push (this->event_ TAO_ENV_ARG_PARAMETER); } // **************************************************************** void -TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier + TAO_ENV_ARG_DECL) { - supplier->push (this->event_, ACE_TRY_ENV); + supplier->push (this->event_ TAO_ENV_ARG_PARAMETER); } // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index 7f7204e24cc..b980088789a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -57,44 +57,44 @@ public: virtual ~TAO_CEC_ConsumerAdmin (void); /// For each elements call <worker->work()>. - void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker, - CORBA::Environment &ACE_TRY_ENV); - void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker, - CORBA::Environment &ACE_TRY_ENV); + void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker + TAO_ENV_ARG_DECL); + void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker + TAO_ENV_ARG_DECL); /// Push the event to all the consumers - void push (const CORBA::Any &event, - CORBA::Environment &ACE_TRY_ENV); + void push (const CORBA::Any &event + TAO_ENV_ARG_DECL); /// Used to inform the EC that a Supplier has connected or /// disconnected from it. - virtual void connected (TAO_CEC_ProxyPushSupplier*, - CORBA::Environment&); - virtual void reconnected (TAO_CEC_ProxyPushSupplier*, - CORBA::Environment&); - virtual void disconnected (TAO_CEC_ProxyPushSupplier*, - CORBA::Environment&); - virtual void connected (TAO_CEC_ProxyPullSupplier*, - CORBA::Environment&); - virtual void reconnected (TAO_CEC_ProxyPullSupplier*, - CORBA::Environment&); - virtual void disconnected (TAO_CEC_ProxyPullSupplier*, - CORBA::Environment&); + virtual void connected (TAO_CEC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void reconnected (TAO_CEC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void disconnected (TAO_CEC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void connected (TAO_CEC_ProxyPullSupplier* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void reconnected (TAO_CEC_ProxyPullSupplier* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void disconnected (TAO_CEC_ProxyPullSupplier* + TAO_ENV_ARG_DECL_NOT_USED); /// The event channel is shutting down, inform all the consumers of /// this - virtual void shutdown (CORBA::Environment&); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // = The CosEventChannelAdmin::ConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (CORBA::Environment &) + obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier (CORBA::Environment &) + obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); private: /// The Event Channel we belong to @@ -118,8 +118,8 @@ class TAO_CEC_Propagate_Event_Push : public TAO_ESF_Worker<TAO_CEC_ProxyPushSupp public: TAO_CEC_Propagate_Event_Push (const CORBA::Any& event); - void work (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV); + void work (TAO_CEC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL); private: /// The event @@ -133,8 +133,8 @@ class TAO_CEC_Propagate_Event_Pull : public TAO_ESF_Worker<TAO_CEC_ProxyPullSupp public: TAO_CEC_Propagate_Event_Pull (const CORBA::Any& event); - void work (TAO_CEC_ProxyPullSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV); + void work (TAO_CEC_ProxyPullSupplier *supplier + TAO_ENV_ARG_DECL); private: /// The event diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i index ea68daf0d87..8db0065dc5b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i @@ -2,18 +2,18 @@ ACE_INLINE void TAO_CEC_ConsumerAdmin:: - for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker, - CORBA::Environment &ACE_TRY_ENV) + for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker + TAO_ENV_ARG_DECL) { - this->push_admin_.for_each (worker, ACE_TRY_ENV); + this->push_admin_.for_each (worker TAO_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_CEC_ConsumerAdmin:: - for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker, - CORBA::Environment &ACE_TRY_ENV) + for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker + TAO_ENV_ARG_DECL) { - this->pull_admin_.for_each (worker, ACE_TRY_ENV); + this->pull_admin_.for_each (worker TAO_ENV_ARG_PARAMETER); } // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp index 3be084955b5..4bf1072dd1d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp @@ -29,21 +29,21 @@ TAO_CEC_ConsumerControl::shutdown (void) } void -TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPushSupplier *, - CORBA::Environment &) +TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPushSupplier * + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPullSupplier *, - CORBA::Environment &) +TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPullSupplier * + TAO_ENV_ARG_DECL_NOT_USED) { } void TAO_CEC_ConsumerControl::system_exception (TAO_CEC_ProxyPushSupplier *, - CORBA::SystemException &, - CORBA::Environment &) + CORBA::SystemException & + TAO_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index 2fd875e855f..9b84bca123e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -58,21 +58,21 @@ public: * has been destroyed. The strategy has to (at the very least), * reclaim all the resources attached to that object. */ - virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy, - CORBA::Environment &); + virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy + TAO_ENV_ARG_DECL_NOT_USED); /** * Invoked by helper classes when they detect that a consumer no * longer exists (i.e. _non_existent() returns true and/or the * CORBA::OBJECT_NOT_EXIST exception has been raised). */ - virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy, - CORBA::Environment &); + virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy + TAO_ENV_ARG_DECL_NOT_USED); /// Some system exception was rasied while trying to push an event. virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy, - CORBA::SystemException &, - CORBA::Environment &); + CORBA::SystemException & + TAO_ENV_ARG_DECL_NOT_USED); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp index de7dd113807..7c343706f36 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp @@ -31,16 +31,16 @@ TAO_CEC_Reactive_Dispatching::shutdown (void) void TAO_CEC_Reactive_Dispatching::push (TAO_CEC_ProxyPushSupplier* proxy, - const CORBA::Any& event, - CORBA::Environment& ACE_TRY_ENV) + const CORBA::Any& event + TAO_ENV_ARG_DECL) { - proxy->reactive_push_to_consumer (event, ACE_TRY_ENV); + proxy->reactive_push_to_consumer (event TAO_ENV_ARG_PARAMETER); } void TAO_CEC_Reactive_Dispatching::push_nocopy (TAO_CEC_ProxyPushSupplier* proxy, - CORBA::Any& event, - CORBA::Environment& ACE_TRY_ENV) + CORBA::Any& event + TAO_ENV_ARG_DECL) { - proxy->reactive_push_to_consumer (event, ACE_TRY_ENV); + proxy->reactive_push_to_consumer (event TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index 9b33ea50605..9c6873bb59c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -53,11 +53,11 @@ public: /// The consumer represented by <proxy> should receive <event>. virtual void push (TAO_CEC_ProxyPushSupplier *proxy, - const CORBA::Any &event, - CORBA::Environment &env = TAO_default_environment ()) = 0; + const CORBA::Any &event + TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy, - CORBA::Any &event, - CORBA::Environment &env = TAO_default_environment ()) = 0; + CORBA::Any &event + TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; }; // **************************************************************** @@ -81,11 +81,11 @@ public: virtual void activate (void); virtual void shutdown (void); virtual void push (TAO_CEC_ProxyPushSupplier *proxy, - const CORBA::Any &event, - CORBA::Environment &env = TAO_default_environment ()); + const CORBA::Any &event + TAO_ENV_ARG_DECL_WITH_DEFAULTS); virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy, - CORBA::Any &event, - CORBA::Environment &env = TAO_default_environment ()); + CORBA::Any &event + TAO_ENV_ARG_DECL_WITH_DEFAULTS); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index 9f8324e6d51..a2fd07cb36e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -33,7 +33,7 @@ TAO_CEC_Dispatching_Task::svc (void) continue; } - int result = command->execute (ACE_TRY_ENV); + int result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Message_Block::release (mb); @@ -53,8 +53,8 @@ TAO_CEC_Dispatching_Task::svc (void) void TAO_CEC_Dispatching_Task::push (TAO_CEC_ProxyPushSupplier *proxy, - CORBA::Any& event, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Any& event + TAO_ENV_ARG_DECL) { if (this->allocator_ == 0) this->allocator_ = ACE_Allocator::instance (); @@ -82,7 +82,7 @@ TAO_CEC_Dispatch_Command::~TAO_CEC_Dispatch_Command (void) // **************************************************************** int -TAO_CEC_Shutdown_Task_Command::execute (CORBA::Environment&) +TAO_CEC_Shutdown_Task_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return -1; } @@ -95,9 +95,9 @@ TAO_CEC_Push_Command::~TAO_CEC_Push_Command (void) } int -TAO_CEC_Push_Command::execute (CORBA::Environment& ACE_TRY_ENV) +TAO_CEC_Push_Command::execute (TAO_ENV_SINGLE_ARG_DECL) { - this->proxy_->push_to_consumer (this->event_, ACE_TRY_ENV); + this->proxy_->push_to_consumer (this->event_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index 05ea97d26c0..85e81f2a5c8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -41,8 +41,8 @@ public: virtual int svc (void); virtual void push (TAO_CEC_ProxyPushSupplier *proxy, - CORBA::Any& event, - CORBA::Environment &env); + CORBA::Any& event + TAO_ENV_ARG_DECL); private: /// An per-task allocator @@ -68,7 +68,7 @@ public: virtual ~TAO_CEC_Dispatch_Command (void); /// Command callback - virtual int execute (CORBA::Environment&) = 0; + virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) = 0; }; // **************************************************************** @@ -80,7 +80,7 @@ public: TAO_CEC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0); /// Command callback - virtual int execute (CORBA::Environment&); + virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); }; // **************************************************************** @@ -98,7 +98,7 @@ public: virtual ~TAO_CEC_Push_Command (void); /// Command callback - virtual int execute (CORBA::Environment&); + virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); private: /// The proxy diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index 0557f9ea7d0..e8613a8b31f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -74,7 +74,7 @@ TAO_CEC_EventChannel::~TAO_CEC_EventChannel (void) } void -TAO_CEC_EventChannel::activate (CORBA::Environment&) +TAO_CEC_EventChannel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->dispatching_->activate (); this->pulling_strategy_->activate (); @@ -83,7 +83,7 @@ TAO_CEC_EventChannel::activate (CORBA::Environment&) } void -TAO_CEC_EventChannel::shutdown (CORBA::Environment& ACE_TRY_ENV) +TAO_CEC_EventChannel::shutdown (TAO_ENV_SINGLE_ARG_DECL) { this->dispatching_->shutdown (); this->pulling_strategy_->shutdown (); @@ -91,87 +91,87 @@ TAO_CEC_EventChannel::shutdown (CORBA::Environment& ACE_TRY_ENV) this->consumer_control_->shutdown (); PortableServer::POA_var consumer_poa = - this->consumer_admin_->_default_POA (ACE_TRY_ENV); + this->consumer_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (this->consumer_admin_, ACE_TRY_ENV); + consumer_poa->servant_to_id (this->consumer_admin_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_poa->deactivate_object (consumer_id.in (), ACE_TRY_ENV); + consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var supplier_poa = - this->supplier_admin_->_default_POA (ACE_TRY_ENV); + this->supplier_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var supplier_id = - supplier_poa->servant_to_id (this->supplier_admin_, ACE_TRY_ENV); + supplier_poa->servant_to_id (this->supplier_admin_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_poa->deactivate_object (supplier_id.in (), ACE_TRY_ENV); + supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->shutdown (ACE_TRY_ENV); + this->supplier_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); - this->consumer_admin_->shutdown (ACE_TRY_ENV); + this->consumer_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushConsumer* consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL) { - this->supplier_admin_->connected (consumer, ACE_TRY_ENV); + this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushConsumer* consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL) { - this->supplier_admin_->reconnected (consumer, ACE_TRY_ENV); + this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushConsumer* consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL) { - this->supplier_admin_->disconnected (consumer, ACE_TRY_ENV); + this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullConsumer* consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullConsumer* consumer + TAO_ENV_ARG_DECL) { - this->supplier_admin_->connected (consumer, ACE_TRY_ENV); + this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullConsumer* consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullConsumer* consumer + TAO_ENV_ARG_DECL) { - this->supplier_admin_->reconnected (consumer, ACE_TRY_ENV); + this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullConsumer* consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullConsumer* consumer + TAO_ENV_ARG_DECL) { - this->supplier_admin_->disconnected (consumer, ACE_TRY_ENV); + this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL) { - this->consumer_admin_->connected (supplier, ACE_TRY_ENV); + this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL) { this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index d229644fa99..825280e394f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -117,11 +117,11 @@ public: /// Start the internal threads (if any), etc. /// After this call the EC can be used. - virtual void activate (CORBA::Environment &env = TAO_default_environment ()); + virtual void activate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Shutdown any internal threads, cleanup all the internal /// structures, flush all the messages, etc. - virtual void shutdown (CORBA::Environment &env = TAO_default_environment ()); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Access the dispatching module.... TAO_CEC_Dispatching* dispatching (void) const; @@ -182,33 +182,33 @@ public: /// Used to inform the EC that a Consumer has connected or /// disconnected from it. - virtual void connected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment&); - virtual void reconnected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment&); - virtual void disconnected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment&); - virtual void connected (TAO_CEC_ProxyPullConsumer*, - CORBA::Environment&); - virtual void reconnected (TAO_CEC_ProxyPullConsumer*, - CORBA::Environment&); - virtual void disconnected (TAO_CEC_ProxyPullConsumer*, - CORBA::Environment&); + virtual void connected (TAO_CEC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void reconnected (TAO_CEC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void disconnected (TAO_CEC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void connected (TAO_CEC_ProxyPullConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void reconnected (TAO_CEC_ProxyPullConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void disconnected (TAO_CEC_ProxyPullConsumer* + TAO_ENV_ARG_DECL_NOT_USED); /// Used to inform the EC that a Supplier has connected or /// disconnected from it. - virtual void connected (TAO_CEC_ProxyPushSupplier*, - CORBA::Environment&); - virtual void reconnected (TAO_CEC_ProxyPushSupplier*, - CORBA::Environment&); - virtual void disconnected (TAO_CEC_ProxyPushSupplier*, - CORBA::Environment&); - virtual void connected (TAO_CEC_ProxyPullSupplier*, - CORBA::Environment&); - virtual void reconnected (TAO_CEC_ProxyPullSupplier*, - CORBA::Environment&); - virtual void disconnected (TAO_CEC_ProxyPullSupplier*, - CORBA::Environment&); + virtual void connected (TAO_CEC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void reconnected (TAO_CEC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void disconnected (TAO_CEC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void connected (TAO_CEC_ProxyPullSupplier* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void reconnected (TAO_CEC_ProxyPullSupplier* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void disconnected (TAO_CEC_ProxyPullSupplier* + TAO_ENV_ARG_DECL_NOT_USED); // Simple flags to control the EC behavior, set by the application // at construction time. @@ -232,17 +232,17 @@ public: /// The default implementation is: /// this->consumer_admin ()->_this (env); virtual CosEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (CORBA::Environment& env) + for_consumers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// The default implementation is: /// this->supplier_admin ()->_this (env); virtual CosEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (CORBA::Environment& env) + for_suppliers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Commit suicide. - virtual void destroy (CORBA::Environment &env) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index c912a460477..5a4f7dedcbe 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -38,16 +38,16 @@ TAO_CEC_Event_Loader::~TAO_CEC_Event_Loader (void) int TAO_CEC_Event_Loader::init (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... this->orb_= - CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = - this->create_object (this->orb_.in (), argc, argv, ACE_TRY_ENV); + this->create_object (this->orb_.in (), argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -62,8 +62,8 @@ TAO_CEC_Event_Loader::init (int argc, char *argv[]) CORBA::Object_ptr TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, - int argc, char *argv[], - CORBA::Environment &ACE_TRY_ENV) + int argc, char *argv[] + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -125,15 +125,15 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, // POA initialization and activation ... CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -151,17 +151,17 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, this->factory_, this->terminate_flag_); - this->ec_impl_->activate (ACE_TRY_ENV); + this->ec_impl_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = - this->ec_impl_->_this (ACE_TRY_ENV); + this->ec_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ior_file != 0) { CORBA::String_var ior = - orb->object_to_string (event_channel.in (), ACE_TRY_ENV); + orb->object_to_string (event_channel.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; FILE *file = ACE_OS::fopen (ior_file, "w"); ACE_OS::fprintf (file, "%s\n", ior.in ()); @@ -175,13 +175,13 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, if (this->bind_to_naming_service_) { CORBA::Object_var obj = - orb->resolve_initial_references ("NameService", - ACE_TRY_ENV); + orb->resolve_initial_references ("NameService" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->naming_context_ = - CosNaming::NamingContext::_narrow (obj.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->channel_name_.length (1); @@ -190,15 +190,15 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, if (use_rebind) { this->naming_context_->rebind (this->channel_name_, - event_channel.in (), - ACE_TRY_ENV); + event_channel.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else { this->naming_context_->bind (this->channel_name_, - event_channel.in (), - ACE_TRY_ENV); + event_channel.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -219,30 +219,30 @@ TAO_CEC_Event_Loader::fini (void) // + Since it was activated with _this() you have to do the // canonical: // get_object_id - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Release the resources of the Event Channel - this->ec_impl_->destroy (ACE_TRY_ENV); + this->ec_impl_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Deactivate the EC PortableServer::POA_var poa = - this->ec_impl_->_default_POA (ACE_TRY_ENV); + this->ec_impl_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this->ec_impl_, ACE_TRY_ENV); + poa->servant_to_id (this->ec_impl_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Unbind the Naming Service if (this->bind_to_naming_service_) { - this->naming_context_->unbind (this->channel_name_, - ACE_TRY_ENV); + this->naming_context_->unbind (this->channel_name_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index d2197cf9a15..af490dc459f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -48,9 +48,8 @@ public: * @name Derived from TAO_Object_Loader */ CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, - int argc, char *argv[], - CORBA::Environment - &ACE_TRY_ENV) + int argc, char *argv[] + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp index 6a96e0dbcad..6cbad8bdcd8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp @@ -62,21 +62,21 @@ TAO_CEC_MT_Dispatching::shutdown (void) void TAO_CEC_MT_Dispatching::push (TAO_CEC_ProxyPushSupplier* proxy, - const CORBA::Any& event, - CORBA::Environment& ACE_TRY_ENV) + const CORBA::Any& event + TAO_ENV_ARG_DECL) { CORBA::Any event_copy = event; - this->push_nocopy (proxy, event_copy, ACE_TRY_ENV); + this->push_nocopy (proxy, event_copy TAO_ENV_ARG_PARAMETER); } void TAO_CEC_MT_Dispatching::push_nocopy (TAO_CEC_ProxyPushSupplier* proxy, - CORBA::Any& event, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Any& event + TAO_ENV_ARG_DECL) { // Double checked locking.... if (this->active_ == 0) this->activate (); - this->task_.push (proxy, event, ACE_TRY_ENV); + this->task_.push (proxy, event TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h index 4e82f04f18a..22b00e1c42e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h @@ -47,11 +47,11 @@ public: virtual void activate (void); virtual void shutdown (void); virtual void push (TAO_CEC_ProxyPushSupplier* proxy, - const CORBA::Any & event, - CORBA::Environment& env); + const CORBA::Any & event + TAO_ENV_ARG_DECL); virtual void push_nocopy (TAO_CEC_ProxyPushSupplier* proxy, - CORBA::Any& event, - CORBA::Environment& env); + CORBA::Any& event + TAO_ENV_ARG_DECL); private: /// Use our own thread manager. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index 07472f4c717..49022892370 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -32,13 +32,13 @@ TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void) } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CEC_ProxyPullConsumer::activate (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPullConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPullConsumer_var result; ACE_TRY { - result = this->_this (ACE_TRY_ENV); + result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -50,18 +50,18 @@ TAO_CEC_ProxyPullConsumer::activate (CORBA::Environment &ACE_TRY_ENV) } void -TAO_CEC_ProxyPullConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPullConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -81,8 +81,8 @@ TAO_CEC_ProxyPullConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV) CORBA::Any* TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( - CORBA::Boolean_out has_event, - CORBA::Environment& ACE_TRY_ENV) + CORBA::Boolean_out has_event + TAO_ENV_ARG_DECL) { has_event = 0; CosEventComm::PullSupplier_var supplier; @@ -106,7 +106,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( CORBA::Any_var any; ACE_TRY { - any = supplier->try_pull (has_event, ACE_TRY_ENV); + any = supplier->try_pull (has_event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) @@ -114,7 +114,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( TAO_CEC_SupplierControl *control = this->event_channel_->supplier_control (); - control->supplier_not_exist (this, ACE_TRY_ENV); + control->supplier_not_exist (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -123,8 +123,8 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( this->event_channel_->supplier_control (); control->system_exception (this, - sysex, - ACE_TRY_ENV); + sysex + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -137,7 +137,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( CORBA::Any* TAO_CEC_ProxyPullConsumer::pull_from_supplier ( - CORBA::Environment& ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) { CosEventComm::PullSupplier_var supplier; { @@ -160,7 +160,7 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier ( CORBA::Any_var any; ACE_TRY { - any = supplier->pull (ACE_TRY_ENV); + any = supplier->pull (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -174,8 +174,8 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier ( CORBA::Boolean TAO_CEC_ProxyPullConsumer::supplier_non_existent ( - CORBA::Boolean_out disconnected, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean_out disconnected + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -191,14 +191,14 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return this->supplier_->_non_existent (ACE_TRY_ENV); + return this->supplier_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } void -TAO_CEC_ProxyPullConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPullConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) { CosEventComm::PullSupplier_var supplier; @@ -212,7 +212,7 @@ TAO_CEC_ProxyPullConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV) supplier = this->supplier_._retn (); } - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -220,7 +220,7 @@ TAO_CEC_ProxyPullConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - supplier->disconnect_pull_supplier (ACE_TRY_ENV); + supplier->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -262,8 +262,8 @@ TAO_CEC_ProxyPullConsumer::_decr_refcnt (void) void TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( - CosEventComm::PullSupplier_ptr pull_supplier, - CORBA::Environment &ACE_TRY_ENV) + CosEventComm::PullSupplier_ptr pull_supplier + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)) { @@ -298,7 +298,7 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->disconnected (this, ACE_TRY_ENV); + this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -311,12 +311,12 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( } // Notify the event channel... - this->event_channel_->connected (this, ACE_TRY_ENV); + this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); } void TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PullSupplier_var supplier; @@ -337,14 +337,14 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( } // Notify the event channel... - this->event_channel_->disconnected (this, ACE_TRY_ENV); + this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->event_channel_->disconnect_callbacks ()) { ACE_TRY { - supplier->disconnect_pull_supplier (ACE_TRY_ENV); + supplier->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -357,19 +357,19 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( } PortableServer::POA_ptr -TAO_CEC_ProxyPullConsumer::_default_POA (CORBA::Environment&) +TAO_CEC_ProxyPullConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPullConsumer::_add_ref (CORBA::Environment &) +TAO_CEC_ProxyPullConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPullConsumer::_remove_ref (CORBA::Environment &) +TAO_CEC_ProxyPullConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h index 900457b0854..10c22bd458e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h @@ -53,10 +53,10 @@ public: virtual ~TAO_CEC_ProxyPullConsumer (void); /// Activate in the POA - virtual CosEventChannelAdmin::ProxyPullConsumer_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::ProxyPullConsumer_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (CORBA::Environment &ACE_TRY_ENV) + virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no supplier is connected... @@ -67,20 +67,20 @@ public: CosEventComm::PullSupplier_ptr supplier (void) const; /// Pulls from the supplier, verifies that it is connected. - CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event, - CORBA::Environment &env); - CORBA::Any* pull_from_supplier (CORBA::Environment &env); + CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event + TAO_ENV_ARG_DECL); + CORBA::Any* pull_from_supplier (TAO_ENV_SINGLE_ARG_DECL); /** * Invoke the _non_existent() pseudo-operation on the supplier. If * it is disconnected then it returns true and sets the * <disconnected> flag. */ - CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected + TAO_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (CORBA::Environment&); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); /// Increment and decrement the reference count. CORBA::ULong _incr_refcnt (void); @@ -88,19 +88,17 @@ public: // = The CosEventChannelAdmin::ProxyPullConsumer methods... virtual void connect_pull_supplier ( - CosEventComm::PullSupplier_ptr pull_supplier, - CORBA::Environment &) + CosEventComm::PullSupplier_ptr pull_supplier + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); - virtual void disconnect_pull_consumer (CORBA::Environment &) + virtual void disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env); - virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); - virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: /// Set the supplier, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index 31f687d9ed8..7f0c235a487 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -31,13 +31,13 @@ TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void) } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CEC_ProxyPullSupplier::activate (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPullSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPullSupplier_var result; ACE_TRY { - result = this->_this (ACE_TRY_ENV); + result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -49,18 +49,18 @@ TAO_CEC_ProxyPullSupplier::activate (CORBA::Environment &ACE_TRY_ENV) } void -TAO_CEC_ProxyPullSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPullSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -74,7 +74,7 @@ TAO_CEC_ProxyPullSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV) } void -TAO_CEC_ProxyPullSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPullSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) { // Save the consumer we where connected to, we need to send a // disconnect message to it. @@ -90,7 +90,7 @@ TAO_CEC_ProxyPullSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) consumer = this->consumer_._retn (); } - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer.in ())) @@ -98,7 +98,7 @@ TAO_CEC_ProxyPullSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - consumer->disconnect_pull_consumer (ACE_TRY_ENV); + consumer->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -111,8 +111,8 @@ TAO_CEC_ProxyPullSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) CORBA::Boolean TAO_CEC_ProxyPullSupplier::consumer_non_existent ( - CORBA::Boolean_out disconnected, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean_out disconnected + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -132,15 +132,15 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return this->consumer_->_non_existent (ACE_TRY_ENV); + return this->consumer_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } void -TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event, - CORBA::Environment &) +TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event + TAO_ENV_ARG_DECL_NOT_USED) { if (this->is_connected () == 0) return; @@ -154,7 +154,7 @@ TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event, } CORBA::Any * -TAO_CEC_ProxyPullSupplier::pull (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPullSupplier::pull (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected)) { @@ -175,8 +175,8 @@ TAO_CEC_ProxyPullSupplier::pull (CORBA::Environment &ACE_TRY_ENV) } CORBA::Any * -TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)) { has_event = 0; @@ -231,8 +231,8 @@ TAO_CEC_ProxyPullSupplier::_decr_refcnt (void) void TAO_CEC_ProxyPullSupplier::connect_pull_consumer ( - CosEventComm::PullConsumer_ptr pull_consumer, - CORBA::Environment &ACE_TRY_ENV) + CosEventComm::PullConsumer_ptr pull_consumer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)) { @@ -264,7 +264,7 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer ( // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->reconnected (this, ACE_TRY_ENV); + this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; } return; @@ -276,12 +276,12 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer ( } // Notify the event channel... - this->event_channel_->connected (this, ACE_TRY_ENV); + this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); } void TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PullConsumer_var consumer; @@ -302,7 +302,7 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( } // Notify the event channel.... - this->event_channel_->disconnected (this, ACE_TRY_ENV); + this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer.in ())) @@ -312,7 +312,7 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( { ACE_TRY { - consumer->disconnect_pull_consumer (ACE_TRY_ENV); + consumer->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -327,19 +327,19 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( } PortableServer::POA_ptr -TAO_CEC_ProxyPullSupplier::_default_POA (CORBA::Environment&) +TAO_CEC_ProxyPullSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPullSupplier::_add_ref (CORBA::Environment &) +TAO_CEC_ProxyPullSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPullSupplier::_remove_ref (CORBA::Environment &) +TAO_CEC_ProxyPullSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h index 5526ee449a7..a602d56a722 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h @@ -56,10 +56,10 @@ public: virtual ~TAO_CEC_ProxyPullSupplier (void); /// Activate in the POA - virtual CosEventChannelAdmin::ProxyPullSupplier_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::ProxyPullSupplier_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (CORBA::Environment &ACE_TRY_ENV) + virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no consumer is connected... @@ -74,32 +74,32 @@ public: CosEventComm::PullConsumer_ptr consumer (void) const; /// The event channel is shutting down - virtual void shutdown (CORBA::Environment &env); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); /** * Invoke the _non_existent() pseudo-operation on the consumer. If * it is disconnected then it returns true and sets the * <disconnected> flag. */ - CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected + TAO_ENV_ARG_DECL); /// Push an event into the queue. - void push (const CORBA::Any &event, - CORBA::Environment &ACE_TRY_ENV); + void push (const CORBA::Any &event + TAO_ENV_ARG_DECL); // = The CosEventChannelAdmin::ProxyPullSupplier methods... virtual void connect_pull_consumer ( - CosEventComm::PullConsumer_ptr pull_consumer, - CORBA::Environment &) + CosEventComm::PullConsumer_ptr pull_consumer + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); - virtual CORBA::Any * pull (CORBA::Environment &) + virtual CORBA::Any * pull (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); - virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event, - CORBA::Environment &) + virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); - virtual void disconnect_pull_supplier (CORBA::Environment &) + virtual void disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Increment and decrement the reference count. @@ -107,9 +107,9 @@ public: CORBA::ULong _decr_refcnt (void); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); - virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV); - virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); protected: /// Set the consumer, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index 326175dc817..fde22699136 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -32,13 +32,13 @@ TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void) } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CEC_ProxyPushConsumer::activate (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushConsumer_var result; ACE_TRY { - result = this->_this (ACE_TRY_ENV); + result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -50,18 +50,18 @@ TAO_CEC_ProxyPushConsumer::activate (CORBA::Environment &ACE_TRY_ENV) } void -TAO_CEC_ProxyPushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -76,8 +76,8 @@ TAO_CEC_ProxyPushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV) CORBA::Boolean TAO_CEC_ProxyPushConsumer::supplier_non_existent ( - CORBA::Boolean_out disconnected, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean_out disconnected + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -97,14 +97,14 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return this->supplier_->_non_existent (ACE_TRY_ENV); + return this->supplier_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } void -TAO_CEC_ProxyPushConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) { CosEventComm::PushSupplier_var supplier; @@ -119,7 +119,7 @@ TAO_CEC_ProxyPushConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV) this->connected_ = 0; } - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -127,7 +127,7 @@ TAO_CEC_ProxyPushConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - supplier->disconnect_push_supplier (ACE_TRY_ENV); + supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -170,8 +170,8 @@ TAO_CEC_ProxyPushConsumer::_decr_refcnt (void) void TAO_CEC_ProxyPushConsumer::connect_push_supplier ( - CosEventComm::PushSupplier_ptr push_supplier, - CORBA::Environment &ACE_TRY_ENV) + CosEventComm::PushSupplier_ptr push_supplier + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)) { @@ -202,7 +202,7 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier ( // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->disconnected (this, ACE_TRY_ENV); + this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -216,12 +216,12 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier ( } // Notify the event channel... - this->event_channel_->connected (this, ACE_TRY_ENV); + this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); } void -TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_CEC_ProxyPushConsumer_Guard ace_mon (this->lock_, @@ -231,14 +231,14 @@ TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event, if (!ace_mon.locked ()) return; - this->event_channel_->consumer_admin ()->push (event, - ACE_TRY_ENV); + this->event_channel_->consumer_admin ()->push (event + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PushSupplier_var supplier; @@ -259,7 +259,7 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ( } // Notify the event channel... - this->event_channel_->disconnected (this, ACE_TRY_ENV); + this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -269,7 +269,7 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ( { ACE_TRY { - supplier->disconnect_push_supplier (ACE_TRY_ENV); + supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -282,19 +282,19 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ( } PortableServer::POA_ptr -TAO_CEC_ProxyPushConsumer::_default_POA (CORBA::Environment&) +TAO_CEC_ProxyPushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPushConsumer::_add_ref (CORBA::Environment &) +TAO_CEC_ProxyPushConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPushConsumer::_remove_ref (CORBA::Environment &) +TAO_CEC_ProxyPushConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h index 8881c55b3bf..433c5f71dee 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h @@ -53,10 +53,10 @@ public: virtual ~TAO_CEC_ProxyPushConsumer (void); /// Activate in the POA - virtual CosEventChannelAdmin::ProxyPushConsumer_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::ProxyPushConsumer_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (CORBA::Environment &ACE_TRY_ENV) + virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no supplier is connected... @@ -71,11 +71,11 @@ public: * it is disconnected then it returns true and sets the * <disconnected> flag. */ - CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected + TAO_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (CORBA::Environment&); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); /// Increment and decrement the reference count. CORBA::ULong _incr_refcnt (void); @@ -83,22 +83,20 @@ public: // = The CosEventChannelAdmin::ProxyPushConsumer methods... virtual void connect_push_supplier ( - CosEventComm::PushSupplier_ptr push_supplier, - CORBA::Environment &) + CosEventComm::PushSupplier_ptr push_supplier + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); - virtual void push (const CORBA::Any& event, - CORBA::Environment &) + virtual void push (const CORBA::Any& event + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env); - virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); - virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: /// Set the supplier, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index d0d710ed04c..e6b129f6bb3 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -32,13 +32,13 @@ TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void) } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CEC_ProxyPushSupplier::activate (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushSupplier_var result; ACE_TRY { - result = this->_this (ACE_TRY_ENV); + result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -50,18 +50,18 @@ TAO_CEC_ProxyPushSupplier::activate (CORBA::Environment &ACE_TRY_ENV) } void -TAO_CEC_ProxyPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -75,7 +75,7 @@ TAO_CEC_ProxyPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV) } void -TAO_CEC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) { // Save the consumer we where connected to, we need to send a // disconnect message to it. @@ -91,7 +91,7 @@ TAO_CEC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) consumer = this->consumer_._retn (); } - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer.in ())) @@ -99,7 +99,7 @@ TAO_CEC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - consumer->disconnect_push_consumer (ACE_TRY_ENV); + consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -113,8 +113,8 @@ TAO_CEC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) typedef TAO_ESF_Proxy_RefCount_Guard<TAO_CEC_EventChannel,TAO_CEC_ProxyPushSupplier> Destroy_Guard; void -TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event + TAO_ENV_ARG_DECL) { Destroy_Guard auto_destroy (this->refcount_, this->event_channel_, @@ -133,16 +133,16 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event, ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock); this->event_channel_->dispatching ()->push (this, - event, - ACE_TRY_ENV); + event + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } } void -TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event + TAO_ENV_ARG_DECL) { Destroy_Guard auto_destroy (this->refcount_, this->event_channel_, @@ -161,8 +161,8 @@ TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event, ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock); this->event_channel_->dispatching ()->push_nocopy (this, - event, - ACE_TRY_ENV); + event + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -199,8 +199,8 @@ TAO_CEC_ProxyPushSupplier::_decr_refcnt (void) void TAO_CEC_ProxyPushSupplier::connect_push_consumer ( - CosEventComm::PushConsumer_ptr push_consumer, - CORBA::Environment &ACE_TRY_ENV) + CosEventComm::PushConsumer_ptr push_consumer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)) @@ -236,7 +236,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->reconnected (this, ACE_TRY_ENV); + this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; } return; @@ -247,12 +247,12 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( } // Notify the event channel... - this->event_channel_->connected (this, ACE_TRY_ENV); + this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); } void TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventComm::PushConsumer_var consumer; @@ -273,14 +273,14 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( } // Notify the event channel.... - this->event_channel_->disconnected (this, ACE_TRY_ENV); + this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->event_channel_->disconnect_callbacks ()) { ACE_TRY { - consumer->disconnect_push_consumer (ACE_TRY_ENV); + consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -295,8 +295,8 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( } void -TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event, - CORBA::Environment& ACE_TRY_ENV) +TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event + TAO_ENV_ARG_DECL) { CosEventComm::PushConsumer_var consumer; { @@ -315,7 +315,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event, ACE_TRY { - consumer->push (event, ACE_TRY_ENV); + consumer->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) @@ -323,7 +323,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event, TAO_CEC_ConsumerControl *control = this->event_channel_->consumer_control (); - control->consumer_not_exist (this, ACE_TRY_ENV); + control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -332,8 +332,8 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event, this->event_channel_->consumer_control (); control->system_exception (this, - sysex, - ACE_TRY_ENV); + sysex + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -345,8 +345,8 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event, void TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( - const CORBA::Any& event, - CORBA::Environment& ACE_TRY_ENV) + const CORBA::Any& event + TAO_ENV_ARG_DECL) { CosEventComm::PushConsumer_var consumer; { @@ -360,7 +360,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( ACE_TRY { - consumer->push (event, ACE_TRY_ENV); + consumer->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) @@ -368,7 +368,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( TAO_CEC_ConsumerControl *control = this->event_channel_->consumer_control (); - control->consumer_not_exist (this, ACE_TRY_ENV); + control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -377,8 +377,8 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( this->event_channel_->consumer_control (); control->system_exception (this, - sysex, - ACE_TRY_ENV); + sysex + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -390,8 +390,8 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( CORBA::Boolean TAO_CEC_ProxyPushSupplier::consumer_non_existent ( - CORBA::Boolean_out disconnected, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean_out disconnected + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -407,26 +407,26 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return this->consumer_->_non_existent (ACE_TRY_ENV); + return this->consumer_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } PortableServer::POA_ptr -TAO_CEC_ProxyPushSupplier::_default_POA (CORBA::Environment&) +TAO_CEC_ProxyPushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPushSupplier::_add_ref (CORBA::Environment &) +TAO_CEC_ProxyPushSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPushSupplier::_remove_ref (CORBA::Environment &) +TAO_CEC_ProxyPushSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h index 01ab4386186..a3bcddab675 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h @@ -54,10 +54,10 @@ public: virtual ~TAO_CEC_ProxyPushSupplier (void); /// Activate in the POA - virtual CosEventChannelAdmin::ProxyPushSupplier_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::ProxyPushSupplier_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (CORBA::Environment &ACE_TRY_ENV) + virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no consumer is connected... @@ -72,36 +72,36 @@ public: CosEventComm::PushConsumer_ptr consumer (void) const; /// The event channel is shutting down - virtual void shutdown (CORBA::Environment &env); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); /// Internal methods to push an event to each consumer. - virtual void push (const CORBA::Any &event, - CORBA::Environment &ACE_TRY_ENV); - virtual void push_nocopy (CORBA::Any &event, - CORBA::Environment &ACE_TRY_ENV); + virtual void push (const CORBA::Any &event + TAO_ENV_ARG_DECL); + virtual void push_nocopy (CORBA::Any &event + TAO_ENV_ARG_DECL); /// Pushes to the consumer, verifies that it is connected. - void push_to_consumer (const CORBA::Any &event, - CORBA::Environment &env); - void reactive_push_to_consumer (const CORBA::Any &event, - CORBA::Environment &env); + void push_to_consumer (const CORBA::Any &event + TAO_ENV_ARG_DECL); + void reactive_push_to_consumer (const CORBA::Any &event + TAO_ENV_ARG_DECL); /** * Invoke the _non_existent() pseudo-operation on the consumer. If * it is disconnected then it returns true and sets the * <disconnected> flag. */ - CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected + TAO_ENV_ARG_DECL); // = The CosEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( - CosEventComm::PushConsumer_ptr push_consumer, - CORBA::Environment &) + CosEventComm::PushConsumer_ptr push_consumer + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Increment and decrement the reference count. @@ -109,9 +109,9 @@ public: CORBA::ULong _decr_refcnt (void); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); - virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV); - virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); protected: /// Set the consumer, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h index 0195f7f83f1..1b49e6ccb4c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -50,12 +50,12 @@ public: #if 0 /// Some strategies may want to keep track of connected consumers. - virtual void connected (TAO_CEC_ProxyPullConsumer *, - CORBA::Environment &) = 0; - virtual void reconnected (TAO_CEC_ProxyPullConsumer *, - CORBA::Environment &) = 0; - virtual void diconnected (TAO_CEC_ProxyPullConsumer *, - CORBA::Environment &) = 0; + virtual void connected (TAO_CEC_ProxyPullConsumer * + TAO_ENV_ARG_DECL_NOT_USED) = 0; + virtual void reconnected (TAO_CEC_ProxyPullConsumer * + TAO_ENV_ARG_DECL_NOT_USED) = 0; + virtual void diconnected (TAO_CEC_ProxyPullConsumer * + TAO_ENV_ARG_DECL_NOT_USED) = 0; #endif /* 0 */ }; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index 7c708b23781..538bda35e5f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -34,16 +34,16 @@ TAO_CEC_Reactive_ConsumerControl::~TAO_CEC_Reactive_ConsumerControl (void) void TAO_CEC_Reactive_ConsumerControl::query_consumers ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) { TAO_CEC_Ping_Push_Consumer push_worker (this); - this->event_channel_->consumer_admin ()->for_each (&push_worker, - ACE_TRY_ENV); + this->event_channel_->consumer_admin ()->for_each (&push_worker + TAO_ENV_ARG_PARAMETER); ACE_CHECK; TAO_CEC_Ping_Pull_Consumer pull_worker (this); - this->event_channel_->consumer_admin ()->for_each (&pull_worker, - ACE_TRY_ENV); + this->event_channel_->consumer_admin ()->for_each (&pull_worker + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -58,27 +58,27 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout ( // the iteration... CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = - this->policy_current_->get_policy_overrides (types, - ACE_TRY_ENV); + this->policy_current_->get_policy_overrides (types + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, - CORBA::ADD_OVERRIDE, - ACE_TRY_ENV); + CORBA::ADD_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Query the state of the consumers... - this->query_consumers (ACE_TRY_ENV); + this->query_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (ACE_TRY_ENV); + policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -104,13 +104,13 @@ TAO_CEC_Reactive_ConsumerControl::activate (void) { // Get the PolicyCurrent object CORBA::Object_var tmp = - this->orb_->resolve_initial_references ("PolicyCurrent", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("PolicyCurrent" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = - CORBA::PolicyCurrent::_narrow (tmp.in (), - ACE_TRY_ENV); + CORBA::PolicyCurrent::_narrow (tmp.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -124,8 +124,8 @@ TAO_CEC_Reactive_ConsumerControl::activate (void) this->policy_list_[0] = this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - any, - ACE_TRY_ENV); + any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -147,12 +147,12 @@ TAO_CEC_Reactive_ConsumerControl::shutdown (void) void TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( - TAO_CEC_ProxyPushSupplier *proxy, - CORBA::Environment &ACE_TRY_ENV) + TAO_CEC_ProxyPushSupplier *proxy + TAO_ENV_ARG_DECL) { ACE_TRY { - proxy->disconnect_push_supplier (ACE_TRY_ENV); + proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -166,12 +166,12 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( void TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( - TAO_CEC_ProxyPullSupplier *proxy, - CORBA::Environment &ACE_TRY_ENV) + TAO_CEC_ProxyPullSupplier *proxy + TAO_ENV_ARG_DECL) { ACE_TRY { - proxy->disconnect_pull_supplier (ACE_TRY_ENV); + proxy->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -186,8 +186,8 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( void TAO_CEC_Reactive_ConsumerControl::system_exception ( TAO_CEC_ProxyPushSupplier *proxy, - CORBA::SystemException & /* exception */, - CORBA::Environment &ACE_TRY_ENV) + CORBA::SystemException & /* exception */ + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -201,7 +201,7 @@ TAO_CEC_Reactive_ConsumerControl::system_exception ( // return; // Anything else is serious, including timeouts... - proxy->disconnect_push_supplier (ACE_TRY_ENV); + proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -231,25 +231,25 @@ TAO_CEC_ConsumerControl_Adapter::handle_timeout ( // **************************************************************** void -TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = - supplier->consumer_non_existent (disconnected, - ACE_TRY_ENV); + supplier->consumer_non_existent (disconnected + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->consumer_not_exist (supplier, ACE_TRY_ENV); + this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->consumer_not_exist (supplier, ACE_TRY_ENV); + this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -263,7 +263,7 @@ TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier, // && exception->minor () == 0x54410085) // return; - this->control_->consumer_not_exist (supplier, ACE_TRY_ENV); + this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -276,25 +276,25 @@ TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier, // **************************************************************** void -TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier + TAO_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = - supplier->consumer_non_existent (disconnected, - ACE_TRY_ENV); + supplier->consumer_non_existent (disconnected + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->consumer_not_exist (supplier, ACE_TRY_ENV); + this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->consumer_not_exist (supplier, ACE_TRY_ENV); + this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -308,7 +308,7 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier, // && exception->minor () == 0x54410085) // return; - this->control_->consumer_not_exist (supplier, ACE_TRY_ENV); + this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h index a58c5858b39..c6ab0973fdd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -85,18 +85,18 @@ public: // = Documented in TAO_CEC_ConsumerControl virtual int activate (void); virtual int shutdown (void); - virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy, - CORBA::Environment &); - virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy, - CORBA::Environment &); + virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy + TAO_ENV_ARG_DECL_NOT_USED); + virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy + TAO_ENV_ARG_DECL_NOT_USED); virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy, - CORBA::SystemException &, - CORBA::Environment &); + CORBA::SystemException & + TAO_ENV_ARG_DECL_NOT_USED); private: /// Check if the consumers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_consumers (CORBA::Environment &ACE_TRY_ENV); + void query_consumers (TAO_ENV_SINGLE_ARG_DECL); private: /// The polling rate @@ -128,8 +128,8 @@ class TAO_CEC_Ping_Push_Consumer : public TAO_ESF_Worker<TAO_CEC_ProxyPushSuppli public: TAO_CEC_Ping_Push_Consumer (TAO_CEC_ConsumerControl *control); - virtual void work (TAO_CEC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV); + virtual void work (TAO_CEC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL); private: TAO_CEC_ConsumerControl *control_; @@ -142,8 +142,8 @@ class TAO_CEC_Ping_Pull_Consumer : public TAO_ESF_Worker<TAO_CEC_ProxyPullSuppli public: TAO_CEC_Ping_Pull_Consumer (TAO_CEC_ConsumerControl *control); - virtual void work (TAO_CEC_ProxyPullSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV); + virtual void work (TAO_CEC_ProxyPullSupplier *supplier + TAO_ENV_ARG_DECL); private: TAO_CEC_ConsumerControl *control_; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index f10cf9a7d67..34530e04dbd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -39,30 +39,30 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout ( // the iteration... CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = - this->policy_current_->get_policy_overrides (types, - ACE_TRY_ENV); + this->policy_current_->get_policy_overrides (types + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, - CORBA::ADD_OVERRIDE, - ACE_TRY_ENV); + CORBA::ADD_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; TAO_CEC_Pull_Event worker (this->event_channel_->consumer_admin (), this->event_channel_->supplier_control ()); - this->event_channel_->supplier_admin ()->for_each (&worker, - ACE_TRY_ENV); + this->event_channel_->supplier_admin ()->for_each (&worker + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (ACE_TRY_ENV); + policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -88,13 +88,13 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void) { // Get the PolicyCurrent object CORBA::Object_var tmp = - this->orb_->resolve_initial_references ("PolicyCurrent", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("PolicyCurrent" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = - CORBA::PolicyCurrent::_narrow (tmp.in (), - ACE_TRY_ENV); + CORBA::PolicyCurrent::_narrow (tmp.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -108,8 +108,8 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void) this->policy_list_[0] = this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - any, - ACE_TRY_ENV); + any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -146,16 +146,16 @@ TAO_CEC_Pulling_Strategy_Adapter::handle_timeout ( // **************************************************************** void -TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer + TAO_ENV_ARG_DECL) { CORBA::Boolean has_event = 0; CORBA::Any_var any; ACE_TRY { - any = consumer->try_pull_from_supplier (has_event, - ACE_TRY_ENV); + any = consumer->try_pull_from_supplier (has_event + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -167,7 +167,7 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer, if (has_event) { - this->consumer_admin_->push (any.in (), ACE_TRY_ENV); + this->consumer_admin_->push (any.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h index a7bd8a30360..e72af9018fd 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -111,8 +111,8 @@ public: TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin, TAO_CEC_SupplierControl *control); - virtual void work (TAO_CEC_ProxyPullConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV); + virtual void work (TAO_CEC_ProxyPullConsumer *consumer + TAO_ENV_ARG_DECL); private: /// Used to propagate the events. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index 39e0e87b307..75651b761dc 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -35,16 +35,16 @@ TAO_CEC_Reactive_SupplierControl::~TAO_CEC_Reactive_SupplierControl (void) void TAO_CEC_Reactive_SupplierControl::query_suppliers ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) { TAO_CEC_Ping_Push_Supplier push_worker (this); - this->event_channel_->supplier_admin ()->for_each (&push_worker, - ACE_TRY_ENV); + this->event_channel_->supplier_admin ()->for_each (&push_worker + TAO_ENV_ARG_PARAMETER); ACE_CHECK; TAO_CEC_Ping_Pull_Supplier pull_worker (this); - this->event_channel_->supplier_admin ()->for_each (&pull_worker, - ACE_TRY_ENV); + this->event_channel_->supplier_admin ()->for_each (&pull_worker + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -59,27 +59,27 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout ( // the iteration... CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = - this->policy_current_->get_policy_overrides (types, - ACE_TRY_ENV); + this->policy_current_->get_policy_overrides (types + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, - CORBA::ADD_OVERRIDE, - ACE_TRY_ENV); + CORBA::ADD_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Query the state of the suppliers... - this->query_suppliers (ACE_TRY_ENV); + this->query_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (ACE_TRY_ENV); + policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -105,13 +105,13 @@ TAO_CEC_Reactive_SupplierControl::activate (void) { // Get the PolicyCurrent object CORBA::Object_var tmp = - this->orb_->resolve_initial_references ("PolicyCurrent", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("PolicyCurrent" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = - CORBA::PolicyCurrent::_narrow (tmp.in (), - ACE_TRY_ENV); + CORBA::PolicyCurrent::_narrow (tmp.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -125,8 +125,8 @@ TAO_CEC_Reactive_SupplierControl::activate (void) this->policy_list_[0] = this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - any, - ACE_TRY_ENV); + any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -148,12 +148,12 @@ TAO_CEC_Reactive_SupplierControl::shutdown (void) void TAO_CEC_Reactive_SupplierControl::supplier_not_exist ( - TAO_CEC_ProxyPushConsumer *proxy, - CORBA::Environment &ACE_TRY_ENV) + TAO_CEC_ProxyPushConsumer *proxy + TAO_ENV_ARG_DECL) { ACE_TRY { - proxy->disconnect_push_consumer (ACE_TRY_ENV); + proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -165,12 +165,12 @@ TAO_CEC_Reactive_SupplierControl::supplier_not_exist ( void TAO_CEC_Reactive_SupplierControl::supplier_not_exist ( - TAO_CEC_ProxyPullConsumer *proxy, - CORBA::Environment &ACE_TRY_ENV) + TAO_CEC_ProxyPullConsumer *proxy + TAO_ENV_ARG_DECL) { ACE_TRY { - proxy->disconnect_pull_consumer (ACE_TRY_ENV); + proxy->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -183,8 +183,8 @@ TAO_CEC_Reactive_SupplierControl::supplier_not_exist ( void TAO_CEC_Reactive_SupplierControl::system_exception ( TAO_CEC_ProxyPullConsumer *proxy, - CORBA::SystemException & /* exception */, - CORBA::Environment &ACE_TRY_ENV) + CORBA::SystemException & /* exception */ + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -198,7 +198,7 @@ TAO_CEC_Reactive_SupplierControl::system_exception ( // return; // Anything else is serious, including timeouts... - proxy->disconnect_pull_consumer (ACE_TRY_ENV); + proxy->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -228,25 +228,25 @@ TAO_CEC_SupplierControl_Adapter::handle_timeout ( // **************************************************************** void -TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = - consumer->supplier_non_existent (disconnected, - ACE_TRY_ENV); + consumer->supplier_non_existent (disconnected + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->supplier_not_exist (consumer, ACE_TRY_ENV); + this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->supplier_not_exist (consumer, ACE_TRY_ENV); + this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -261,7 +261,7 @@ TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer, // return; // Anything else is serious, including timeouts... - this->control_->supplier_not_exist (consumer, ACE_TRY_ENV); + this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -274,25 +274,25 @@ TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer, // **************************************************************** void -TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer + TAO_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = - consumer->supplier_non_existent (disconnected, - ACE_TRY_ENV); + consumer->supplier_non_existent (disconnected + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->supplier_not_exist (consumer, ACE_TRY_ENV); + this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->supplier_not_exist (consumer, ACE_TRY_ENV); + this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -307,7 +307,7 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer, // return; // Anything else is serious, including timeouts... - this->control_->supplier_not_exist (consumer, ACE_TRY_ENV); + this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h index d137126f35e..278d23130d8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -85,18 +85,18 @@ public: // = Documented in TAO_CEC_SupplierControl virtual int activate (void); virtual int shutdown (void); - virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy, - CORBA::Environment &); - virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy, - CORBA::Environment &); + virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy + TAO_ENV_ARG_DECL_NOT_USED); + virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy + TAO_ENV_ARG_DECL_NOT_USED); virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy, - CORBA::SystemException &, - CORBA::Environment &); + CORBA::SystemException & + TAO_ENV_ARG_DECL_NOT_USED); private: /// Check if the suppliers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_suppliers (CORBA::Environment &ACE_TRY_ENV); + void query_suppliers (TAO_ENV_SINGLE_ARG_DECL); private: /// The polling rate @@ -128,8 +128,8 @@ class TAO_CEC_Ping_Push_Supplier : public TAO_ESF_Worker<TAO_CEC_ProxyPushConsum public: TAO_CEC_Ping_Push_Supplier (TAO_CEC_SupplierControl *control); - virtual void work (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV); + virtual void work (TAO_CEC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL); private: TAO_CEC_SupplierControl *control_; @@ -142,8 +142,8 @@ class TAO_CEC_Ping_Pull_Supplier : public TAO_ESF_Worker<TAO_CEC_ProxyPullConsum public: TAO_CEC_Ping_Pull_Supplier (TAO_CEC_SupplierControl *control); - virtual void work (TAO_CEC_ProxyPullConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV); + virtual void work (TAO_CEC_ProxyPullConsumer *consumer + TAO_ENV_ARG_DECL); private: TAO_CEC_SupplierControl *control_; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index b126941d78d..7ec53139c38 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -32,75 +32,75 @@ TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin (void) } PortableServer::POA_ptr -TAO_CEC_SupplierAdmin::_default_POA (CORBA::Environment&) +TAO_CEC_SupplierAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment & ACE_TRY_ENV) +TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL) { - this->push_admin_.connected (consumer, ACE_TRY_ENV); + this->push_admin_.connected (consumer TAO_ENV_ARG_PARAMETER); } void -TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL) { - this->push_admin_.reconnected (consumer, ACE_TRY_ENV); + this->push_admin_.reconnected (consumer TAO_ENV_ARG_PARAMETER); } void -TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL) { - this->push_admin_.disconnected (consumer, ACE_TRY_ENV); + this->push_admin_.disconnected (consumer TAO_ENV_ARG_PARAMETER); } void -TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPullConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPullConsumer *consumer + TAO_ENV_ARG_DECL) { - this->pull_admin_.connected (consumer, ACE_TRY_ENV); + this->pull_admin_.connected (consumer TAO_ENV_ARG_PARAMETER); } void -TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPullConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPullConsumer *consumer + TAO_ENV_ARG_DECL) { - this->pull_admin_.reconnected (consumer, ACE_TRY_ENV); + this->pull_admin_.reconnected (consumer TAO_ENV_ARG_PARAMETER); } void -TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer + TAO_ENV_ARG_DECL) { - this->pull_admin_.disconnected (consumer, ACE_TRY_ENV); + this->pull_admin_.disconnected (consumer TAO_ENV_ARG_PARAMETER); } void -TAO_CEC_SupplierAdmin::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_SupplierAdmin::shutdown (TAO_ENV_SINGLE_ARG_DECL) { - this->push_admin_.shutdown (ACE_TRY_ENV); + this->push_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->pull_admin_.shutdown (ACE_TRY_ENV); + this->pull_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CEC_SupplierAdmin::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_SupplierAdmin::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->push_admin_.obtain (ACE_TRY_ENV); + return this->push_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CEC_SupplierAdmin::obtain_pull_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_CEC_SupplierAdmin::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->pull_admin_.obtain (ACE_TRY_ENV); + return this->pull_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER); } // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index 901215bbb08..5dbc4252c95 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -57,41 +57,41 @@ public: virtual ~TAO_CEC_SupplierAdmin (void); /// For each elements call <worker->work()>. - void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker, - CORBA::Environment &ACE_TRY_ENV); + void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker + TAO_ENV_ARG_DECL); /// For each elements call <worker->work()>. - void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker, - CORBA::Environment &ACE_TRY_ENV); + void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker + TAO_ENV_ARG_DECL); /// Keep track of connected consumers. - virtual void connected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment&); - virtual void reconnected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment&); - virtual void disconnected (TAO_CEC_ProxyPushConsumer*, - CORBA::Environment&); - virtual void connected (TAO_CEC_ProxyPullConsumer*, - CORBA::Environment&); - virtual void reconnected (TAO_CEC_ProxyPullConsumer*, - CORBA::Environment&); - virtual void disconnected (TAO_CEC_ProxyPullConsumer*, - CORBA::Environment&); + virtual void connected (TAO_CEC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void reconnected (TAO_CEC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void disconnected (TAO_CEC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void connected (TAO_CEC_ProxyPullConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void reconnected (TAO_CEC_ProxyPullConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void disconnected (TAO_CEC_ProxyPullConsumer* + TAO_ENV_ARG_DECL_NOT_USED); /// The event channel is shutting down, inform all the consumers of /// this - virtual void shutdown (CORBA::Environment&); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // = The CosEventChannelAdmin::SupplierAdmin methods... virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (CORBA::Environment &) + obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer (CORBA::Environment &) + obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); private: /// The Event Channel we belong to diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i index 23eb6fc7a67..43b2cfbab3d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i @@ -2,16 +2,16 @@ ACE_INLINE void TAO_CEC_SupplierAdmin:: - for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker, - CORBA::Environment &ACE_TRY_ENV) + for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker + TAO_ENV_ARG_DECL) { - this->push_admin_.for_each (worker, ACE_TRY_ENV); + this->push_admin_.for_each (worker TAO_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_CEC_SupplierAdmin:: - for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker, - CORBA::Environment &ACE_TRY_ENV) + for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker + TAO_ENV_ARG_DECL) { - this->pull_admin_.for_each (worker, ACE_TRY_ENV); + this->pull_admin_.for_each (worker TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp index c3953e03ebb..c0856651a75 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp @@ -29,21 +29,21 @@ TAO_CEC_SupplierControl::shutdown (void) } void -TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPushConsumer *, - CORBA::Environment &) +TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPushConsumer * + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPullConsumer *, - CORBA::Environment &) +TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPullConsumer * + TAO_ENV_ARG_DECL_NOT_USED) { } void TAO_CEC_SupplierControl::system_exception (TAO_CEC_ProxyPullConsumer *, - CORBA::SystemException &, - CORBA::Environment &) + CORBA::SystemException & + TAO_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index c655ddb5ea7..6e92fbcda70 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -62,21 +62,21 @@ public: * not exists (i.e. _non_existent() returns true and/or the * CORBA::OBJECT_NOT_EXIST exception has been raised). */ - virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy, - CORBA::Environment &); + virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy + TAO_ENV_ARG_DECL_NOT_USED); /** * Invoked by helper classes when they detect that a supplier does * not exists (i.e. _non_existent() returns true and/or the * CORBA::OBJECT_NOT_EXIST exception has been raised). */ - virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy, - CORBA::Environment &); + virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy + TAO_ENV_ARG_DECL_NOT_USED); /// Some system exception was rasied while trying to push an event. virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy, - CORBA::SystemException &, - CORBA::Environment &); + CORBA::SystemException & + TAO_ENV_ARG_DECL_NOT_USED); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl index f71e9cd2610..f3c1fb266b7 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl @@ -124,3 +124,4 @@ typedef sequence <NameValuePair> Criteria; */ #endif /* TAO_LIFECYCLE_IDL */ + diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp index 64558ca1c3f..011fe07d0ea 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp @@ -28,8 +28,8 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: - for_each (TAO_ESF_Worker<PROXY> *worker, - CORBA::Environment &ACE_TRY_ENV) + for_each (TAO_ESF_Worker<PROXY> *worker + TAO_ENV_ARG_DECL) { // @@ Use an allocator for this memory... PROXY **proxies = 0; @@ -58,7 +58,7 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: for (PROXY **j = proxies; j != proxies + size; ++j) { - worker->work (*j, ACE_TRY_ENV); + worker->work (*j TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; (*j)->_decr_refcnt (); } @@ -80,43 +80,43 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: - connected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + connected (PROXY *proxy + TAO_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); proxy->_incr_refcnt (); - this->collection_.connected (proxy, ACE_TRY_ENV); + this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER); } template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: - reconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + reconnected (PROXY *proxy + TAO_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); proxy->_incr_refcnt (); - this->collection_.reconnected (proxy, ACE_TRY_ENV); + this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER); } template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: - disconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + disconnected (PROXY *proxy + TAO_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - this->collection_.disconnected (proxy, ACE_TRY_ENV); + this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER); } template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: - shutdown (CORBA::Environment &ACE_TRY_ENV) + shutdown (TAO_ENV_SINGLE_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - this->collection_.shutdown (ACE_TRY_ENV); + this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } #endif /* TAO_ESF_COPY_ON_READ_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h index 5286ea0adc2..5f1b3e1e100 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h @@ -27,7 +27,7 @@ template<class Target> class TAO_ESF_Worker; * * @brief Implement the Copy_On_Read protocol * - * + * * The class is parametric on the kind of collection and locking * mechanism used. */ @@ -40,15 +40,15 @@ public: TAO_ESF_Copy_On_Read (const COLLECTION &collection); // = The TAO_ESF_Proxy_Collection methods - virtual void for_each (TAO_ESF_Worker<PROXY> *worker, - CORBA::Environment &ACE_TRY_ENV); - virtual void connected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - virtual void reconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - virtual void disconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV); + virtual void for_each (TAO_ESF_Worker<PROXY> *worker + TAO_ENV_ARG_DECL); + virtual void connected (PROXY *proxy + TAO_ENV_ARG_DECL); + virtual void reconnected (PROXY *proxy + TAO_ENV_ARG_DECL); + virtual void disconnected (PROXY *proxy + TAO_ENV_ARG_DECL); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); private: COLLECTION collection_; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp index d3425ef7485..1ecba5d20e3 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp @@ -65,8 +65,8 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: - for_each (TAO_ESF_Worker<PROXY> *worker, - CORBA::Environment &ACE_TRY_ENV) + for_each (TAO_ESF_Worker<PROXY> *worker + TAO_ENV_ARG_DECL) { Read_Guard ace_mon (this->mutex_, this->collection_); @@ -74,15 +74,15 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: ITERATOR end = ace_mon.collection->collection.end (); for (ITERATOR i = ace_mon.collection->collection.begin (); i != end; ++i) { - worker->work (*i, ACE_TRY_ENV); + worker->work (*i TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: - connected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + connected (PROXY *proxy + TAO_ENV_ARG_DECL) { Write_Guard ace_mon (this->mutex_, this->cond_, @@ -91,13 +91,13 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: this->collection_); proxy->_incr_refcnt (); - ace_mon.copy->collection.connected (proxy, ACE_TRY_ENV); + ace_mon.copy->collection.connected (proxy TAO_ENV_ARG_PARAMETER); } template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: - reconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + reconnected (PROXY *proxy + TAO_ENV_ARG_DECL) { Write_Guard ace_mon (this->mutex_, this->cond_, @@ -106,13 +106,13 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: this->collection_); proxy->_incr_refcnt (); - ace_mon.copy->collection.reconnected (proxy, ACE_TRY_ENV); + ace_mon.copy->collection.reconnected (proxy TAO_ENV_ARG_PARAMETER); } template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: - disconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + disconnected (PROXY *proxy + TAO_ENV_ARG_DECL) { Write_Guard ace_mon (this->mutex_, this->cond_, @@ -120,12 +120,12 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: this->writing_, this->collection_); - ace_mon.copy->collection.disconnected (proxy, ACE_TRY_ENV); + ace_mon.copy->collection.disconnected (proxy TAO_ENV_ARG_PARAMETER); } template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: - shutdown (CORBA::Environment &ACE_TRY_ENV) + shutdown (TAO_ENV_SINGLE_ARG_DECL) { // We need to perform a copy to follow the protocol. Write_Guard ace_mon (this->mutex_, @@ -134,7 +134,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: this->writing_, this->collection_); - ace_mon.copy->collection.shutdown (ACE_TRY_ENV); + ace_mon.copy->collection.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } template<class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h index b45e26cbcf3..8e646428cb0 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h @@ -125,15 +125,15 @@ public: ~TAO_ESF_Copy_On_Write (void); // = The TAO_ESF_Proxy methods - virtual void for_each (TAO_ESF_Worker<PROXY> *worker, - CORBA::Environment &ACE_TRY_ENV); - virtual void connected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - virtual void reconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - virtual void disconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV); + virtual void for_each (TAO_ESF_Worker<PROXY> *worker + TAO_ENV_ARG_DECL); + virtual void connected (PROXY *proxy + TAO_ENV_ARG_DECL); + virtual void reconnected (PROXY *proxy + TAO_ENV_ARG_DECL); + virtual void disconnected (PROXY *proxy + TAO_ENV_ARG_DECL); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); private: typedef TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp index c4318efde35..564e6d08805 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp @@ -45,15 +45,15 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: - for_each (TAO_ESF_Worker<PROXY> *worker, - CORBA::Environment &ACE_TRY_ENV) + for_each (TAO_ESF_Worker<PROXY> *worker + TAO_ENV_ARG_DECL) { ACE_GUARD (Busy_Lock, ace_mon, this->lock_); ITERATOR end = this->collection_.end (); for (ITERATOR i = this->collection_.begin (); i != end; ++i) { - worker->work (*i, ACE_TRY_ENV); + worker->work (*i TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -107,8 +107,8 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: template<class PROXY, class C, class I,ACE_SYNCH_DECL> void TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: - connected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + connected (PROXY *proxy + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, CORBA::INTERNAL ()); @@ -118,7 +118,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: if (this->busy_count_ == 0) { // We can add the object immediately - this->connected_i (proxy, ACE_TRY_ENV); + this->connected_i (proxy TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -134,8 +134,8 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: template<class PROXY, class C, class I,ACE_SYNCH_DECL> void TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: - reconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + reconnected (PROXY *proxy + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, CORBA::INTERNAL ()); @@ -145,7 +145,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: if (this->busy_count_ == 0) { // We can reconnect the object immediately - this->reconnected_i (proxy, ACE_TRY_ENV); + this->reconnected_i (proxy TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -161,8 +161,8 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: template<class PROXY, class C, class I,ACE_SYNCH_DECL> void TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: - disconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + disconnected (PROXY *proxy + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, CORBA::INTERNAL ()); @@ -171,7 +171,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: if (this->busy_count_ == 0) { // We can remove the object immediately - this->disconnected_i (proxy, ACE_TRY_ENV); + this->disconnected_i (proxy TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -187,7 +187,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: template<class PROXY, class C, class I,ACE_SYNCH_DECL> void TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: - shutdown (CORBA::Environment &ACE_TRY_ENV) + shutdown (TAO_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_, CORBA::INTERNAL ()); @@ -196,7 +196,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: if (this->busy_count_ == 0) { // We can shutdown the object immediately - this->shutdown_i (ACE_TRY_ENV); + this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h index c7d89b0eaf8..7c28ba64540 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h @@ -92,13 +92,13 @@ public: int idle (void); int execute_delayed_operations (void); - void connected_i (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - void reconnected_i (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - void disconnected_i (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - void shutdown_i (CORBA::Environment &ACE_TRY_ENV); + void connected_i (PROXY *proxy + TAO_ENV_ARG_DECL); + void reconnected_i (PROXY *proxy + TAO_ENV_ARG_DECL); + void disconnected_i (PROXY *proxy + TAO_ENV_ARG_DECL); + void shutdown_i (TAO_ENV_SINGLE_ARG_DECL); typedef TAO_ESF_Connected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Connected_Command; typedef TAO_ESF_Reconnected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Reconnected_Command; @@ -106,15 +106,15 @@ public: typedef TAO_ESF_Shutdown_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE> > Shutdown_Command; // = The TAO_ESF_Proxy methods - virtual void for_each (TAO_ESF_Worker<PROXY> *worker, - CORBA::Environment &ACE_TRY_ENV); - virtual void connected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - virtual void reconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - virtual void disconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV); + virtual void for_each (TAO_ESF_Worker<PROXY> *worker + TAO_ENV_ARG_DECL); + virtual void connected (PROXY *proxy + TAO_ENV_ARG_DECL); + virtual void reconnected (PROXY *proxy + TAO_ENV_ARG_DECL); + virtual void disconnected (PROXY *proxy + TAO_ENV_ARG_DECL); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); private: COLLECTION collection_; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i index b6511ed1a28..964625575f9 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i @@ -2,31 +2,31 @@ template<class PROXY, class C, class I,ACE_SYNCH_DECL> void TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: - connected_i (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + connected_i (PROXY *proxy + TAO_ENV_ARG_DECL) { - this->collection_.connected (proxy, ACE_TRY_ENV); + this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER); } template<class PROXY, class C, class I,ACE_SYNCH_DECL> void TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: - reconnected_i (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + reconnected_i (PROXY *proxy + TAO_ENV_ARG_DECL) { - this->collection_.reconnected (proxy, ACE_TRY_ENV); + this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER); } template<class PROXY, class C, class I,ACE_SYNCH_DECL> void TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: - disconnected_i (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + disconnected_i (PROXY *proxy + TAO_ENV_ARG_DECL) { - this->collection_.disconnected (proxy, ACE_TRY_ENV); + this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER); } template<class PROXY, class C, class I,ACE_SYNCH_DECL> void TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>:: - shutdown_i (CORBA::Environment &ACE_TRY_ENV) + shutdown_i (TAO_ENV_SINGLE_ARG_DECL) { - this->collection_.shutdown (ACE_TRY_ENV); + this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp index 8f2a176d4ab..f481d4f1bac 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp @@ -16,11 +16,20 @@ ACE_RCSID(ESF, ESF_Delayed_Command, "$Id$") template<class Target, class Object> int TAO_ESF_Connected_Command<Target,Object>::execute (void* arg) { - CORBA::Environment *env = &TAO_default_environment (); if (arg != 0) - env = ACE_static_cast(CORBA::Environment*, arg); + { + TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = + *ACE_static_cast(CORBA::Environment*, arg)); + this->target_->connected_i (this->object_ + TAO_ENV_ARG_PARAMETER); + } + else + { + TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV); + this->target_->connected_i (this->object_ + TAO_ENV_ARG_PARAMETER); + } - this->target_->connected_i (this->object_, *env); return 0; } @@ -33,7 +42,19 @@ TAO_ESF_Reconnected_Command<Target,Object>::execute (void* arg) if (arg != 0) env = ACE_static_cast(CORBA::Environment*, arg); - this->target_->reconnected_i (this->object_, *env); + if (arg != 0) + { + TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = + *ACE_static_cast(CORBA::Environment*, arg)); + this->target_->reconnected_i (this->object_ + TAO_ENV_ARG_PARAMETER); + } + else + { + TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV); + this->target_->reconnected_i (this->object_ + TAO_ENV_ARG_PARAMETER); + } return 0; } @@ -42,11 +63,19 @@ TAO_ESF_Reconnected_Command<Target,Object>::execute (void* arg) template<class Target, class Object> int TAO_ESF_Disconnected_Command<Target,Object>::execute (void* arg) { - CORBA::Environment *env = &TAO_default_environment (); if (arg != 0) - env = ACE_static_cast(CORBA::Environment*, arg); - - this->target_->disconnected_i (this->object_, *env); + { + TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = + *ACE_static_cast(CORBA::Environment*, arg)); + this->target_->disconnected_i (this->object_ + TAO_ENV_ARG_PARAMETER); + } + else + { + TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV); + this->target_->disconnected_i (this->object_ + TAO_ENV_ARG_PARAMETER); + } return 0; } @@ -55,11 +84,17 @@ TAO_ESF_Disconnected_Command<Target,Object>::execute (void* arg) template<class Target> int TAO_ESF_Shutdown_Command<Target>::execute (void* arg) { - CORBA::Environment *env = &TAO_default_environment (); if (arg != 0) - env = ACE_static_cast(CORBA::Environment*, arg); - - this->target_->shutdown_i (*env); + { + TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = + *ACE_static_cast(CORBA::Environment*, arg)); + this->target_->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + } + else + { + TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV); + this->target_->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + } return 0; } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp index 9c4bc9459b0..2fc47be1f6c 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp @@ -30,15 +30,15 @@ TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>:: template<class PROXY, class C, class ITERATOR, class ACE_LOCK> void TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>:: - for_each (TAO_ESF_Worker<PROXY> *worker, - CORBA::Environment &ACE_TRY_ENV) + for_each (TAO_ESF_Worker<PROXY> *worker + TAO_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); ITERATOR end = this->collection_.end (); for (ITERATOR i = this->collection_.begin (); i != end; ++i) { - worker->work ((*i), ACE_TRY_ENV); + worker->work ((*i) TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h index 475565a37e0..db5b6b2563a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h @@ -32,15 +32,15 @@ public: TAO_ESF_Immediate_Changes (const COLLECTION &collection); // = The TAO_ESF_Proxy methods - virtual void for_each (TAO_ESF_Worker<PROXY> *worker, - CORBA::Environment &ACE_TRY_ENV); - virtual void connected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - virtual void reconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - virtual void disconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV); + virtual void for_each (TAO_ESF_Worker<PROXY> *worker + TAO_ENV_ARG_DECL); + virtual void connected (PROXY *proxy + TAO_ENV_ARG_DECL); + virtual void reconnected (PROXY *proxy + TAO_ENV_ARG_DECL); + virtual void disconnected (PROXY *proxy + TAO_ENV_ARG_DECL); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); private: COLLECTION collection_; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i index 3bb97da043b..21bf4981b67 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i @@ -2,41 +2,41 @@ template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: - connected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + connected (PROXY *proxy + TAO_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); proxy->_incr_refcnt (); - this->collection_.connected (proxy, ACE_TRY_ENV); + this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER); } template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: - reconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + reconnected (PROXY *proxy + TAO_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); proxy->_incr_refcnt (); - this->collection_.reconnected (proxy, ACE_TRY_ENV); + this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER); } template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: - disconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + disconnected (PROXY *proxy + TAO_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - this->collection_.disconnected (proxy, ACE_TRY_ENV); + this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER); } template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: - shutdown (CORBA::Environment &ACE_TRY_ENV) + shutdown (TAO_ENV_SINGLE_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - this->collection_.shutdown (ACE_TRY_ENV); + this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp index 56bbf4cb21d..21123fd2cd9 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp @@ -28,35 +28,35 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>:: template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>:: - peer_connected (PEER *peer, - CORBA::Environment &ACE_TRY_ENV) + peer_connected (PEER *peer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Connected<PROXY,PEER> worker (peer); - this->for_each (&worker, ACE_TRY_ENV); + this->for_each (&worker TAO_ENV_ARG_PARAMETER); } template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>:: - peer_reconnected (PEER *peer, - CORBA::Environment &ACE_TRY_ENV) + peer_reconnected (PEER *peer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Reconnected<PROXY,PEER> worker (peer); - this->for_each (&worker, ACE_TRY_ENV); + this->for_each (&worker TAO_ENV_ARG_PARAMETER); } template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>:: - peer_disconnected (PEER *peer, - CORBA::Environment &ACE_TRY_ENV) + peer_disconnected (PEER *peer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Disconnected<PROXY,PEER> worker (peer); - this->for_each (&worker, ACE_TRY_ENV); + this->for_each (&worker TAO_ENV_ARG_PARAMETER); } #endif /* TAO_ESF_PEER_ADMIN_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h index 39481c7def0..256e342e17a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h @@ -38,17 +38,17 @@ * the PROXY interface must implement: * * @verbatim - * void connected (PEER *peer, CORBA::Environment&) throw (); - * void reconnected (PEER *peer, CORBA::Environment&) throw (); - * void disconnected (PEER *peer, CORBA::Environment&) throw (); + * void connected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw (); + * void reconnected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw (); + * void disconnected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw (); * @endverbatim * * Similarly, the PEER interface must implement: * * @verbatim - * void connected (PROXY *proxy, CORBA::Environment&) throw (); - * void reconnected (PROXY *proxy, CORBA::Environment&) throw (); - * void disconnected (PROXY *proxy, CORBA::Environment&) throw (); + * void connected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw (); + * void reconnected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw (); + * void disconnected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw (); * @endverbatim */ template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> @@ -66,8 +66,8 @@ public: * has invoked the connect_xxx_yyy() method. * The default implementation is a no-op. */ - virtual void peer_connected (PEER *peer, - CORBA::Environment &ACE_TRY_ENV) + virtual void peer_connected (PEER *peer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -76,8 +76,8 @@ public: * The default implementation delegates on the collection * <reconnected> method */ - virtual void peer_reconnected (PEER *peer, - CORBA::Environment &ACE_TRY_ENV) + virtual void peer_reconnected (PEER *peer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -85,8 +85,8 @@ public: * removes the object from the collection and deactivates the * proxy. */ - virtual void peer_disconnected (PEER *peer, - CORBA::Environment &ACE_TRY_ENV) + virtual void peer_disconnected (PEER *peer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp index cd5c8ca1e8c..81f2ea5d27a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp @@ -12,39 +12,39 @@ ACE_RCSID(ESF, ESF_Peer_Workers, "$Id$") template<class P, class R> void -TAO_ESF_Peer_Connected<P,R>::work (P *proxy, - CORBA::Environment &ACE_TRY_ENV) +TAO_ESF_Peer_Connected<P,R>::work (P *proxy + TAO_ENV_ARG_DECL) { - proxy->connected (this->peer_, ACE_TRY_ENV); + proxy->connected (this->peer_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline - this->peer_->connected (proxy, ACE_TRY_ENV); + this->peer_->connected (proxy TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline } // **************************************************************** template<class P, class R> void -TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy, - CORBA::Environment &ACE_TRY_ENV) +TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy + TAO_ENV_ARG_DECL) { - proxy->reconnected (this->peer_, ACE_TRY_ENV); + proxy->reconnected (this->peer_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline - this->peer_->reconnected (proxy, ACE_TRY_ENV); + this->peer_->reconnected (proxy TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline } // **************************************************************** template<class P, class R> void -TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy, - CORBA::Environment &ACE_TRY_ENV) +TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy + TAO_ENV_ARG_DECL) { - proxy->disconnected (this->peer_, ACE_TRY_ENV); + proxy->disconnected (this->peer_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline - this->peer_->disconnected (proxy, ACE_TRY_ENV); + this->peer_->disconnected (proxy TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h index 503f9ba2439..e69984da721 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h @@ -32,8 +32,8 @@ class TAO_ESF_Peer_Connected : public TAO_ESF_Worker<PROXY> public: TAO_ESF_Peer_Connected (PEER *peer); - void work (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); + void work (PROXY *proxy + TAO_ENV_ARG_DECL); private: PEER* peer_; @@ -55,8 +55,8 @@ class TAO_ESF_Peer_Reconnected : public TAO_ESF_Worker<PROXY> public: TAO_ESF_Peer_Reconnected (PEER *peer); - void work (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); + void work (PROXY *proxy + TAO_ENV_ARG_DECL); private: PEER* peer_; @@ -78,8 +78,8 @@ class TAO_ESF_Peer_Disconnected : public TAO_ESF_Worker<PROXY> public: TAO_ESF_Peer_Disconnected (PEER *peer); - void work (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); + void work (PROXY *proxy + TAO_ENV_ARG_DECL); private: PEER* peer_; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp index b96c8769d00..062b06869aa 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp @@ -30,7 +30,7 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: template<class EVENT_CHANNEL, class PROXY, class INTERFACE> INTERFACE* TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: - obtain (CORBA::Environment &ACE_TRY_ENV) + obtain (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { PROXY* proxy; @@ -39,10 +39,10 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: PortableServer::ServantBase_var holder = proxy; ACE_TYPENAME PROXY::_var_type result = - proxy->activate (ACE_TRY_ENV); + proxy->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (INTERFACE::_nil ()); - this->collection_->connected (proxy, ACE_TRY_ENV); + this->collection_->connected (proxy TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (INTERFACE::_nil ()); return result._retn (); @@ -50,46 +50,46 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: - shutdown (CORBA::Environment &ACE_TRY_ENV) + shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Shutdown_Proxy<PROXY> worker; - this->collection_->for_each (&worker, ACE_TRY_ENV); + this->collection_->for_each (&worker TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Cannot happen, just following the discipline. - this->collection_->shutdown (ACE_TRY_ENV); + this->collection_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: - connected (PROXY *, - CORBA::Environment &) + connected (PROXY * + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: - reconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + reconnected (PROXY *proxy + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->collection_->reconnected (proxy, ACE_TRY_ENV); + this->collection_->reconnected (proxy TAO_ENV_ARG_PARAMETER); } template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: - disconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + disconnected (PROXY *proxy + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - proxy->deactivate (ACE_TRY_ENV); + proxy->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Cannot happen, just following the discipline. ACE_TRY { - this->collection_->disconnected (proxy, ACE_TRY_ENV); + this->collection_->disconnected (proxy TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h index 05308f22fbd..a76275f083b 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h @@ -53,7 +53,7 @@ * // The T_var for the IDL interface implemented by the PROXY. * * PROXY::_ptr_type - * PROXY::activate (CORBA::Environment &) throw (); + * PROXY::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) throw (); * // activate the proxy and return the object reference * @endverbatim * @@ -69,8 +69,8 @@ public: virtual ~TAO_ESF_Proxy_Admin (void); /// Iterate over its internal collection. - void for_each (TAO_ESF_Worker<PROXY> *worker, - CORBA::Environment &ACE_TRY_ENV) + void for_each (TAO_ESF_Worker<PROXY> *worker + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // @TODO We should use INTERFACE::_ptr_type or PROXY::_ptr_type, but @@ -80,7 +80,7 @@ public: // code is supposed to run under TAO only. /// Create a new PROXY and activate it. virtual INTERFACE* - obtain (CORBA::Environment &) + obtain (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -88,7 +88,7 @@ public: * down. Invoke <shutdown> on all the proxies, cleanup the * collection and prepare to terminate. */ - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -96,8 +96,8 @@ public: * has invoked the connect_xxx_yyy() method. * The default implementation is a no-op. */ - virtual void connected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + virtual void connected (PROXY *proxy + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -106,8 +106,8 @@ public: * The default implementation delegates on the collection * <reconnected> method */ - virtual void reconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + virtual void reconnected (PROXY *proxy + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -115,8 +115,8 @@ public: * removes the object from the collection and deactivates the * proxy. */ - virtual void disconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) + virtual void disconnected (PROXY *proxy + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i index fbb3c9fe06f..be00cdad82e 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i @@ -2,9 +2,9 @@ template<class EC,class P,class I> ACE_INLINE void TAO_ESF_Proxy_Admin<EC,P,I>:: - for_each (TAO_ESF_Worker<P> *worker, - CORBA::Environment &ACE_TRY_ENV) + for_each (TAO_ESF_Worker<P> *worker + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->collection_->for_each (worker, ACE_TRY_ENV); + this->collection_->for_each (worker TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h index a7e61a655bf..b04cbe9f3b7 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h @@ -128,13 +128,13 @@ public: * member of the collection. * This encapsulates */ - virtual void for_each (TAO_ESF_Worker<PROXY> *worker, - CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void for_each (TAO_ESF_Worker<PROXY> *worker + TAO_ENV_ARG_DECL) = 0; /// Insert a new element into the collection. The collection assumes /// ownership of the element. - virtual void connected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void connected (PROXY *proxy + TAO_ENV_ARG_DECL) = 0; /** * Insert an element into the collection. No errors can be raised @@ -143,15 +143,15 @@ public: * <proxy->_decr_refcnt()> if the element is already present in the * collection. */ - virtual void reconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void reconnected (PROXY *proxy + TAO_ENV_ARG_DECL) = 0; /// Remove an element from the collection. - virtual void disconnected (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void disconnected (PROXY *proxy + TAO_ENV_ARG_DECL) = 0; /// The EC is shutting down, must release all the elements. - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0; }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp index f1244c91cca..e871ce15a7d 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp @@ -18,8 +18,8 @@ TAO_ESF_Proxy_List<PROXY>:: } template<class PROXY> void -TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy, - CORBA::Environment &) +TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy + TAO_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.insert (proxy); if (r == 0) @@ -39,8 +39,8 @@ TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy, } template<class PROXY> void -TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy, - CORBA::Environment &) +TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy + TAO_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.insert (proxy); if (r == 0) @@ -64,8 +64,8 @@ TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy, } template<class PROXY> void -TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy, - CORBA::Environment &) +TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy + TAO_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.remove (proxy); if (r != 0) @@ -78,7 +78,7 @@ TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy, } template<class PROXY> void -TAO_ESF_Proxy_List<PROXY>::shutdown (CORBA::Environment &) +TAO_ESF_Proxy_List<PROXY>::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { Iterator end = this->impl_.end (); for (Iterator i = this->impl_.begin (); i != end; ++i) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h index f32185095cc..85d6d3f9914 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h @@ -49,20 +49,20 @@ public: size_t size (void) const; /// Insert a new element to the collection - void connected (PROXY *, - CORBA::Environment &); + void connected (PROXY * + TAO_ENV_ARG_DECL_NOT_USED); /// Insert a new element that could be there already. - void reconnected (PROXY *, - CORBA::Environment &); + void reconnected (PROXY * + TAO_ENV_ARG_DECL_NOT_USED); /// Remove an element from the collection - void disconnected (PROXY *, - CORBA::Environment &); + void disconnected (PROXY * + TAO_ENV_ARG_DECL_NOT_USED); /// Shutdown the collection, i.e. remove all elements and release /// resources - void shutdown (CORBA::Environment &); + void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); private: /// The underlying implementation object diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp index eac949f1ebb..002cc934635 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp @@ -18,8 +18,8 @@ TAO_ESF_Proxy_RB_Tree<PROXY>:: } template<class PROXY> void -TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy, - CORBA::Environment &) +TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy + TAO_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.bind (proxy, 1); if (r == 0) @@ -39,8 +39,8 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy, } template<class PROXY> void -TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy, - CORBA::Environment &) +TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy + TAO_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.rebind (proxy, 1); if (r == 0) @@ -62,8 +62,8 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy, } template<class PROXY> void -TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy, - CORBA::Environment &) +TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy + TAO_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.unbind (proxy); if (r != 0) @@ -76,7 +76,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy, } template<class PROXY> void -TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (CORBA::Environment &) +TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { Iterator end = this->impl_.end (); for (Iterator i = this->impl_.begin (); i != end; ++i) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h index 7e24374b339..c957b46209a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h @@ -73,19 +73,19 @@ public: size_t size (void) const; /// Insert a new element to the collection - void connected (PROXY *, - CORBA::Environment &); + void connected (PROXY * + TAO_ENV_ARG_DECL_NOT_USED); /// Insert a new element that could be there already. - void reconnected (PROXY *, - CORBA::Environment &); + void reconnected (PROXY * + TAO_ENV_ARG_DECL_NOT_USED); /// Remove an element from the collection - void disconnected (PROXY *, - CORBA::Environment &); + void disconnected (PROXY * + TAO_ENV_ARG_DECL_NOT_USED); /// Shutdown the collection, i.e. remove all elements and release /// resources - void shutdown (CORBA::Environment &); + void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); private: /// The underlying implementation object diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp index 628710224a9..21627fef89f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp @@ -12,12 +12,12 @@ ACE_RCSID(ESF, ESF_Shutdown_Proxy, "$Id$") template<class PROXY> void -TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV) +TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy + TAO_ENV_ARG_DECL) { ACE_TRY { - proxy->shutdown (ACE_TRY_ENV); + proxy->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h index e43728c04f0..69b3de4dc73 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h @@ -26,8 +26,8 @@ class TAO_ESF_Shutdown_Proxy : public TAO_ESF_Worker<PROXY> public: TAO_ESF_Shutdown_Proxy (void); - void work (PROXY *proxy, - CORBA::Environment &ACE_TRY_ENV); + void work (PROXY *proxy + TAO_ENV_ARG_DECL); }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h index 06e766a48e6..c555be82e53 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h @@ -34,8 +34,8 @@ public: virtual ~TAO_ESF_Worker (void); /// Callback interface. - virtual void work (Object *object, - CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void work (Object *object + TAO_ENV_ARG_DECL) = 0; }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp index 31dc9458716..62f0d7a8402 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp @@ -13,7 +13,9 @@ #include "tao/Timeprobe.h" -ACE_RCSID(Event, Dispatching_Modules, "$Id$") +ACE_RCSID (Event, + Dispatching_Modules, + "$Id$") #if defined (ACE_ENABLE_TIMEPROBES) @@ -150,11 +152,11 @@ int ACE_ES_Dispatching_Base::dispatch_event (ACE_ES_Dispatch_Request *request, u_long &command_action) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Forward the request. - up_->push (request, ACE_TRY_ENV); + up_->push (request TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -238,10 +240,10 @@ ACE_ES_Priority_Dispatching::initialize_queues (void) } void -ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &ACE_TRY_ENV) +ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL) { - down_->connected (consumer, ACE_TRY_ENV); + down_->connected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; // This code does dynamic allocation of channel dispatch threads. @@ -253,7 +255,7 @@ ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer, // We have to tell the lower portions of the channel about the // consumer first. This is so that any changes to the consumer's // qos will take effect when we get the dispatch priority. - down_->connected (consumer, ACE_TRY_ENV); + down_->connected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::OS_Priority priority = @@ -335,8 +337,8 @@ ACE_ES_Priority_Dispatching::disconnected (ACE_Push_Consumer_Proxy *consumer) // @@ This method could have a bypass optimization. // <request> has been dynamically allocated by the filtering module. void -ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request, - CORBA::Environment &ACE_TRY_ENV) +ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request + TAO_ENV_ARG_DECL) { ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PUSH_SOURCE_TYPE_CORRELATION_MODULE); @@ -352,15 +354,15 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request, (request->rt_info (), thread_priority, subpriority, - preemption_priority, - ACE_TRY_ENV); + preemption_priority + TAO_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server ()->priority (request->rt_info (), thread_priority, subpriority, - preemption_priority, - ACE_TRY_ENV); + preemption_priority + TAO_ENV_ARG_PARAMETER); #endif ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PRIORITY_DISPATCHING_PUSH_PRIORITY_OBTAINED); ACE_CHECK; @@ -617,7 +619,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, "ACE_ES_Dispatch_Queue::open_queue"), -1); case 0: { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY {// @@ TODO: Handle exceptions... #if 1 @@ -631,8 +633,8 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, RtecScheduler::VERY_LOW_IMPORTANCE, ORBSVCS_Time::zero (), 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->set (rt_info_, RtecScheduler::VERY_HIGH_CRITICALITY, @@ -643,8 +645,8 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, RtecScheduler::VERY_LOW_IMPORTANCE, ORBSVCS_Time::zero (), 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -683,8 +685,8 @@ ACE_ES_EFD_Dispatching::ACE_ES_EFD_Dispatching (ACE_EventChannel *channel) } void -ACE_ES_EFD_Dispatching::push (ACE_ES_Dispatch_Request *request, - CORBA::Environment &) +ACE_ES_EFD_Dispatching::push (ACE_ES_Dispatch_Request *request + TAO_ENV_ARG_DECL_NOT_USED) { // If it's a request to forward an event, it needs a reference to us // to call dispatch_event. @@ -725,11 +727,11 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request, // Store the priority of the task currently running. channel_->rtu_manager ()->priority (request->priority ()); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Forward the request. - up_->push (request, ACE_TRY_ENV); + up_->push (request TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -756,11 +758,11 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request, } void -ACE_ES_RTU_Dispatching::push (ACE_ES_Dispatch_Request *request, - CORBA::Environment &ACE_TRY_ENV) +ACE_ES_RTU_Dispatching::push (ACE_ES_Dispatch_Request *request + TAO_ENV_ARG_DECL) { // First enqueue the message in the proper queue. - ACE_ES_Priority_Dispatching::push (request, ACE_TRY_ENV); + ACE_ES_Priority_Dispatching::push (request TAO_ENV_ARG_PARAMETER); ACE_CHECK; // If the current event is higher priority (lower value) than the diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h index b83756c24da..62b61a57e75 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h @@ -62,12 +62,12 @@ public: ACE_ES_Correlation_Module *down); // Link to adjacent modules. - virtual void connected (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &); + virtual void connected (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL_NOT_USED); // Forward down_. - virtual void disconnecting (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &); + virtual void disconnecting (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL_NOT_USED); // Forward down_. virtual void disconnected (ACE_Push_Consumer_Proxy *consumer); @@ -77,8 +77,8 @@ public: // void connected (ACE_Push_Supplier_Proxy *supplier); // void disconnecting (ACE_Push_Supplier_Proxy *supplier); - virtual void push (ACE_ES_Dispatch_Request *request, - CORBA::Environment &) = 0; + virtual void push (ACE_ES_Dispatch_Request *request + TAO_ENV_ARG_DECL_NOT_USED) = 0; // Forward up_. virtual int dispatch_event (ACE_ES_Dispatch_Request *request, @@ -384,8 +384,8 @@ public: ~ACE_ES_Priority_Dispatching (void); // Delete queues. - void connected (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &); + void connected (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL_NOT_USED); // Allocate any needed dispatching resources for this consumers // priority. @@ -396,8 +396,8 @@ public: // void connected (ACE_Push_Supplier_Proxy *supplier); // void disconnecting (ACE_Push_Supplier_Proxy *supplier); - virtual void push (ACE_ES_Dispatch_Request *request, - CORBA::Environment &); + virtual void push (ACE_ES_Dispatch_Request *request + TAO_ENV_ARG_DECL_NOT_USED); // Enqueues the request on the appropriate Dispatch Queue. virtual void activate (int threads_per_queue); @@ -469,8 +469,8 @@ public: // Acquires the proper qos structure and passes <channel> onto to // the dispatching base constructor. - virtual void push (ACE_ES_Dispatch_Request *request, - CORBA::Environment &); + virtual void push (ACE_ES_Dispatch_Request *request + TAO_ENV_ARG_DECL_NOT_USED); // Forward up_. }; @@ -493,8 +493,8 @@ public: // needs to be dequeued. Implements an RTU-like delayed preemption // policy. - virtual void push (ACE_ES_Dispatch_Request *request, - CORBA::Environment &); + virtual void push (ACE_ES_Dispatch_Request *request + TAO_ENV_ARG_DECL_NOT_USED); // Calls ACE_ES_Priority_Dispatching::push and then checks if // preemption is necessary. }; diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i index fd86083a7f0..cc6c5d64243 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i @@ -19,7 +19,7 @@ ACE_ES_Dispatch_Request::~ACE_ES_Dispatch_Request (void) ACE_INLINE ACE_ES_Dispatch_Request:: -ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, +ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, RtecScheduler::handle_t rt_info) : priority_ (0), rt_info_ (rt_info), @@ -48,8 +48,8 @@ ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, #if 0 ACE_INLINE ACE_ES_Dispatch_Request::ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, - ACE_ES_Event_Container *event, - RtecScheduler::handle_t rt_info) : + ACE_ES_Event_Container *event, + RtecScheduler::handle_t rt_info) : priority_ (0), rt_info_ (rt_info), dispatching_module_ (0), @@ -78,7 +78,7 @@ ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, RtecEventComm::Event tmp; tmp.header.creation_time = time; tmp.header.type = ACE_ES_EVENT_TIMEOUT; - TAO_EC_Event_Set* set = + TAO_EC_Event_Set* set = TAO_EC_Event_Set::_create (tmp); this->single_event_ = TAO_EC_Event (set, set->length ()); @@ -87,8 +87,8 @@ ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, ACE_INLINE void ACE_ES_Dispatch_Request::set (ACE_ES_Dispatching_Base *dispatching_module, - RtecScheduler::OS_Priority preemption_priority, - RtecScheduler::Preemption_Subpriority_t sub_priority) + RtecScheduler::OS_Priority preemption_priority, + RtecScheduler::Preemption_Subpriority_t sub_priority) { dispatching_module_ = dispatching_module; priority_ = preemption_priority; @@ -147,21 +147,21 @@ ACE_ES_Dispatching_Base::ACE_ES_Dispatching_Base (ACE_EventChannel *channel) ACE_INLINE void ACE_ES_Dispatching_Base::open (ACE_ES_Consumer_Module *up, - ACE_ES_Correlation_Module *down) + ACE_ES_Correlation_Module *down) { up_ = up; down_ = down; // 1 == 2. } -ACE_INLINE void -ACE_ES_Dispatching_Base::connected (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &_env) +ACE_INLINE void +ACE_ES_Dispatching_Base::connected (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL) { - down_->connected (consumer, _env); + down_->connected (consumer TAO_ENV_ARG_PARAMETER); } -ACE_INLINE void +ACE_INLINE void ACE_ES_Dispatching_Base::disconnected (ACE_Push_Consumer_Proxy *consumer) { // Do nothing. @@ -169,10 +169,10 @@ ACE_ES_Dispatching_Base::disconnected (ACE_Push_Consumer_Proxy *consumer) } ACE_INLINE void -ACE_ES_Dispatching_Base::disconnecting (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &_env) +ACE_ES_Dispatching_Base::disconnecting (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL) { - down_->disconnecting (consumer, _env); + down_->disconnecting (consumer TAO_ENV_ARG_PARAMETER); } ACE_INLINE void @@ -186,7 +186,7 @@ ACE_ES_Dispatching_Base::dispatch_queue_closed (ACE_ES_Dispatch_Queue *q) #if defined (ACE_WIN32) ACE_INLINE ACE_ES_ReactorEx_NS::ACE_ES_ReactorEx_NS (ACE_Event_Handler *eh, - TAO_EC_Timer_Module* tm) + TAO_EC_Timer_Module* tm) : ACE_Notification_Strategy (eh, ACE_Event_Handler::NULL_MASK), timer_module_ (tm) { @@ -196,28 +196,28 @@ ACE_INLINE int ACE_ES_ReactorEx_NS::open (void) { return this->timer_module_->register_handler (0, - eh_, - event_.handle ()); + eh_, + event_.handle ()); } ACE_INLINE void ACE_ES_ReactorEx_NS::shutdown (void) { // @@ TODO: Fix this. -// this->timer_module_->remove_handler (0, -// eh_, -// ACE_Event_Handler::DONT_CALL); +// this->timer_module_->remove_handler (0, +// eh_, +// ACE_Event_Handler::DONT_CALL); } -ACE_INLINE int +ACE_INLINE int ACE_ES_ReactorEx_NS::notify (void) { return this->event_.signal (); } -ACE_INLINE int +ACE_INLINE int ACE_ES_ReactorEx_NS::notify (ACE_Event_Handler *, - ACE_Reactor_Mask) + ACE_Reactor_Mask) { return this->event_.signal (); } @@ -226,9 +226,9 @@ ACE_ES_ReactorEx_NS::notify (ACE_Event_Handler *, // This class is only necessary on non-win32 platforms. ACE_INLINE ACE_ES_Reactor_NS::ACE_ES_Reactor_NS (ACE_Event_Handler *eh, - TAO_EC_Timer_Module *tm) + TAO_EC_Timer_Module *tm) : ACE_Reactor_Notification_Strategy (tm->reactor (0), - eh, ACE_Event_Handler::READ_MASK) + eh, ACE_Event_Handler::READ_MASK) { } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 8efc4b7a5d7..ac198817c3c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -26,8 +26,8 @@ TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void) // @@ TODO Why have a return code *and* exceptions? Only one would do! int -TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment& ACE_TRY_ENV) +TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { // @@ TODO Think about the exception safety (or lack thereof) of // this code, what if the following operations fail? @@ -42,13 +42,13 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec, // its lifetime. RtecEventChannelAdmin::Observer_var obs = - this->observer_._this (ACE_TRY_ENV); + this->observer_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_TRY { this->handle_ = - this->ec_->append_observer (obs.in (), ACE_TRY_ENV); + this->ec_->append_observer (obs.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } ACE_CATCH(CORBA::SystemException, ex) @@ -58,12 +58,12 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec, // we should encapsulate it in a Deactivator. PortableServer::POA_var poa = - this->observer_._default_POA (ACE_TRY_ENV); + this->observer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->observer_, ACE_TRY_ENV); + poa->servant_to_id (&this->observer_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_RE_THROW; @@ -75,26 +75,26 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec, } int -TAO_ECG_Mcast_EH::close (CORBA::Environment& ACE_TRY_ENV) +TAO_ECG_Mcast_EH::close (TAO_ENV_SINGLE_ARG_DECL) { if (this->handle_ == 0) return 0; RtecEventChannelAdmin::Observer_Handle h = this->handle_; this->handle_ = 0; - this->ec_->remove_observer (h, ACE_TRY_ENV); + this->ec_->remove_observer (h TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // @@ TODO If the first operation raises an exception then the // second one never executes!!! { PortableServer::POA_var poa = - this->observer_._default_POA (ACE_TRY_ENV); + this->observer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->observer_, ACE_TRY_ENV); + poa->servant_to_id (&this->observer_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -141,8 +141,8 @@ TAO_ECG_Mcast_EH::handle_input (ACE_HANDLE fd) void TAO_ECG_Mcast_EH::compute_required_subscriptions ( const RtecEventChannelAdmin::ConsumerQOS& sub, - Address_Set& multicast_addresses, - CORBA::Environment& ACE_TRY_ENV) + Address_Set& multicast_addresses + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong count = sub.dependencies.length (); @@ -168,7 +168,7 @@ TAO_ECG_Mcast_EH::compute_required_subscriptions ( // opportunity to recover it. // + Close the MCast Event Handler completely, too much policy // for this level. - this->receiver_->get_addr (header, addr, ACE_TRY_ENV); + this->receiver_->get_addr (header, addr TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_INET_Addr inet_addr (addr.port, addr.ipaddr); @@ -296,8 +296,8 @@ TAO_ECG_Mcast_EH::add_new_subscriptions ( void TAO_ECG_Mcast_EH::update_consumer ( - const RtecEventChannelAdmin::ConsumerQOS& sub, - CORBA::Environment& ACE_TRY_ENV) + const RtecEventChannelAdmin::ConsumerQOS& sub + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ TODO This function turned out to be too long, we need to break @@ -308,7 +308,7 @@ TAO_ECG_Mcast_EH::update_consumer ( Address_Set multicast_addresses; - this->compute_required_subscriptions (sub, multicast_addresses, ACE_TRY_ENV); + this->compute_required_subscriptions (sub, multicast_addresses TAO_ENV_ARG_PARAMETER); ACE_CHECK; // 2) To conserve OS and network resources we first unsubscribe from @@ -326,8 +326,8 @@ TAO_ECG_Mcast_EH::update_consumer ( } void -TAO_ECG_Mcast_EH::update_supplier (const RtecEventChannelAdmin::SupplierQOS&, - CORBA::Environment&) +TAO_ECG_Mcast_EH::update_supplier (const RtecEventChannelAdmin::SupplierQOS& + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -342,20 +342,20 @@ TAO_ECG_Mcast_EH::Observer::Observer (TAO_ECG_Mcast_EH* eh) void TAO_ECG_Mcast_EH::Observer::update_consumer ( - const RtecEventChannelAdmin::ConsumerQOS& sub, - CORBA::Environment& ACE_TRY_ENV) + const RtecEventChannelAdmin::ConsumerQOS& sub + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->eh_->update_consumer (sub, ACE_TRY_ENV); + this->eh_->update_consumer (sub TAO_ENV_ARG_PARAMETER); } void TAO_ECG_Mcast_EH::Observer::update_supplier ( - const RtecEventChannelAdmin::SupplierQOS& pub, - CORBA::Environment& ACE_TRY_ENV) + const RtecEventChannelAdmin::SupplierQOS& pub + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->eh_->update_supplier (pub, ACE_TRY_ENV); + this->eh_->update_supplier (pub TAO_ENV_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index 3bb1a708476..a4f52be104d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -58,25 +58,25 @@ public: * types and mcast groups) and the class registers itself with the * reactor. */ - int open (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &env = TAO_default_environment ()); + int open (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /** * Remove ourselves from the event channel, unsubscribe from the * multicast groups, close the sockets and unsubscribe from the * reactor. */ - int close (CORBA::Environment &env = TAO_default_environment ()); + int close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Reactor callbacks virtual int handle_input (ACE_HANDLE fd); /// The Observer methods - void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub, - CORBA::Environment &env = TAO_default_environment ()) + void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub, - CORBA::Environment &env = TAO_default_environment ()) + void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -99,14 +99,12 @@ public: // The Observer methods virtual void update_consumer ( - const RtecEventChannelAdmin::ConsumerQOS& sub, - CORBA::Environment &env = - TAO_default_environment ()) + const RtecEventChannelAdmin::ConsumerQOS& sub + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void update_supplier ( - const RtecEventChannelAdmin::SupplierQOS& pub, - CORBA::Environment &env = - TAO_default_environment ()) + const RtecEventChannelAdmin::SupplierQOS& pub + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -135,8 +133,8 @@ private: void compute_required_subscriptions ( const RtecEventChannelAdmin::ConsumerQOS& sub, - Address_Set& multicast_addresses, - CORBA::Environment &ACE_TRY_ENV) + Address_Set& multicast_addresses + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Delete the list of multicast addresses that we need not diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp index 91fe077246f..7efa43f67b9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp @@ -58,13 +58,13 @@ TAO_EC_And_Filter::size (void) const int TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter (event, qos_info, ACE_TRY_ENV); + int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n == 0) return 0; @@ -73,7 +73,7 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event, // All children accepted the event, push up... if (this->parent () != 0) { - this->parent ()->push (event, qos_info, ACE_TRY_ENV); + this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -82,13 +82,13 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter_nocopy (event, qos_info, ACE_TRY_ENV); + int n = (*i)->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n == 0) return 0; @@ -97,7 +97,7 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event, // All children accepted the event, push up... if (this->parent () != 0) { - this->parent ()->push (event, qos_info, ACE_TRY_ENV); + this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -106,15 +106,15 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_And_Filter::push (const RtecEventComm::EventSet&, - TAO_EC_QOS_Info&, - CORBA::Environment&) + TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_And_Filter::push_nocopy (RtecEventComm::EventSet&, - TAO_EC_QOS_Info& , - CORBA::Environment&) + TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL_NOT_USED) { } @@ -164,8 +164,8 @@ TAO_EC_And_Filter::can_match ( int TAO_EC_And_Filter::add_dependencies ( const RtecEventComm::EventHeader&, - const TAO_EC_QOS_Info&, - CORBA::Environment &) + const TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h index 9457729412e..cd510858f4e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h @@ -50,23 +50,23 @@ public: virtual ChildrenIterator end (void) const; virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV); + const TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL); typedef unsigned int Word; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index fc1ad7f3432..5725d9bf671 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -24,8 +24,8 @@ TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder (void) TAO_EC_Filter* TAO_EC_Basic_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *supplier, - RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment&) const + RtecEventChannelAdmin::ConsumerQOS& qos + TAO_ENV_ARG_DECL_NOT_USED) const { CORBA::ULong pos = 0; return this->recursive_build (supplier, qos, pos); @@ -74,7 +74,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build ( { pos++; // Consume the designator CORBA::ULong n = this->count_children (qos, pos); - + TAO_EC_Filter** children; ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0); CORBA::ULong i = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h index 36f12e666de..38d4c5fb386 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h @@ -46,8 +46,8 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, - RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment &env) const; + RtecEventChannelAdmin::ConsumerQOS& qos + TAO_ENV_ARG_DECL) const; private: /// Recursively build the filter tree. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp index 581d285bb88..c958f40e5e5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp @@ -44,8 +44,8 @@ TAO_EC_Bitmask_Filter::size (void) const int TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { if (event.length () != 1) return 0; @@ -54,13 +54,13 @@ TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event, || (event[0].header.source & this->source_mask_) == 0) return 0; - return this->child_->filter (event, qos_info, ACE_TRY_ENV); + return this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); } int TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { if (event.length () != 1) return 0; @@ -69,25 +69,25 @@ TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event, || (event[0].header.source & this->source_mask_) == 0) return 0; - return this->child_->filter_nocopy (event, qos_info, ACE_TRY_ENV); + return this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); } void TAO_EC_Bitmask_Filter::push (const RtecEventComm::EventSet &event, - TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info, ACE_TRY_ENV); + this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); } void TAO_EC_Bitmask_Filter::push_nocopy (RtecEventComm::EventSet &event, - TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV); + this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); } void @@ -116,8 +116,8 @@ TAO_EC_Bitmask_Filter::can_match ( int TAO_EC_Bitmask_Filter::add_dependencies ( const RtecEventComm::EventHeader&, - const TAO_EC_QOS_Info &, - CORBA::Environment &) + const TAO_EC_QOS_Info & + TAO_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h index d61d5423a5f..69984a309ef 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h @@ -67,23 +67,23 @@ public: virtual ChildrenIterator end (void) const; virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV); + const TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Bitmask_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp index c4e7e348065..bc5b04a77c1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp @@ -82,15 +82,15 @@ TAO_EC_Conjunction_Filter::size (void) const int TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (this->current_child_ = this->begin (); this->current_child_ != end; ++this->current_child_) { - int n = (*this->current_child_)->filter (event, qos_info, ACE_TRY_ENV); + int n = (*this->current_child_)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -100,15 +100,15 @@ TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter_nocopy (event, qos_info, ACE_TRY_ENV); + int n = (*i)->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -118,8 +118,8 @@ TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { CORBA::Long pos = this->current_child_ - this->begin (); int w = pos / bits_per_word; @@ -135,15 +135,15 @@ TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event, this->event_[l + i] = event[i]; } if (this->all_received () && this->parent () != 0) - this->parent ()->push_nocopy (this->event_, qos_info, ACE_TRY_ENV); + this->parent ()->push_nocopy (this->event_, qos_info TAO_ENV_ARG_PARAMETER); } void TAO_EC_Conjunction_Filter::push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { - this->push (event, qos_info, ACE_TRY_ENV); + this->push (event, qos_info TAO_ENV_ARG_PARAMETER); } void @@ -202,8 +202,8 @@ TAO_EC_Conjunction_Filter::can_match ( int TAO_EC_Conjunction_Filter::add_dependencies ( const RtecEventComm::EventHeader&, - const TAO_EC_QOS_Info&, - CORBA::Environment &) + const TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h index cd0f95e0f28..bf49e8a52e3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h @@ -52,23 +52,23 @@ public: virtual ChildrenIterator end (void) const; virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV); + const TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL); typedef unsigned int Word; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index 4e07e5f77ca..ddcfd4faa5f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -26,14 +26,14 @@ TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void) } RtecEventChannelAdmin::ProxyPushSupplier_ptr -TAO_EC_ConsumerAdmin::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ConsumerAdmin::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obtain (ACE_TRY_ENV); + return this->obtain (TAO_ENV_SINGLE_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_EC_ConsumerAdmin::_default_POA (CORBA::Environment&) +TAO_EC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h index 6fd0c393669..cac71634fde 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h @@ -60,11 +60,11 @@ public: // = The RtecEventChannelAdmin::ConsumerAdmin methods... virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (CORBA::Environment &) + obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); private: /// Store the default POA. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp index 757c3b65672..654bb82e8e8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp @@ -29,15 +29,15 @@ TAO_EC_ConsumerControl::shutdown (void) } void -TAO_EC_ConsumerControl::consumer_not_exist (TAO_EC_ProxyPushSupplier *, - CORBA::Environment &) +TAO_EC_ConsumerControl::consumer_not_exist (TAO_EC_ProxyPushSupplier * + TAO_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ConsumerControl::system_exception (TAO_EC_ProxyPushSupplier *, - CORBA::SystemException &, - CORBA::Environment &) + CORBA::SystemException & + TAO_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h index d3283c498a4..1af9cbbfe63 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h @@ -55,13 +55,13 @@ public: * has been destroyed. The strategy has to (at the very least), * reclaim all the resources attached to that object. */ - virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy, - CORBA::Environment &); + virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy + TAO_ENV_ARG_DECL_NOT_USED); /// Some system exception was rasied while trying to push an event. virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy, - CORBA::SystemException &, - CORBA::Environment &); + CORBA::SystemException & + TAO_ENV_ARG_DECL_NOT_USED); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp index 588908c50f5..dce14cd6423 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp @@ -58,15 +58,15 @@ TAO_EC_Disjunction_Filter::size (void) const int TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter (event, qos_info, ACE_TRY_ENV); + int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -76,15 +76,15 @@ TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter (event, qos_info, ACE_TRY_ENV); + int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -94,20 +94,20 @@ TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Disjunction_Filter::push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info, ACE_TRY_ENV); + this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); } void TAO_EC_Disjunction_Filter::push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV); + this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); } void @@ -156,8 +156,8 @@ TAO_EC_Disjunction_Filter::can_match ( int TAO_EC_Disjunction_Filter::add_dependencies ( const RtecEventComm::EventHeader&, - const TAO_EC_QOS_Info &, - CORBA::Environment &) + const TAO_EC_QOS_Info & + TAO_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h index b5391bd9283..02e2752af51 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h @@ -51,23 +51,23 @@ public: virtual ChildrenIterator end (void) const; virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV); + const TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Disjunction_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp index 95c8ad48f15..b1195799e0e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp @@ -33,18 +33,18 @@ void TAO_EC_Reactive_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info&, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL) { - proxy->reactive_push_to_consumer (consumer, event, ACE_TRY_ENV); + proxy->reactive_push_to_consumer (consumer, event TAO_ENV_ARG_PARAMETER); } void TAO_EC_Reactive_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, - TAO_EC_QOS_Info&, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL) { - proxy->reactive_push_to_consumer (consumer, event, ACE_TRY_ENV); + proxy->reactive_push_to_consumer (consumer, event TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h index 69c41ac6137..9ed29c5a12d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h @@ -63,13 +63,13 @@ public: virtual void push (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet &event, - TAO_EC_QOS_Info &qos_info, - CORBA::Environment &env = TAO_default_environment ()) = 0; + TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet &event, - TAO_EC_QOS_Info &qos_info, - CORBA::Environment &env = TAO_default_environment ()) = 0; + TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; }; // **************************************************************** @@ -95,13 +95,13 @@ public: virtual void push (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet &event, - TAO_EC_QOS_Info &qos_info, - CORBA::Environment &env = TAO_default_environment ()); + TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL_WITH_DEFAULTS); virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet &event, - TAO_EC_QOS_Info &qos_info, - CORBA::Environment &env = TAO_default_environment ()); + TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL_WITH_DEFAULTS); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index 9ca2612815c..79303ce3ebb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -42,7 +42,7 @@ TAO_EC_Dispatching_Task::svc (void) continue; } - int result = command->execute (ACE_TRY_ENV); + int result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Message_Block::release (mb); @@ -63,8 +63,8 @@ TAO_EC_Dispatching_Task::svc (void) void TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, - RtecEventComm::EventSet& event, - CORBA::Environment &ACE_TRY_ENV) + RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL) { if (this->allocator_ == 0) this->allocator_ = ACE_Allocator::instance (); @@ -93,7 +93,7 @@ TAO_EC_Dispatch_Command::~TAO_EC_Dispatch_Command (void) // **************************************************************** int -TAO_EC_Shutdown_Task_Command::execute (CORBA::Environment&) +TAO_EC_Shutdown_Task_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return -1; } @@ -106,11 +106,11 @@ TAO_EC_Push_Command::~TAO_EC_Push_Command (void) } int -TAO_EC_Push_Command::execute (CORBA::Environment& ACE_TRY_ENV) +TAO_EC_Push_Command::execute (TAO_ENV_SINGLE_ARG_DECL) { this->proxy_->push_to_consumer (this->consumer_.in (), - this->event_, - ACE_TRY_ENV); + this->event_ + TAO_ENV_ARG_PARAMETER); return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index 5d2c9510957..dd2cd77fc51 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -58,8 +58,8 @@ public: virtual void push (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, - RtecEventComm::EventSet& event, - CORBA::Environment &env); + RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL); private: /// An per-task allocator @@ -88,7 +88,7 @@ public: virtual ~TAO_EC_Dispatch_Command (void); /// Command callback - virtual int execute (CORBA::Environment&) = 0; + virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) = 0; }; // **************************************************************** @@ -100,7 +100,7 @@ public: TAO_EC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0); /// Command callback - virtual int execute (CORBA::Environment&); + virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); }; // **************************************************************** @@ -119,7 +119,7 @@ public: virtual ~TAO_EC_Push_Command (void); /// Command callback - virtual int execute (CORBA::Environment&); + virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); private: /// The proxy diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp index 2ba48a02dca..94e1737e919 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp @@ -101,7 +101,7 @@ TAO_EC_Event_Channel::~TAO_EC_Event_Channel (void) } void -TAO_EC_Event_Channel::activate (CORBA::Environment&) +TAO_EC_Event_Channel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->dispatching_->activate (); this->timeout_generator_->activate (); @@ -110,7 +110,7 @@ TAO_EC_Event_Channel::activate (CORBA::Environment&) } void -TAO_EC_Event_Channel::shutdown (CORBA::Environment& ACE_TRY_ENV) +TAO_EC_Event_Channel::shutdown (TAO_ENV_SINGLE_ARG_DECL) { this->dispatching_->shutdown (); this->timeout_generator_->shutdown (); @@ -118,144 +118,144 @@ TAO_EC_Event_Channel::shutdown (CORBA::Environment& ACE_TRY_ENV) this->consumer_control_->shutdown (); PortableServer::POA_var consumer_poa = - this->consumer_admin_->_default_POA (ACE_TRY_ENV); + this->consumer_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (this->consumer_admin_, ACE_TRY_ENV); + consumer_poa->servant_to_id (this->consumer_admin_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_poa->deactivate_object (consumer_id.in (), ACE_TRY_ENV); + consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var supplier_poa = - this->supplier_admin_->_default_POA (ACE_TRY_ENV); + this->supplier_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var supplier_id = - supplier_poa->servant_to_id (this->supplier_admin_, ACE_TRY_ENV); + supplier_poa->servant_to_id (this->supplier_admin_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_poa->deactivate_object (supplier_id.in (), ACE_TRY_ENV); + supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->shutdown (ACE_TRY_ENV); + this->supplier_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->shutdown (ACE_TRY_ENV); + this->consumer_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushConsumer* consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL) { - this->consumer_admin_->peer_connected (consumer, ACE_TRY_ENV); + this->consumer_admin_->peer_connected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->connected (consumer, ACE_TRY_ENV); + this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (consumer, ACE_TRY_ENV); + this->observer_strategy_->connected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushConsumer* consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL) { - this->consumer_admin_->peer_reconnected (consumer, ACE_TRY_ENV); + this->consumer_admin_->peer_reconnected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->reconnected (consumer, ACE_TRY_ENV); + this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (consumer, ACE_TRY_ENV); + this->observer_strategy_->connected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushConsumer* consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL) { - this->consumer_admin_->peer_disconnected (consumer, ACE_TRY_ENV); + this->consumer_admin_->peer_disconnected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->disconnected (consumer, ACE_TRY_ENV); + this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->disconnected (consumer, ACE_TRY_ENV); + this->observer_strategy_->disconnected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL) { - this->supplier_admin_->peer_connected (supplier, ACE_TRY_ENV); + this->supplier_admin_->peer_connected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->connected (supplier, ACE_TRY_ENV); + this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (supplier, ACE_TRY_ENV); + this->observer_strategy_->connected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL) { - this->supplier_admin_->peer_reconnected (supplier, ACE_TRY_ENV); + this->supplier_admin_->peer_reconnected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->reconnected (supplier, ACE_TRY_ENV); + this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (supplier, ACE_TRY_ENV); + this->observer_strategy_->connected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL) { - this->supplier_admin_->peer_disconnected (supplier, ACE_TRY_ENV); + this->supplier_admin_->peer_disconnected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->disconnected (supplier, ACE_TRY_ENV); + this->consumer_admin_->disconnected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->disconnected (supplier, ACE_TRY_ENV); + this->observer_strategy_->disconnected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; } RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_EC_Event_Channel::for_consumers (CORBA::Environment& ACE_TRY_ENV) +TAO_EC_Event_Channel::for_consumers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->consumer_admin_->_this (ACE_TRY_ENV); + return this->consumer_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } RtecEventChannelAdmin::SupplierAdmin_ptr -TAO_EC_Event_Channel::for_suppliers (CORBA::Environment& ACE_TRY_ENV) +TAO_EC_Event_Channel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->supplier_admin_->_this (ACE_TRY_ENV); + return this->supplier_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_EC_Event_Channel::destroy (CORBA::Environment &TAO_TRY_ENV) +TAO_EC_Event_Channel::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->shutdown (TAO_TRY_ENV); + this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } RtecEventChannelAdmin::Observer_Handle TAO_EC_Event_Channel::append_observer ( - RtecEventChannelAdmin::Observer_ptr observer, - CORBA::Environment &ACE_IN_ENV) + RtecEventChannelAdmin::Observer_ptr observer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { - return this->observer_strategy_->append_observer (observer, ACE_IN_ENV); + return this->observer_strategy_->append_observer (observer TAO_ENV_ARG_PARAMETER); } void TAO_EC_Event_Channel::remove_observer ( - RtecEventChannelAdmin::Observer_Handle handle, - CORBA::Environment &ACE_IN_ENV) + RtecEventChannelAdmin::Observer_Handle handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { - this->observer_strategy_->remove_observer (handle, ACE_IN_ENV); + this->observer_strategy_->remove_observer (handle TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h index fcfa8648742..e731eb6fb4e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h @@ -120,11 +120,11 @@ public: /// Start the internal threads (if any), etc. /// After this call the EC can be used. - virtual void activate (CORBA::Environment &env = TAO_default_environment ()); + virtual void activate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Shutdown any internal threads, cleanup all the internal /// structures, flush all the messages, etc. - virtual void shutdown (CORBA::Environment &env = TAO_default_environment ()); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Access the dispatching module.... TAO_EC_Dispatching* dispatching (void) const; @@ -187,21 +187,21 @@ public: /// Used to inform the EC that a Consumer has connected or /// disconnected from it. - virtual void connected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment&); - virtual void reconnected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment&); - virtual void disconnected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment&); + virtual void connected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void reconnected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void disconnected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED); /// Used to inform the EC that a Supplier has connected or /// disconnected from it. - virtual void connected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment&); - virtual void reconnected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment&); - virtual void disconnected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment&); + virtual void connected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void reconnected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void disconnected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED); // Simple flags to control the EC behavior, set by the application // at construction time. @@ -226,31 +226,31 @@ public: // = The RtecEventChannelAdmin::EventChannel methods... /// The default implementation is: - /// this->consumer_admin ()->_this (env); + /// this->consumer_admin ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (CORBA::Environment& env) + for_consumers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// The default implementation is: - /// this->supplier_admin ()->_this (env); + /// this->supplier_admin ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (CORBA::Environment& env) + for_suppliers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Commit suicide. - virtual void destroy (CORBA::Environment &env) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RtecEventChannelAdmin::Observer_Handle - append_observer (RtecEventChannelAdmin::Observer_ptr, - CORBA::Environment &env) + append_observer (RtecEventChannelAdmin::Observer_ptr + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void - remove_observer (RtecEventChannelAdmin::Observer_Handle, - CORBA::Environment &env) + remove_observer (RtecEventChannelAdmin::Observer_Handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp index b8b1b852034..f2e738b5b2b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp @@ -37,8 +37,8 @@ TAO_EC_Filter::size (void) const } void -TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info&, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); @@ -48,44 +48,44 @@ TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info&, int TAO_EC_Null_Filter::filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { // This is a leaf, no need to query any children, and we accept all // events, so push it. - this->push (event, qos_info, ACE_TRY_ENV); + this->push (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } int TAO_EC_Null_Filter::filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { // This is a leaf, no need to query any children, and we accept all // events, so push it. - this->push_nocopy (event, qos_info, ACE_TRY_ENV); + this->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } void TAO_EC_Null_Filter::push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info, ACE_TRY_ENV); + this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); } void TAO_EC_Null_Filter::push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV); + this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); } void @@ -112,8 +112,8 @@ TAO_EC_Null_Filter::can_match (const RtecEventComm::EventHeader&) const int TAO_EC_Null_Filter::add_dependencies ( const RtecEventComm::EventHeader &, - const TAO_EC_QOS_Info &, - CORBA::Environment &) + const TAO_EC_QOS_Info & + TAO_ENV_ARG_DECL_NOT_USED) { return 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h index 206ec8cd122..a9d6c03e718 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h @@ -85,11 +85,11 @@ public: * not const then filter can take ownership of the event. */ virtual int filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env) = 0; + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) = 0; virtual int filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env) = 0; + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) = 0; /** * This is called by the children when they accept an event and @@ -98,11 +98,11 @@ public: * not const then filter can take ownership of the event. */ virtual void push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env) = 0; + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) = 0; virtual void push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env) = 0; + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) = 0; /// Clear any saved state, must reset and assume no events have been /// received. @@ -133,8 +133,8 @@ public: * fairly soon. */ virtual int add_dependencies (const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV) = 0; + const TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) = 0; /** * Obtain the QOS information for this filter, the default @@ -142,8 +142,8 @@ public: * support scheduling information implement this method. * Returns 0 on success and -1 on failure */ - virtual void get_qos_info (TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV); + virtual void get_qos_info (TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); private: /// The parent... @@ -174,23 +174,23 @@ public: // = The TAO_EC_Filter methods, please check the documentation in // TAO_EC_Filter. virtual int filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV); + const TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL); }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp index dfcc830e1d7..fdb29f3ccbb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp @@ -22,8 +22,8 @@ TAO_EC_Null_Filter_Builder::~TAO_EC_Null_Filter_Builder (void) TAO_EC_Filter* TAO_EC_Null_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *, - RtecEventChannelAdmin::ConsumerQOS&, - CORBA::Environment&) const + RtecEventChannelAdmin::ConsumerQOS& + TAO_ENV_ARG_DECL_NOT_USED) const { return new TAO_EC_Null_Filter; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h index eb494ecccae..7a81a583244 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h @@ -46,8 +46,8 @@ public: /// returned. virtual TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, - RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment &ACE_TRY_ENV) const = 0; + RtecEventChannelAdmin::ConsumerQOS& qos + TAO_ENV_ARG_DECL) const = 0; }; @@ -71,8 +71,8 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, - RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment &ACE_TRY_ENV) const; + RtecEventChannelAdmin::ConsumerQOS& qos + TAO_ENV_ARG_DECL) const; }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp index 2987beec5f5..87f78dfc03f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -69,18 +69,18 @@ TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP (void) void TAO_EC_Gateway_IIOP::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, - RtecEventChannelAdmin::EventChannel_ptr lcl_ec, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr lcl_ec + TAO_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - this->init_i (rmt_ec, lcl_ec, ACE_TRY_ENV); + this->init_i (rmt_ec, lcl_ec TAO_ENV_ARG_PARAMETER); } void TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, - RtecEventChannelAdmin::EventChannel_ptr lcl_ec, - CORBA::Environment &) + RtecEventChannelAdmin::EventChannel_ptr lcl_ec + TAO_ENV_ARG_DECL_NOT_USED) { if (!CORBA::is_nil (this->rmt_ec_.in ())) return; @@ -92,16 +92,16 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, } void -TAO_EC_Gateway_IIOP::close (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Gateway_IIOP::close (TAO_ENV_SINGLE_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - this->close_i (ACE_TRY_ENV); + this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); @@ -116,7 +116,7 @@ TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV) continue; ACE_TRY { - consumer->disconnect_push_consumer (ACE_TRY_ENV); + consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -132,7 +132,7 @@ TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV) if (!CORBA::is_nil (this->default_consumer_proxy_.in ())) { - this->default_consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV); + this->default_consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->default_consumer_proxy_ = @@ -141,7 +141,7 @@ TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV) if (!CORBA::is_nil (this->supplier_proxy_.in ())) { - this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -151,8 +151,8 @@ TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV) void TAO_EC_Gateway_IIOP::update_consumer ( - const RtecEventChannelAdmin::ConsumerQOS& c_qos, - CORBA::Environment& ACE_TRY_ENV) + const RtecEventChannelAdmin::ConsumerQOS& c_qos + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (c_qos.dependencies.length () <= 1) @@ -167,15 +167,15 @@ TAO_EC_Gateway_IIOP::update_consumer ( return; } - this->update_consumer_i (c_qos, ACE_TRY_ENV); + this->update_consumer_i (c_qos TAO_ENV_ARG_PARAMETER); } void TAO_EC_Gateway_IIOP::update_consumer_i ( - const RtecEventChannelAdmin::ConsumerQOS& c_qos, - CORBA::Environment& ACE_TRY_ENV) + const RtecEventChannelAdmin::ConsumerQOS& c_qos + TAO_ENV_ARG_DECL) { - this->close_i (ACE_TRY_ENV); + this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->lcl_ec_.in ()) @@ -186,7 +186,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // = Connect as a supplier to the local EC RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->lcl_ec_->for_suppliers (ACE_TRY_ENV); + this->lcl_ec_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Change the RT_Info in the consumer QoS. @@ -222,7 +222,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( //ACE_DEBUG ((LM_DEBUG, // "ECG (%t) binding source %d\n", // sid)); - proxy = supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + proxy = supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_map_.bind (sid, proxy); } @@ -237,7 +237,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // Obtain a reference to our supplier personality... RtecEventComm::PushSupplier_var supplier_ref = - this->supplier_._this (ACE_TRY_ENV); + this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // For each subscription by source build the set of publications @@ -280,8 +280,8 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Supplier ")); // ACE_SupplierQOS_Factory::debug (pub); (*j).int_id_->connect_push_supplier (supplier_ref.in (), - pub, - ACE_TRY_ENV); + pub + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -316,59 +316,59 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // Obtain a reference to our supplier personality... RtecEventComm::PushSupplier_var supplier_ref = - this->supplier_._this (ACE_TRY_ENV); + this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Obtain the consumer.... this->default_consumer_proxy_ = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; pub.publications.length (c); // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Supplier ")); // ACE_SupplierQOS_Factory::debug (pub); this->default_consumer_proxy_->connect_push_supplier (supplier_ref.in (), - pub, - ACE_TRY_ENV); + pub + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->rmt_ec_->for_consumers (ACE_TRY_ENV); + this->rmt_ec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_is_active_ = 1; RtecEventComm::PushConsumer_var consumer_ref = - this->consumer_._this (ACE_TRY_ENV); + this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Consumer ")); // ACE_ConsumerQOS_Factory::debug (sub); this->supplier_proxy_->connect_push_consumer (consumer_ref.in (), - sub, - ACE_TRY_ENV); + sub + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Gateway_IIOP::update_supplier ( - const RtecEventChannelAdmin::SupplierQOS&, - CORBA::Environment&) + const RtecEventChannelAdmin::SupplierQOS& + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing... } void -TAO_EC_Gateway_IIOP::disconnect_push_consumer (CORBA::Environment &) +TAO_EC_Gateway_IIOP::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { // ACE_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier-consumer received " @@ -376,7 +376,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_consumer (CORBA::Environment &) } void -TAO_EC_Gateway_IIOP::disconnect_push_supplier (CORBA::Environment &) +TAO_EC_Gateway_IIOP::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { // ACE_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier received " @@ -384,8 +384,8 @@ TAO_EC_Gateway_IIOP::disconnect_push_supplier (CORBA::Environment &) } void -TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events, - CORBA::Environment & ACE_TRY_ENV) +TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "TAO_EC_Gateway_IIOP::push (%P|%t) - \n")); @@ -429,7 +429,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events, out[0].header.ttl--; // ACE_DEBUG ((LM_DEBUG, "ECG: event sent to proxy\n")); - proxy->push (out, ACE_TRY_ENV); + proxy->push (out TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -441,7 +441,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events, if (this->busy_count_ == 0 && this->update_posted_ != 0) { this->update_posted_ = 0; - this->update_consumer_i (this->c_qos_, ACE_TRY_ENV); + this->update_consumer_i (this->c_qos_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -449,22 +449,22 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events, } int -TAO_EC_Gateway_IIOP::shutdown (CORBA::Environment& ACE_TRY_ENV) +TAO_EC_Gateway_IIOP::shutdown (TAO_ENV_SINGLE_ARG_DECL) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); - this->close_i (ACE_TRY_ENV); + this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (this->supplier_is_active_) { PortableServer::POA_var poa = - this->supplier_._default_POA (ACE_TRY_ENV); + this->supplier_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->supplier_, ACE_TRY_ENV); + poa->servant_to_id (&this->supplier_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->supplier_is_active_ = 0; } @@ -472,12 +472,12 @@ TAO_EC_Gateway_IIOP::shutdown (CORBA::Environment& ACE_TRY_ENV) if (this->consumer_is_active_) { PortableServer::POA_var poa = - this->consumer_._default_POA (ACE_TRY_ENV); + this->consumer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->consumer_, ACE_TRY_ENV); + poa->servant_to_id (&this->consumer_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->consumer_is_active_ = 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h index 25f04944d38..35f630050e1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h @@ -49,7 +49,7 @@ public: /// The gateway must disconnect from all the relevant event channels, /// or any other communication media (such as multicast groups). - virtual void close (CORBA::Environment &env = TAO_default_environment ()) = 0; + virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0; /// Obtain and modify the observer handle. void observer_handle (RtecEventChannelAdmin::Observer_Handle h); @@ -99,43 +99,43 @@ public: /// To do its job this class requires to know the local and remote /// ECs it will connect to, void init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, - RtecEventChannelAdmin::EventChannel_ptr lcl_ec, - CORBA::Environment &ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel_ptr lcl_ec + TAO_ENV_ARG_DECL); /// The channel is disconnecting. - void disconnect_push_supplier (CORBA::Environment & = TAO_default_environment ()); + void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// The channel is disconnecting. - void disconnect_push_consumer (CORBA::Environment & = TAO_default_environment ()); + void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// This is the Consumer side behavior, it pushes the events to the /// local event channel. - void push (const RtecEventComm::EventSet &events, - CORBA::Environment & = TAO_default_environment ()); + void push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect and shutdown the gateway - int shutdown (CORBA::Environment & = TAO_default_environment ()); + int shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // The following methods are documented in the base class. - virtual void close (CORBA::Environment &env = TAO_default_environment ()); - virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub, - CORBA::Environment &env = TAO_default_environment ()) + virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub, - CORBA::Environment &env = TAO_default_environment ()) + virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: - void close_i (CORBA::Environment &); + void close_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); - void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub, - CORBA::Environment& env); + void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub + TAO_ENV_ARG_DECL); protected: /// Do the real work in init() void init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, - RtecEventChannelAdmin::EventChannel_ptr lcl_ec, - CORBA::Environment &ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel_ptr lcl_ec + TAO_ENV_ARG_DECL); protected: /// Lock to synchronize internal changes diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp index 1704b9adf26..a4baa6b4b42 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -20,12 +20,12 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecScheduler::Scheduler_ptr rmt_sched, RtecScheduler::Scheduler_ptr lcl_sched, const char* lcl_name, - const char* rmt_name, - CORBA::Environment &ACE_TRY_ENV) + const char* rmt_name + TAO_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - this->init_i (rmt_ec, lcl_ec, ACE_TRY_ENV); + this->init_i (rmt_ec, lcl_ec TAO_ENV_ARG_PARAMETER); ACE_CHECK; // @@ Should we throw a system exception here? @@ -36,7 +36,7 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, ACE_THROW (CORBA::BAD_PARAM ()); this->rmt_info_ = - rmt_sched->create (rmt_name, ACE_TRY_ENV); + rmt_sched->create (rmt_name TAO_ENV_ARG_PARAMETER); ACE_CHECK; // @@ TODO Many things are hard-coded in the RT_Info here. @@ -53,12 +53,12 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecScheduler::VERY_LOW_IMPORTANCE, time, 0, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->lcl_info_ = - lcl_sched->create (lcl_name, ACE_TRY_ENV); + lcl_sched->create (lcl_name TAO_ENV_ARG_PARAMETER); ACE_CHECK; tv = ACE_Time_Value (0, 500); @@ -70,7 +70,7 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecScheduler::VERY_LOW_IMPORTANCE, time, 1, - RtecScheduler::REMOTE_DEPENDANT, - ACE_TRY_ENV); + RtecScheduler::REMOTE_DEPENDANT + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h index 61c300147fa..d93e98634de 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h @@ -47,8 +47,8 @@ public: RtecScheduler::Scheduler_ptr rmt_sched, RtecScheduler::Scheduler_ptr lcl_sched, const char* lcl_name, - const char* rmt_name, - CORBA::Environment &env = TAO_default_environment ()); + const char* rmt_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS); }; #include "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp index 71636f5eb64..e8e5dd84c30 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp @@ -9,7 +9,9 @@ #include "EC_Gateway_UDP.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Event, EC_Gateway_UDP, "$Id$") +ACE_RCSID (Event, + EC_Gateway_UDP, + "$Id$") // **************************************************************** @@ -29,8 +31,8 @@ TAO_ECG_UDP_Sender::get_local_addr (ACE_INET_Addr& addr) void TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, RtecUDPAdmin::AddrServer_ptr addr_server, - TAO_ECG_UDP_Out_Endpoint* endpoint, - CORBA::Environment &) + TAO_ECG_UDP_Out_Endpoint* endpoint + TAO_ENV_ARG_DECL_NOT_USED) { this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_duplicate (lcl_ec); @@ -52,23 +54,23 @@ TAO_ECG_UDP_Sender::mtu (CORBA::ULong new_mtu) } void -TAO_ECG_UDP_Sender::shutdown (CORBA::Environment& ACE_TRY_ENV) +TAO_ECG_UDP_Sender::shutdown (TAO_ENV_SINGLE_ARG_DECL) { - this->close (ACE_TRY_ENV); + this->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil (); } void -TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub, - CORBA::Environment &ACE_TRY_ENV) +TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub + TAO_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Open gateway\n")); if (CORBA::is_nil (this->lcl_ec_.in ())) return; if (!CORBA::is_nil (this->supplier_proxy_.in ())) - this->close (ACE_TRY_ENV); + this->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (sub.dependencies.length () == 0) @@ -78,51 +80,51 @@ TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub, //ACE_SupplierQOS_Factory::debug (pub); RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->lcl_ec_->for_consumers (ACE_TRY_ENV); + this->lcl_ec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushConsumer_var consumer_ref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; //ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Consumer ")); //ACE_ConsumerQOS_Factory::debug (sub); this->supplier_proxy_->connect_push_consumer (consumer_ref.in (), - sub, - ACE_TRY_ENV); + sub + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Sender::close (CORBA::Environment &ACE_TRY_ENV) +TAO_ECG_UDP_Sender::close (TAO_ENV_SINGLE_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); if (CORBA::is_nil (this->supplier_proxy_.in ())) return; - this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Sender::disconnect_push_consumer (CORBA::Environment &) +TAO_ECG_UDP_Sender::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -131,8 +133,8 @@ TAO_ECG_UDP_Sender::disconnect_push_consumer (CORBA::Environment &) } void -TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events, - CORBA::Environment & ACE_TRY_ENV) +TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Sender::push - \n")); @@ -170,7 +172,7 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events, // Grab the right mcast group for this event... RtecUDPAdmin::UDP_Addr udp_addr; - this->addr_server_->get_addr (header, udp_addr, ACE_TRY_ENV); + this->addr_server_->get_addr (header, udp_addr TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Start building the message @@ -235,8 +237,8 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events, fragment_id, fragment_count, iov, - iovcnt, - ACE_TRY_ENV); + iovcnt + TAO_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += max_fragment_payload; @@ -263,8 +265,8 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events, fragment_id, fragment_count, iov, - iovcnt, - ACE_TRY_ENV); + iovcnt + TAO_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += max_fragment_payload; @@ -284,8 +286,8 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events, fragment_id, fragment_count, iov, - iovcnt, - ACE_TRY_ENV); + iovcnt + TAO_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += fragment_size; @@ -308,8 +310,8 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events, fragment_id, fragment_count, iov, - iovcnt, - ACE_TRY_ENV); + iovcnt + TAO_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += fragment_size; @@ -333,8 +335,8 @@ TAO_ECG_UDP_Sender::send_fragment (const RtecUDPAdmin::UDP_Addr& udp_addr, CORBA::ULong fragment_id, CORBA::ULong fragment_count, iovec iov[], - int iovcnt, - CORBA::Environment& ACE_TRY_ENV) + int iovcnt + TAO_ENV_ARG_DECL) { CORBA::ULong header[TAO_ECG_UDP_Sender::ECG_HEADER_SIZE / sizeof(CORBA::ULong) @@ -622,8 +624,8 @@ TAO_ECG_UDP_Request_Entry::fragment_buffer (CORBA::ULong fragment_offset) } void -TAO_ECG_UDP_Request_Entry::decode (RtecEventComm::EventSet& event, - CORBA::Environment& ACE_TRY_ENV) +TAO_ECG_UDP_Request_Entry::decode (RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL) { TAO_InputCDR cdr (&this->payload_, ACE_static_cast(int,this->byte_order_)); @@ -659,8 +661,8 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, RtecUDPAdmin::AddrServer_ptr addr_server, ACE_Reactor *reactor, const ACE_Time_Value &expire_interval, - int max_timeout, - CORBA::Environment &) + int max_timeout + TAO_ENV_ARG_DECL_NOT_USED) { this->ignore_from_ = ignore_from; @@ -683,14 +685,14 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, } void -TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub, - CORBA::Environment &ACE_TRY_ENV) +TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub + TAO_ENV_ARG_DECL) { if (CORBA::is_nil (this->lcl_ec_.in ())) return; if (!CORBA::is_nil (this->consumer_proxy_.in ())) - this->close (ACE_TRY_ENV); + this->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (pub.publications.length () == 0) @@ -698,51 +700,51 @@ TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub, // = Connect as a supplier to the local EC RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->lcl_ec_->for_suppliers (ACE_TRY_ENV); + this->lcl_ec_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushSupplier_var supplier_ref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Receiver (%t) Gateway/Supplier ")); // ACE_SupplierQOS_Factory::debug (pub); this->consumer_proxy_->connect_push_supplier (supplier_ref.in (), - pub, - ACE_TRY_ENV); + pub + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Receiver::close (CORBA::Environment &ACE_TRY_ENV) +TAO_ECG_UDP_Receiver::close (TAO_ENV_SINGLE_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); if (CORBA::is_nil (this->consumer_proxy_.in ())) return; - this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV); + this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Receiver::disconnect_push_supplier (CORBA::Environment &) +TAO_ECG_UDP_Receiver::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -751,9 +753,9 @@ TAO_ECG_UDP_Receiver::disconnect_push_supplier (CORBA::Environment &) } void -TAO_ECG_UDP_Receiver::shutdown (CORBA::Environment& ACE_TRY_ENV) +TAO_ECG_UDP_Receiver::shutdown (TAO_ENV_SINGLE_ARG_DECL) { - this->close (ACE_TRY_ENV); + this->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil (); @@ -937,14 +939,14 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) return 0; } - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { RtecEventComm::EventSet event; - entry->int_id_->decode (event, ACE_TRY_ENV); + entry->int_id_->decode (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->consumer_proxy_->push (event, ACE_TRY_ENV); + this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, @@ -964,10 +966,10 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) void TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr, - CORBA::Environment& env) + RtecUDPAdmin::UDP_Addr_out addr + TAO_ENV_ARG_DECL) { - this->addr_server_->get_addr (header, addr, env); + this->addr_server_->get_addr (header, addr TAO_ENV_ARG_PARAMETER); } int diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h index 31fbd7762fa..8b01c24f5ad 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + /** * @file EC_Gateway_UDP.h * @@ -135,8 +136,8 @@ public: */ void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, RtecUDPAdmin::AddrServer_ptr addr_server, - TAO_ECG_UDP_Out_Endpoint *endpoint, - CORBA::Environment &env = TAO_default_environment ()); + TAO_ECG_UDP_Out_Endpoint *endpoint + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /** * The sender may need to fragment the message, otherwise the @@ -149,21 +150,20 @@ public: /// Disconnect and shutdown the sender, no further connections will /// work unless init() is called again. - void shutdown (CORBA::Environment & = TAO_default_environment ()); + void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Connect (or reconnect) to the EC with the given subscriptions. - void open (RtecEventChannelAdmin::ConsumerQOS &sub, - CORBA::Environment &env = TAO_default_environment ()); + void open (RtecEventChannelAdmin::ConsumerQOS &sub + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect from the EC, but reconnection is still possible. - void close (CORBA::Environment &env = TAO_default_environment ()); + void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// The PushConsumer methods. - virtual void disconnect_push_consumer (CORBA::Environment & = - TAO_default_environment ()) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void push (const RtecEventComm::EventSet &events, - CORBA::Environment & = TAO_default_environment ()) + virtual void push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -183,8 +183,8 @@ private: CORBA::ULong fragment_id, CORBA::ULong fragment_count, iovec iov[], - int iovcnt, - CORBA::Environment &env = TAO_default_environment ()); + int iovcnt + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /** * Count the number of fragments that will be required to send the @@ -348,8 +348,8 @@ public: char* fragment_buffer (CORBA::ULong fragment_offset); /// Decode the events, the message must be complete. - void decode (RtecEventComm::EventSet& event, - CORBA::Environment &env = TAO_default_environment ()); + void decode (RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Increment the timeout counter... void inc_timeout (void); @@ -446,18 +446,18 @@ public: RtecUDPAdmin::AddrServer_ptr addr_server, ACE_Reactor *reactor, const ACE_Time_Value &expire_interval, - int max_timeout, - CORBA::Environment &env = TAO_default_environment ()); + int max_timeout + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect and shutdown the gateway, no further connectsions - void shutdown (CORBA::Environment & = TAO_default_environment ()); + void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Connect to the EC using the given publications lists. - void open (RtecEventChannelAdmin::SupplierQOS& pub, - CORBA::Environment &env = TAO_default_environment ()); + void open (RtecEventChannelAdmin::SupplierQOS& pub + TAO_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect to the EC. - virtual void close (CORBA::Environment &env = TAO_default_environment ()); + virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /** * The Event_Handlers call this method when data is available at the @@ -472,14 +472,13 @@ public: const void* act); // The PushSupplier method. - virtual void disconnect_push_supplier (CORBA::Environment & = - TAO_default_environment ()) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Call the RtecUDPAdmin::AddrServer void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr, - CORBA::Environment &env = TAO_default_environment ()); + RtecUDPAdmin::UDP_Addr_out addr + TAO_ENV_ARG_DECL_WITH_DEFAULTS); private: /// The remote and the local EC, so we can reconnect when the list changes. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index abeeba51cf9..9106c478843 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -67,23 +67,23 @@ void TAO_EC_MT_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { RtecEventComm::EventSet event_copy = event; - this->push_nocopy (proxy, consumer, event_copy, qos_info, ACE_TRY_ENV); + this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER); } void TAO_EC_MT_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, - TAO_EC_QOS_Info&, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL) { // Double checked locking.... if (this->active_ == 0) this->activate (); - this->task_.push (proxy, consumer, event, ACE_TRY_ENV); + this->task_.push (proxy, consumer, event TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h index 44ea2f5fa4a..97165aecb7b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h @@ -51,13 +51,13 @@ public: virtual void push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); private: /// Use our own thread manager. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp index 32266bdd914..627c32801f0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp @@ -44,8 +44,8 @@ TAO_EC_Masked_Type_Filter::size (void) const int TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { if (event.length () != 1) return 0; @@ -56,7 +56,7 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event, if (this->parent () != 0) { - this->parent ()->push (event, qos_info, ACE_TRY_ENV); + this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -64,8 +64,8 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { if (event.length () != 1) return 0; @@ -76,7 +76,7 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, if (this->parent () != 0) { - this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV); + this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -84,15 +84,15 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Masked_Type_Filter::push (const RtecEventComm::EventSet &, - TAO_EC_QOS_Info &, - CORBA::Environment &) + TAO_EC_QOS_Info & + TAO_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Masked_Type_Filter::push_nocopy (RtecEventComm::EventSet &, - TAO_EC_QOS_Info &, - CORBA::Environment &) + TAO_EC_QOS_Info & + TAO_ENV_ARG_DECL_NOT_USED) { } @@ -121,8 +121,8 @@ TAO_EC_Masked_Type_Filter::can_match ( int TAO_EC_Masked_Type_Filter::add_dependencies ( const RtecEventComm::EventHeader&, - const TAO_EC_QOS_Info &, - CORBA::Environment &) + const TAO_EC_QOS_Info & + TAO_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h index 4caa321b9f6..6a2b6d12317 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h @@ -52,23 +52,23 @@ public: virtual ChildrenIterator end (void) const; virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV); + const TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Masked_Type_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp index 0caf0726a61..bed3ab7655b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -40,15 +40,15 @@ TAO_EC_Negation_Filter::size (void) const int TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { int n = - this->child_->filter (event, qos_info, ACE_TRY_ENV); + this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->parent () != 0 && n == 0) { - this->parent ()->push (event, qos_info, ACE_TRY_ENV); + this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -56,15 +56,15 @@ TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { int n = - this->child_->filter_nocopy (event, qos_info, ACE_TRY_ENV); + this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->parent () != 0 && n == 0) { - this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV); + this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -72,15 +72,15 @@ TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Negation_Filter::push (const RtecEventComm::EventSet&, - TAO_EC_QOS_Info&, - CORBA::Environment&) + TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Negation_Filter::push_nocopy (RtecEventComm::EventSet&, - TAO_EC_QOS_Info&, - CORBA::Environment&) + TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL_NOT_USED) { } @@ -106,8 +106,8 @@ TAO_EC_Negation_Filter::can_match ( int TAO_EC_Negation_Filter::add_dependencies ( const RtecEventComm::EventHeader&, - const TAO_EC_QOS_Info &, - CORBA::Environment &) + const TAO_EC_QOS_Info & + TAO_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h index 219ea998789..caee63f3b70 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h @@ -50,23 +50,23 @@ public: virtual ChildrenIterator end (void) const; virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV); + const TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Negation_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp index df75136d3b9..10260d6fbc0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp @@ -12,8 +12,8 @@ ACE_RCSID(Event, EC_Null_Scheduling, "$Id$") void TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *, - TAO_EC_ProxyPushConsumer *, - CORBA::Environment &) + TAO_EC_ProxyPushConsumer * + TAO_ENV_ARG_DECL_NOT_USED) { } @@ -21,7 +21,7 @@ void TAO_EC_Null_Scheduling::init_event_qos ( const RtecEventComm::EventHeader&, TAO_EC_ProxyPushConsumer *, - TAO_EC_QOS_Info&, - CORBA::Environment &) + TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h index bd1448395e7..b5ee1c9b97a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h @@ -40,16 +40,16 @@ public: /// Add all the dependencies between <supplier> and <consumer> virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, - TAO_EC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV); + TAO_EC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL); /// Initializes <qos_info> based on the QoS information for /// <consumer> and the event header. virtual void init_event_qos ( const RtecEventComm::EventHeader& header, TAO_EC_ProxyPushConsumer *consumer, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Null_Scheduling diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 31c23c4a409..6ea6950d196 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -24,8 +24,8 @@ TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void) RtecEventChannelAdmin::Observer_Handle TAO_EC_Null_ObserverStrategy::append_observer ( - RtecEventChannelAdmin::Observer_ptr, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::Observer_ptr + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -38,8 +38,8 @@ TAO_EC_Null_ObserverStrategy::append_observer ( void TAO_EC_Null_ObserverStrategy::remove_observer ( - RtecEventChannelAdmin::Observer_Handle, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::Observer_Handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -49,26 +49,26 @@ TAO_EC_Null_ObserverStrategy::remove_observer ( } void -TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment &) +TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment &) +TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment &) +TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment &) +TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED) { } @@ -82,8 +82,8 @@ TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void) RtecEventChannelAdmin::Observer_Handle TAO_EC_Basic_ObserverStrategy::append_observer ( - RtecEventChannelAdmin::Observer_ptr obs, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::Observer_ptr obs + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -106,15 +106,15 @@ TAO_EC_Basic_ObserverStrategy::append_observer ( } RtecEventChannelAdmin::ConsumerQOS c_qos; - this->fill_qos (c_qos, ACE_TRY_ENV); + this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - obs->update_consumer (c_qos, ACE_TRY_ENV); + obs->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos, ACE_TRY_ENV); + this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - obs->update_supplier (s_qos, ACE_TRY_ENV); + obs->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->handle_generator_; @@ -123,8 +123,8 @@ TAO_EC_Basic_ObserverStrategy::append_observer ( void TAO_EC_Basic_ObserverStrategy::remove_observer ( - RtecEventChannelAdmin::Observer_Handle handle, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::Observer_Handle handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -141,14 +141,14 @@ TAO_EC_Basic_ObserverStrategy::remove_observer ( void TAO_EC_Basic_ObserverStrategy::connected ( - TAO_EC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL) { if (consumer->publications ().is_gateway) return; RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos, ACE_TRY_ENV); + this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -176,21 +176,21 @@ TAO_EC_Basic_ObserverStrategy::connected ( for (int i = 0; i != size; ++i) { - copy[i]->update_supplier (s_qos, ACE_TRY_ENV); + copy[i]->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_EC_Basic_ObserverStrategy::disconnected ( - TAO_EC_ProxyPushConsumer* consumer, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL) { if (consumer->publications ().is_gateway) return; RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos, ACE_TRY_ENV); + this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -218,21 +218,21 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( for (int i = 0; i != size; ++i) { - copy[i]->update_supplier (s_qos, ACE_TRY_ENV); + copy[i]->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_EC_Basic_ObserverStrategy::connected ( - TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL) { if (supplier->subscriptions ().is_gateway) return; RtecEventChannelAdmin::ConsumerQOS c_qos; - this->fill_qos (c_qos, ACE_TRY_ENV); + this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -260,21 +260,21 @@ TAO_EC_Basic_ObserverStrategy::connected ( for (int i = 0; i != size; ++i) { - copy[i]->update_consumer (c_qos, ACE_TRY_ENV); + copy[i]->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_EC_Basic_ObserverStrategy::disconnected ( - TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL) { if (supplier->subscriptions ().is_gateway) return; RtecEventChannelAdmin::ConsumerQOS c_qos; - this->fill_qos (c_qos, ACE_TRY_ENV); + this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -302,20 +302,20 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( for (int i = 0; i != size; ++i) { - copy[i]->update_consumer (c_qos, ACE_TRY_ENV); + copy[i]->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_EC_Basic_ObserverStrategy::fill_qos ( - RtecEventChannelAdmin::ConsumerQOS &qos, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::ConsumerQOS &qos + TAO_ENV_ARG_DECL) { Headers headers; TAO_EC_Accumulate_Supplier_Headers worker (headers); - this->event_channel_->consumer_admin ()->for_each (&worker, ACE_TRY_ENV); + this->event_channel_->consumer_admin ()->for_each (&worker TAO_ENV_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::DependencySet& dep = qos.dependencies; @@ -336,14 +336,14 @@ TAO_EC_Basic_ObserverStrategy::fill_qos ( void TAO_EC_Basic_ObserverStrategy::fill_qos ( - RtecEventChannelAdmin::SupplierQOS &qos, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::SupplierQOS &qos + TAO_ENV_ARG_DECL) { Headers headers; TAO_EC_Accumulate_Consumer_Headers worker (headers); - this->event_channel_->supplier_admin ()->for_each (&worker, - ACE_TRY_ENV); + this->event_channel_->supplier_admin ()->for_each (&worker + TAO_ENV_ARG_PARAMETER); ACE_CHECK; qos.publications.length (headers.current_size ()); @@ -358,8 +358,8 @@ TAO_EC_Basic_ObserverStrategy::fill_qos ( // **************************************************************** void -TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier, - CORBA::Environment &) +TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL_NOT_USED) { const RtecEventChannelAdmin::ConsumerQOS& sub = supplier->subscriptions (); @@ -380,8 +380,8 @@ TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier, // **************************************************************** void -TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer, - CORBA::Environment &) +TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL_NOT_USED) { const RtecEventChannelAdmin::SupplierQOS& pub = consumer->publications (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h index fed699df0aa..1949b1047e9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h @@ -54,16 +54,16 @@ public: /// The basic methods to support the EC strategies. virtual RtecEventChannelAdmin::Observer_Handle - append_observer (RtecEventChannelAdmin::Observer_ptr, - CORBA::Environment &env) + append_observer (RtecEventChannelAdmin::Observer_ptr + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) = 0; virtual void remove_observer ( - RtecEventChannelAdmin::Observer_Handle, - CORBA::Environment &env) + RtecEventChannelAdmin::Observer_Handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -72,17 +72,17 @@ public: /// Used by the EC to inform the ObserverStrategy that a Consumer has /// connected or disconnected from it. - virtual void connected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment&) = 0; - virtual void disconnected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment&) = 0; + virtual void connected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED) = 0; + virtual void disconnected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED) = 0; /// Used by the EC to inform the ObserverStrategy that a Consumer has /// connected or disconnected from it. - virtual void connected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment&) = 0; - virtual void disconnected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment&) = 0; + virtual void connected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED) = 0; + virtual void disconnected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED) = 0; }; // **************************************************************** @@ -103,27 +103,27 @@ public: // = The TAO_EC_ObserverStrategy methods. virtual RtecEventChannelAdmin::Observer_Handle - append_observer (RtecEventChannelAdmin::Observer_ptr, - CORBA::Environment &env) + append_observer (RtecEventChannelAdmin::Observer_ptr + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer ( - RtecEventChannelAdmin::Observer_Handle, - CORBA::Environment &env) + RtecEventChannelAdmin::Observer_Handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); - virtual void connected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment&); - virtual void disconnected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment&); - virtual void connected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment&); - virtual void disconnected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment&); + virtual void connected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void disconnected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void connected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void disconnected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED); }; // **************************************************************** @@ -155,27 +155,27 @@ public: // = The TAO_EC_ObserverStrategy methods. virtual RtecEventChannelAdmin::Observer_Handle - append_observer (RtecEventChannelAdmin::Observer_ptr, - CORBA::Environment &env) + append_observer (RtecEventChannelAdmin::Observer_ptr + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer ( - RtecEventChannelAdmin::Observer_Handle, - CORBA::Environment &env) + RtecEventChannelAdmin::Observer_Handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); - virtual void connected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment&); - virtual void disconnected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment&); - virtual void connected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment&); - virtual void disconnected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment&); + virtual void connected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void disconnected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void connected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED); + virtual void disconnected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED); struct Observer_Entry @@ -222,10 +222,10 @@ public: protected: /// Helper functions to compute the consumer and supplier QOS. - void fill_qos (RtecEventChannelAdmin::ConsumerQOS &qos, - CORBA::Environment &env); - void fill_qos (RtecEventChannelAdmin::SupplierQOS &qos, - CORBA::Environment &env); + void fill_qos (RtecEventChannelAdmin::ConsumerQOS &qos + TAO_ENV_ARG_DECL); + void fill_qos (RtecEventChannelAdmin::SupplierQOS &qos + TAO_ENV_ARG_DECL); protected: /// The event channel. @@ -250,8 +250,8 @@ public: /// Constructor TAO_EC_Accumulate_Supplier_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers); - virtual void work (TAO_EC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV); + virtual void work (TAO_EC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL); private: TAO_EC_Basic_ObserverStrategy::Headers &headers_; @@ -265,8 +265,8 @@ public: /// Constructor TAO_EC_Accumulate_Consumer_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers); - virtual void work (TAO_EC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV); + virtual void work (TAO_EC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL); private: TAO_EC_Basic_ObserverStrategy::Headers &headers_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index 0104d861d3f..05db009ac83 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -60,7 +60,7 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer) ACE_TRY_NEW_ENV { - this->shutdown (ACE_TRY_ENV); + this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -71,8 +71,8 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer) } void -TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -98,7 +98,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier, #if TAO_EC_ENABLE_DEBUG_MESSAGES ACE_DEBUG ((LM_DEBUG, " matched\n")); #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */ - this->collection_->connected (supplier, ACE_TRY_ENV); + this->collection_->connected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; return; } @@ -109,8 +109,8 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier, } void -TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -131,30 +131,30 @@ TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier, if (supplier->can_match (event.header)) { // ACE_DEBUG ((LM_DEBUG, " matched %x\n", supplier)); - this->collection_->connected (supplier, ACE_TRY_ENV); + this->collection_->connected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; return; } } - this->collection_->disconnected (supplier, ACE_TRY_ENV); + this->collection_->disconnected (supplier TAO_ENV_ARG_PARAMETER); } void -TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL) { - this->collection_->disconnected (supplier, ACE_TRY_ENV); + this->collection_->disconnected (supplier TAO_ENV_ARG_PARAMETER); } void -TAO_EC_Per_Supplier_Filter::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Per_Supplier_Filter::shutdown (TAO_ENV_SINGLE_ARG_DECL) { - this->collection_->shutdown (ACE_TRY_ENV); + this->collection_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy* scheduling_strategy = this->event_channel_->scheduling_strategy (); @@ -178,8 +178,8 @@ TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event, scheduling_strategy->init_event_qos (e.header, this->consumer_, - event_info, - ACE_TRY_ENV); + event_info + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -190,7 +190,7 @@ TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event, // until push() returns. TAO_EC_Filter_Worker worker (single_event, event_info); - this->collection_->for_each (&worker, ACE_TRY_ENV); + this->collection_->for_each (&worker TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h index 8bde52ff087..efa599a3dc4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h @@ -50,15 +50,15 @@ public: // = The TAO_EC_Supplier_Filter methods. virtual void bind (TAO_EC_ProxyPushConsumer* consumer); virtual void unbind (TAO_EC_ProxyPushConsumer* consumer); - virtual void connected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &env); - virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &env); - virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &env); - virtual void shutdown (CORBA::Environment &env); - virtual void push (const RtecEventComm::EventSet& event, - CORBA::Environment &); + virtual void connected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL); + virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL); + virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void push (const RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL_NOT_USED); virtual CORBA::ULong _decr_refcnt (void); virtual CORBA::ULong _incr_refcnt (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index d5b48b16610..4a4296b9e19 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -24,8 +24,8 @@ TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder (void) TAO_EC_Filter* TAO_EC_Prefix_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *supplier, - RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment&) const + RtecEventChannelAdmin::ConsumerQOS& qos + TAO_ENV_ARG_DECL_NOT_USED) const { CORBA::ULong pos = 0; return this->recursive_build (supplier, qos, pos); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h index 02989dcc872..9622fb15350 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h @@ -45,8 +45,8 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, - RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment &env) const; + RtecEventChannelAdmin::ConsumerQOS& qos + TAO_ENV_ARG_DECL) const; private: /// Recursively build the filter tree. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index 8d685ccc521..6f31edc67ae 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -40,7 +40,7 @@ TAO_EC_Priority_Dispatching::activate (void) ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; for (int i = 0; i < this->ntasks_; ++i) { ACE_TRY @@ -51,7 +51,7 @@ TAO_EC_Priority_Dispatching::activate (void) ACE_OS::sprintf (buf, "Dispatching_Task-%d.us", period); RtecScheduler::handle_t rt_info = - this->scheduler_->create (buf, ACE_TRY_ENV); + this->scheduler_->create (buf TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->scheduler_->set (rt_info, @@ -63,8 +63,8 @@ TAO_EC_Priority_Dispatching::activate (void) RtecScheduler::VERY_LOW_IMPORTANCE, 0, // quantum 1, // threads - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -112,19 +112,19 @@ void TAO_EC_Priority_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { RtecEventComm::EventSet event_copy = event; - this->push_nocopy (proxy, consumer, event_copy, qos_info, ACE_TRY_ENV); + this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER); } void TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { if (this->tasks_ == 0) this->activate (); @@ -137,5 +137,5 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, } - this->tasks_[i]->push (proxy, consumer, event, ACE_TRY_ENV); + this->tasks_[i]->push (proxy, consumer, event TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h index 313e5ec3b35..f8b78ed2c78 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h @@ -59,13 +59,13 @@ public: virtual void push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); private: /// Use our own thread manager. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp index e53975daa2c..047a20fa5c6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -18,8 +18,8 @@ TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling (void) void TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, - TAO_EC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "add_proxy_supplier_dependencies - %x %x\n", supplier, consumer)); @@ -38,12 +38,12 @@ TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies ( this->scheduler_->priority (qos_info.rt_info, os_priority, p_subpriority, - p_priority, - ACE_TRY_ENV); + p_priority + TAO_ENV_ARG_PARAMETER); ACE_CHECK; qos_info.preemption_priority = p_priority; - supplier->add_dependencies (header, qos_info, ACE_TRY_ENV); + supplier->add_dependencies (header, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -52,8 +52,8 @@ void TAO_EC_Priority_Scheduling::init_event_qos ( const RtecEventComm::EventHeader &header, TAO_EC_ProxyPushConsumer *consumer, - TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL) { const RtecEventChannelAdmin::SupplierQOS& qos = consumer->publications (); @@ -73,8 +73,8 @@ TAO_EC_Priority_Scheduling::init_event_qos ( this->scheduler_->priority (qos_info.rt_info, os_priority, p_subpriority, - p_priority, - ACE_TRY_ENV); + p_priority + TAO_ENV_ARG_PARAMETER); ACE_CHECK; qos_info.preemption_priority = p_priority; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h index 72c6cdb9095..4a3acc9369d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h @@ -45,16 +45,16 @@ public: /// Add all the dependencies between <supplier> and <consumer> virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, - TAO_EC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV); + TAO_EC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL); /// Initializes <qos_info> based on the QoS information for /// <consumer> and the event header. virtual void init_event_qos ( const RtecEventComm::EventHeader& header, TAO_EC_ProxyPushConsumer *consumer, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Priority_Scheduling @@ -63,7 +63,7 @@ private: (const TAO_EC_Priority_Scheduling&)) /// Initialize our RT_Info handle and dependencies - void init_rt_info (CORBA::Environment& env); + void init_rt_info (TAO_ENV_SINGLE_ARG_DECL); private: /// The scheduler we are going to use diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp index b3907480515..d8ab620c32b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp @@ -38,8 +38,8 @@ TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer (void) CORBA::Boolean TAO_EC_ProxyPushConsumer::supplier_non_existent ( - CORBA::Boolean_out disconnected, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean_out disconnected + TAO_ENV_ARG_DECL) { CORBA::Object_var supplier; { @@ -62,15 +62,15 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return supplier->_non_existent (ACE_TRY_ENV); + return supplier->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } void -TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, this->refcount_, @@ -79,12 +79,12 @@ TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier, if (!ace_mon.locked ()) return; - ace_mon.filter->connected (supplier, ACE_TRY_ENV); + ace_mon.filter->connected (supplier TAO_ENV_ARG_PARAMETER); } void -TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, this->refcount_, @@ -93,12 +93,12 @@ TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier, if (!ace_mon.locked ()) return; - ace_mon.filter->reconnected (supplier, ACE_TRY_ENV); + ace_mon.filter->reconnected (supplier TAO_ENV_ARG_PARAMETER); } void -TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, this->refcount_, @@ -107,29 +107,29 @@ TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier, if (!ace_mon.locked ()) return; - ace_mon.filter->disconnected (supplier, ACE_TRY_ENV); + ace_mon.filter->disconnected (supplier TAO_ENV_ARG_PARAMETER); } void -TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment &) +TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment &) +TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment &) +TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_ProxyPushConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) { RtecEventComm::PushSupplier_var supplier; @@ -144,14 +144,14 @@ TAO_EC_ProxyPushConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV) if (this->filter_ != 0) { - this->filter_->shutdown (ACE_TRY_ENV); + this->filter_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->cleanup_i (); } } - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -159,7 +159,7 @@ TAO_EC_ProxyPushConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - supplier->disconnect_push_supplier (ACE_TRY_ENV); + supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -186,14 +186,14 @@ TAO_EC_ProxyPushConsumer::cleanup_i (void) } RtecEventChannelAdmin::ProxyPushConsumer_ptr -TAO_EC_ProxyPushConsumer::activate (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_var result; ACE_TRY { result = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -205,17 +205,17 @@ TAO_EC_ProxyPushConsumer::activate (CORBA::Environment &ACE_TRY_ENV) } void -TAO_EC_ProxyPushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ProxyPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -253,8 +253,8 @@ TAO_EC_ProxyPushConsumer::_decr_refcnt (void) void TAO_EC_ProxyPushConsumer::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, - const RtecEventChannelAdmin::SupplierQOS& qos, - CORBA::Environment &ACE_TRY_ENV) + const RtecEventChannelAdmin::SupplierQOS& qos + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)) { @@ -285,7 +285,7 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier ( // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->reconnected (this, ACE_TRY_ENV); + this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -311,12 +311,12 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier ( } // Notify the event channel... - this->event_channel_->connected (this, ACE_TRY_ENV); + this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); } void -TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, @@ -328,13 +328,13 @@ TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event, // No need to keep the lock, the filter_ class is supposed to be // thread safe.... - ace_mon.filter->push (event, ACE_TRY_ENV); + ace_mon.filter->push (event TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_ProxyPushConsumer::disconnect_push_consumer ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventComm::PushSupplier_var supplier; @@ -356,7 +356,7 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer ( } // Notify the event channel... - this->event_channel_->disconnected (this, ACE_TRY_ENV); + this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -368,7 +368,7 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer ( { ACE_TRY { - supplier->disconnect_push_supplier (ACE_TRY_ENV); + supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -381,19 +381,19 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer ( } PortableServer::POA_ptr -TAO_EC_ProxyPushConsumer::_default_POA (CORBA::Environment&) +TAO_EC_ProxyPushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_EC_ProxyPushConsumer::_add_ref (CORBA::Environment &) +TAO_EC_ProxyPushConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_EC_ProxyPushConsumer::_remove_ref (CORBA::Environment &) +TAO_EC_ProxyPushConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index 20a4f41e712..902912a2183 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -62,10 +62,10 @@ public: virtual ~TAO_EC_ProxyPushConsumer (void); /// Activate in the POA - virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - void deactivate (CORBA::Environment &ACE_TRY_ENV); + void deactivate (TAO_ENV_SINGLE_ARG_DECL); /// Return 0 if no supplier is connected... CORBA::Boolean is_connected (void) const; @@ -82,29 +82,29 @@ public: * it is disconnected then it returns true and sets the * <disconnected> flag. */ - CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected + TAO_ENV_ARG_DECL); /// Concrete implementations can use this methods to keep track of /// the consumers interested in this events. - virtual void connected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &env); - virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &env); - virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &env); + virtual void connected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL); + virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL); + virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL); /// Usually implemented as no-ops, but some configurations may /// require this methods. - virtual void connected (TAO_EC_ProxyPushConsumer* consumer, - CORBA::Environment &env); - virtual void reconnected (TAO_EC_ProxyPushConsumer* consumer, - CORBA::Environment &env); - virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer, - CORBA::Environment &env); + virtual void connected (TAO_EC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL); + virtual void reconnected (TAO_EC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL); + virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (CORBA::Environment&); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); /// The QoS (subscription) used to connect to the EC, assumes the /// locks are held, use with care! @@ -117,22 +117,20 @@ public: // = The RtecEventChannelAdmin::ProxyPushConsumer methods... virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, - const RtecEventChannelAdmin::SupplierQOS& qos, - CORBA::Environment &) + const RtecEventChannelAdmin::SupplierQOS& qos + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)); - virtual void push (const RtecEventComm::EventSet& event, - CORBA::Environment &) + virtual void push (const RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env); - virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); - virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: /// Set the supplier, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index e01f8476005..6ceb4cf2028 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -38,55 +38,55 @@ TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void) } void -TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer* consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy *s = this->event_channel_->scheduling_strategy (); s->add_proxy_supplier_dependencies (this, - consumer, - ACE_TRY_ENV); + consumer + TAO_ENV_ARG_PARAMETER); } void -TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushConsumer* consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushConsumer* consumer + TAO_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy *s = this->event_channel_->scheduling_strategy (); s->add_proxy_supplier_dependencies (this, - consumer, - ACE_TRY_ENV); + consumer + TAO_ENV_ARG_PARAMETER); } void -TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer*, - CORBA::Environment &) +TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer* + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment &) +TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment &) +TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment &) +TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) { // Save the consumer we where connected to, we need to send a // disconnect message to it. @@ -106,7 +106,7 @@ TAO_EC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) this->cleanup_i (); } - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer.in ())) @@ -114,7 +114,7 @@ TAO_EC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - consumer->disconnect_push_consumer (ACE_TRY_ENV); + consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -138,14 +138,14 @@ TAO_EC_ProxyPushSupplier::cleanup_i (void) } RtecEventChannelAdmin::ProxyPushSupplier_ptr -TAO_EC_ProxyPushSupplier::activate (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushSupplier_var result; ACE_TRY { result = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -157,17 +157,17 @@ TAO_EC_ProxyPushSupplier::activate (CORBA::Environment &ACE_TRY_ENV) } void -TAO_EC_ProxyPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (()) +TAO_EC_ProxyPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -205,8 +205,8 @@ TAO_EC_ProxyPushSupplier::_decr_refcnt (void) void TAO_EC_ProxyPushSupplier::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, - const RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment &ACE_TRY_ENV) + const RtecEventChannelAdmin::ConsumerQOS& qos + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)) @@ -235,8 +235,8 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer ( this->qos_ = qos; this->child_ = this->event_channel_->filter_builder ()->build (this, - this->qos_, - ACE_TRY_ENV); + this->qos_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->adopt_child (this->child_); @@ -250,7 +250,7 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer ( // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->reconnected (this, ACE_TRY_ENV); + this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -271,20 +271,20 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer ( #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */ this->child_ = this->event_channel_->filter_builder ()->build (this, - this->qos_, - ACE_TRY_ENV); + this->qos_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->adopt_child (this->child_); } // Notify the event channel... - this->event_channel_->connected (this, ACE_TRY_ENV); + this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushSupplier::disconnect_push_supplier ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventComm::PushConsumer_var consumer; @@ -305,7 +305,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier ( } // Notify the event channel.... - this->event_channel_->disconnected (this, ACE_TRY_ENV); + this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!connected) @@ -317,7 +317,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier ( { ACE_TRY { - consumer->disconnect_push_consumer (ACE_TRY_ENV); + consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -332,7 +332,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier ( } void -TAO_EC_ProxyPushSupplier::suspend_connection (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ProxyPushSupplier::suspend_connection (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX ( @@ -345,7 +345,7 @@ TAO_EC_ProxyPushSupplier::suspend_connection (CORBA::Environment &ACE_TRY_ENV) } void -TAO_EC_ProxyPushSupplier::resume_connection (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_ProxyPushSupplier::resume_connection (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX ( @@ -361,8 +361,8 @@ typedef TAO_ESF_Proxy_RefCount_Guard<TAO_EC_Event_Channel,TAO_EC_ProxyPushSuppli int TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { Destroy_Guard auto_destroy (this->refcount_, this->event_channel_, @@ -379,7 +379,7 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event, return 0; result = - this->child_->filter (event, qos_info, ACE_TRY_ENV); + this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return result; @@ -387,8 +387,8 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event, int TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { Destroy_Guard auto_destroy (this->refcount_, this->event_channel_, @@ -405,7 +405,7 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event, return 0; result = - this->child_->filter_nocopy (event, qos_info, ACE_TRY_ENV); + this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return result; @@ -413,8 +413,8 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { // The mutex is already held by the caller (usually the filter() // method) @@ -449,8 +449,8 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, this->event_channel_->dispatching ()->push (this, consumer.in (), event, - qos_info, - ACE_TRY_ENV); + qos_info + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -460,8 +460,8 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, void TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { // The mutex is already held by the caller (usually the filter() // method) @@ -495,8 +495,8 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event, this->event_channel_->dispatching ()->push_nocopy (this, consumer.in (), event, - qos_info, - ACE_TRY_ENV); + qos_info + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -507,8 +507,8 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event, void TAO_EC_ProxyPushSupplier::push_to_consumer ( RtecEventComm::PushConsumer_ptr consumer, - const RtecEventComm::EventSet& event, - CORBA::Environment& ACE_TRY_ENV) + const RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL) { { ACE_GUARD_THROW_EX ( @@ -525,7 +525,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer ( ACE_TRY { - consumer->push (event, ACE_TRY_ENV); + consumer->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) @@ -542,7 +542,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer ( TAO_EC_ConsumerControl *control = this->event_channel_->consumer_control (); - control->consumer_not_exist (this, ACE_TRY_ENV); + control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -561,8 +561,8 @@ TAO_EC_ProxyPushSupplier::push_to_consumer ( this->event_channel_->consumer_control (); control->system_exception (this, - sysex, - ACE_TRY_ENV); + sysex + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -576,12 +576,12 @@ TAO_EC_ProxyPushSupplier::push_to_consumer ( void TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( RtecEventComm::PushConsumer_ptr consumer, - const RtecEventComm::EventSet& event, - CORBA::Environment& ACE_TRY_ENV) + const RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL) { ACE_TRY { - consumer->push (event, ACE_TRY_ENV); + consumer->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) @@ -589,7 +589,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( TAO_EC_ConsumerControl *control = this->event_channel_->consumer_control (); - control->consumer_not_exist (this, ACE_TRY_ENV); + control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -598,8 +598,8 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( this->event_channel_->consumer_control (); control->system_exception (this, - sysex, - ACE_TRY_ENV); + sysex + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_CATCHANY @@ -611,8 +611,8 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( CORBA::Boolean TAO_EC_ProxyPushSupplier::consumer_non_existent ( - CORBA::Boolean_out disconnected, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean_out disconnected + TAO_ENV_ARG_DECL) { CORBA::Object_var consumer; { @@ -632,7 +632,7 @@ TAO_EC_ProxyPushSupplier::consumer_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return consumer->_non_existent (ACE_TRY_ENV); + return consumer->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -669,8 +669,8 @@ TAO_EC_ProxyPushSupplier::can_match ( int TAO_EC_ProxyPushSupplier::add_dependencies ( const RtecEventComm::EventHeader &header, - const TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV) + const TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -678,24 +678,24 @@ TAO_EC_ProxyPushSupplier::add_dependencies ( ACE_CHECK_RETURN (0); return this->child_->add_dependencies (header, - qos_info, - ACE_TRY_ENV); + qos_info + TAO_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_EC_ProxyPushSupplier::_default_POA (CORBA::Environment&) +TAO_EC_ProxyPushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_EC_ProxyPushSupplier::_add_ref (CORBA::Environment &) +TAO_EC_ProxyPushSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_EC_ProxyPushSupplier::_remove_ref (CORBA::Environment &) +TAO_EC_ProxyPushSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index f8cb972796f..7a74c6c5c83 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -62,10 +62,10 @@ public: virtual ~TAO_EC_ProxyPushSupplier (void); /// Activate in the POA - virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (()); + virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()); /// Return 0 if no consumer is connected... CORBA::Boolean is_connected (void) const; @@ -84,55 +84,55 @@ public: /// Concrete implementations can use this methods to keep track of /// the suppliers that publish its events. - virtual void connected (TAO_EC_ProxyPushConsumer *consumer, - CORBA::Environment &env); - virtual void reconnected (TAO_EC_ProxyPushConsumer *consumer, - CORBA::Environment &env); - virtual void disconnected (TAO_EC_ProxyPushConsumer *consumer, - CORBA::Environment &env); + virtual void connected (TAO_EC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL); + virtual void reconnected (TAO_EC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL); + virtual void disconnected (TAO_EC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL); /// Usually implemented as no-ops, but some configurations may /// require this methods. - virtual void connected (TAO_EC_ProxyPushSupplier *supplier, - CORBA::Environment &env); - virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier, - CORBA::Environment &env); - virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier, - CORBA::Environment &env); + virtual void connected (TAO_EC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL); + virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL); + virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (CORBA::Environment &env); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); /// Pushes to the consumer, verifies that it is connected and that it /// is not suspended. void push_to_consumer (RtecEventComm::PushConsumer_ptr consumer, - const RtecEventComm::EventSet &event, - CORBA::Environment &env); + const RtecEventComm::EventSet &event + TAO_ENV_ARG_DECL); void reactive_push_to_consumer (RtecEventComm::PushConsumer_ptr consumer, - const RtecEventComm::EventSet &event, - CORBA::Environment &env); + const RtecEventComm::EventSet &event + TAO_ENV_ARG_DECL); /** * Invoke the _non_existent() pseudo-operation on the consumer. If * it is disconnected then it returns true and sets the * <disconnected> flag. */ - CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected + TAO_ENV_ARG_DECL); // = The RtecEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, - const RtecEventChannelAdmin::ConsumerQOS &qos, - CORBA::Environment &) + const RtecEventChannelAdmin::ConsumerQOS &qos + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void suspend_connection (CORBA::Environment &) + virtual void suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void resume_connection (CORBA::Environment &) + virtual void resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Increment and decrement the reference count. @@ -141,28 +141,28 @@ public: // = The TAO_EC_Filter methods, only push() is implemented... virtual int filter (const RtecEventComm::EventSet &event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment &env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet &event, - TAO_EC_QOS_Info &qos_info, - CORBA::Environment &env); + TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet &event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment &env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet &event, - TAO_EC_QOS_Info &qos_info, - CORBA::Environment &env); + TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader &header) const; virtual int add_dependencies (const RtecEventComm::EventHeader &header, - const TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV); + const TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); - virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV); - virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); protected: /// Set the consumer, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index 588190fd033..7620c20acae 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -36,11 +36,11 @@ TAO_EC_Reactive_ConsumerControl::~TAO_EC_Reactive_ConsumerControl (void) void TAO_EC_Reactive_ConsumerControl::query_consumers ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) { TAO_EC_Ping_Consumer worker (this); - this->event_channel_->consumer_admin ()->for_each (&worker, - ACE_TRY_ENV); + this->event_channel_->consumer_admin ()->for_each (&worker + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -55,27 +55,27 @@ TAO_EC_Reactive_ConsumerControl::handle_timeout ( // the iteration... CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = - this->policy_current_->get_policy_overrides (types, - ACE_TRY_ENV); + this->policy_current_->get_policy_overrides (types + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, - CORBA::ADD_OVERRIDE, - ACE_TRY_ENV); + CORBA::ADD_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Query the state of the consumers... - this->query_consumers (ACE_TRY_ENV); + this->query_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (ACE_TRY_ENV); + policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -101,13 +101,13 @@ TAO_EC_Reactive_ConsumerControl::activate (void) { // Get the PolicyCurrent object CORBA::Object_var tmp = - this->orb_->resolve_initial_references ("PolicyCurrent", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("PolicyCurrent" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = - CORBA::PolicyCurrent::_narrow (tmp.in (), - ACE_TRY_ENV); + CORBA::PolicyCurrent::_narrow (tmp.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -121,8 +121,8 @@ TAO_EC_Reactive_ConsumerControl::activate (void) this->policy_list_[0] = this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - any, - ACE_TRY_ENV); + any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -144,14 +144,14 @@ TAO_EC_Reactive_ConsumerControl::shutdown (void) void TAO_EC_Reactive_ConsumerControl::consumer_not_exist ( - TAO_EC_ProxyPushSupplier *proxy, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_ProxyPushSupplier *proxy + TAO_ENV_ARG_DECL) { ACE_TRY { ACE_DEBUG ((LM_DEBUG, "Consumer %x does not exists\n", long(proxy))); - proxy->disconnect_push_supplier (ACE_TRY_ENV); + proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -166,8 +166,8 @@ TAO_EC_Reactive_ConsumerControl::consumer_not_exist ( void TAO_EC_Reactive_ConsumerControl::system_exception ( TAO_EC_ProxyPushSupplier *proxy, - CORBA::SystemException & /* exception */, - CORBA::Environment &ACE_TRY_ENV) + CORBA::SystemException & /* exception */ + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -181,7 +181,7 @@ TAO_EC_Reactive_ConsumerControl::system_exception ( // return; // Anything else is serious, including timeouts... - proxy->disconnect_push_supplier (ACE_TRY_ENV); + proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -211,25 +211,25 @@ TAO_EC_ConsumerControl_Adapter::handle_timeout ( // **************************************************************** void -TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = - supplier->consumer_non_existent (disconnected, - ACE_TRY_ENV); + supplier->consumer_non_existent (disconnected + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->consumer_not_exist (supplier, ACE_TRY_ENV); + this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->consumer_not_exist (supplier, ACE_TRY_ENV); + this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -237,7 +237,7 @@ TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier, // This is TAO's minor code for a failed connection, we may // want to be more lenient in the future.. // if (transient.minor () == 0x54410085) - this->control_->consumer_not_exist (supplier, ACE_TRY_ENV); + this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h index 4211195af02..eddff6b86c9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h @@ -80,16 +80,16 @@ public: // = Documented in TAO_EC_ConsumerControl virtual int activate (void); virtual int shutdown (void); - virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy, - CORBA::Environment &); + virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy + TAO_ENV_ARG_DECL_NOT_USED); virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy, - CORBA::SystemException &, - CORBA::Environment &); + CORBA::SystemException & + TAO_ENV_ARG_DECL_NOT_USED); private: /// Check if the consumers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_consumers (CORBA::Environment &ACE_TRY_ENV); + void query_consumers (TAO_ENV_SINGLE_ARG_DECL); private: /// The polling rate @@ -121,8 +121,8 @@ class TAO_EC_Ping_Consumer : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier> public: TAO_EC_Ping_Consumer (TAO_EC_ConsumerControl *control); - virtual void work (TAO_EC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV); + virtual void work (TAO_EC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL); private: TAO_EC_ConsumerControl *control_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index b32177cfa8f..85c83d61ef6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -36,11 +36,11 @@ TAO_EC_Reactive_SupplierControl::~TAO_EC_Reactive_SupplierControl (void) void TAO_EC_Reactive_SupplierControl::query_suppliers ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) { TAO_EC_Ping_Supplier worker (this); - this->event_channel_->supplier_admin ()->for_each (&worker, - ACE_TRY_ENV); + this->event_channel_->supplier_admin ()->for_each (&worker + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -55,27 +55,27 @@ TAO_EC_Reactive_SupplierControl::handle_timeout ( // the iteration... CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = - this->policy_current_->get_policy_overrides (types, - ACE_TRY_ENV); + this->policy_current_->get_policy_overrides (types + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, - CORBA::ADD_OVERRIDE, - ACE_TRY_ENV); + CORBA::ADD_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Query the state of the suppliers... - this->query_suppliers (ACE_TRY_ENV); + this->query_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (ACE_TRY_ENV); + policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -101,13 +101,13 @@ TAO_EC_Reactive_SupplierControl::activate (void) { // Get the PolicyCurrent object CORBA::Object_var tmp = - this->orb_->resolve_initial_references ("PolicyCurrent", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("PolicyCurrent" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = - CORBA::PolicyCurrent::_narrow (tmp.in (), - ACE_TRY_ENV); + CORBA::PolicyCurrent::_narrow (tmp.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -121,8 +121,8 @@ TAO_EC_Reactive_SupplierControl::activate (void) this->policy_list_[0] = this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, - any, - ACE_TRY_ENV); + any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -144,14 +144,14 @@ TAO_EC_Reactive_SupplierControl::shutdown (void) void TAO_EC_Reactive_SupplierControl::supplier_not_exist ( - TAO_EC_ProxyPushConsumer *proxy, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_ProxyPushConsumer *proxy + TAO_ENV_ARG_DECL) { ACE_TRY { ACE_DEBUG ((LM_DEBUG, "Supplier %x does not exists\n", long(proxy))); - proxy->disconnect_push_consumer (ACE_TRY_ENV); + proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -164,8 +164,8 @@ TAO_EC_Reactive_SupplierControl::supplier_not_exist ( void TAO_EC_Reactive_SupplierControl::system_exception ( TAO_EC_ProxyPushConsumer *proxy, - CORBA::SystemException & /* exception */, - CORBA::Environment &ACE_TRY_ENV) + CORBA::SystemException & /* exception */ + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -179,7 +179,7 @@ TAO_EC_Reactive_SupplierControl::system_exception ( // return; // Anything else is serious, including timeouts... - proxy->disconnect_push_consumer (ACE_TRY_ENV); + proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -209,25 +209,25 @@ TAO_EC_SupplierControl_Adapter::handle_timeout ( // **************************************************************** void -TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = - consumer->supplier_non_existent (disconnected, - ACE_TRY_ENV); + consumer->supplier_non_existent (disconnected + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->supplier_not_exist (consumer, ACE_TRY_ENV); + this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->supplier_not_exist (consumer, ACE_TRY_ENV); + this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -235,7 +235,7 @@ TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer, // This is TAO's minor code for a failed connection, we may // want to be more lenient in the future.. // if (transient.minor () == 0x54410085) - this->control_->supplier_not_exist (consumer, ACE_TRY_ENV); + this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h index 4d433c04056..ef97e4677df 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h @@ -80,16 +80,16 @@ public: // = Documented in TAO_EC_SupplierControl virtual int activate (void); virtual int shutdown (void); - virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy, - CORBA::Environment &); + virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy + TAO_ENV_ARG_DECL_NOT_USED); virtual void system_exception (TAO_EC_ProxyPushConsumer *proxy, - CORBA::SystemException &, - CORBA::Environment &); + CORBA::SystemException & + TAO_ENV_ARG_DECL_NOT_USED); private: /// Check if the suppliers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_suppliers (CORBA::Environment &ACE_TRY_ENV); + void query_suppliers (TAO_ENV_SINGLE_ARG_DECL); private: /// The polling rate @@ -121,8 +121,8 @@ class TAO_EC_Ping_Supplier : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer> public: TAO_EC_Ping_Supplier (TAO_EC_SupplierControl *control); - virtual void work (TAO_EC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV); + virtual void work (TAO_EC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL); private: TAO_EC_SupplierControl *control_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp index 1526017d97f..6306943ef3f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -55,26 +55,26 @@ TAO_EC_Sched_Filter::size (void) const int TAO_EC_Sched_Filter::filter (const RtecEventComm::EventSet &event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { - return this->body_->filter (event, qos_info, ACE_TRY_ENV); + return this->body_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); } int TAO_EC_Sched_Filter::filter_nocopy (RtecEventComm::EventSet &event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { - return this->body_->filter_nocopy (event, qos_info, ACE_TRY_ENV); + return this->body_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); } // This is private, so we can make it inline in the .cpp file... void -TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { - this->init_rt_info (ACE_TRY_ENV); + this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; qos_info.rt_info = this->rt_info_; @@ -93,8 +93,8 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info, this->scheduler_->priority (this->rt_info_, os_priority, p_subpriority, - p_priority, - ACE_TRY_ENV); + p_priority + TAO_ENV_ARG_PARAMETER); ACE_CHECK; qos_info.preemption_priority = p_priority; } @@ -103,30 +103,30 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info, void TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { if (this->parent () != 0) { - this->compute_qos_info (qos_info, ACE_TRY_ENV); + this->compute_qos_info (qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->parent ()->push (event, qos_info, ACE_TRY_ENV); + this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_EC_Sched_Filter::push_nocopy (RtecEventComm::EventSet &event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { if (this->parent () != 0) { - this->compute_qos_info (qos_info, ACE_TRY_ENV); + this->compute_qos_info (qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV); + this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -151,26 +151,26 @@ TAO_EC_Sched_Filter::can_match (const RtecEventComm::EventHeader& header) const int TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV) + const TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL) { - this->init_rt_info (ACE_TRY_ENV); + this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); int matches = this->body_->add_dependencies (header, - qos_info, - ACE_TRY_ENV); + qos_info + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (matches != 0) { this->scheduler_->add_dependency (this->rt_info_, qos_info.rt_info, 1, - RtecBase::TWO_WAY_CALL, - ACE_TRY_ENV); + RtecBase::TWO_WAY_CALL + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::RT_Info_var info = - this->scheduler_->get (qos_info.rt_info, ACE_TRY_ENV); + this->scheduler_->get (qos_info.rt_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), @@ -180,24 +180,24 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header, ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - (*i)->add_dependencies (header, qos_info, ACE_TRY_ENV); + (*i)->add_dependencies (header, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 0; } void -TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { - this->init_rt_info (ACE_TRY_ENV); + this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; qos_info.rt_info = this->rt_info_; } void -TAO_EC_Sched_Filter::init_rt_info (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) { if (this->rt_info_computed_) return; @@ -213,8 +213,8 @@ TAO_EC_Sched_Filter::init_rt_info (CORBA::Environment &ACE_TRY_ENV) RtecScheduler::VERY_LOW_IMPORTANCE, 0, // quantum 0, // threads - this->info_type_, - ACE_TRY_ENV); + this->info_type_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; #if 0 @@ -224,17 +224,17 @@ TAO_EC_Sched_Filter::init_rt_info (CORBA::Environment &ACE_TRY_ENV) TAO_EC_Filter* filter = *i; TAO_EC_QOS_Info child; - filter->get_qos_info (child, ACE_TRY_ENV); + filter->get_qos_info (child TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->scheduler_->add_dependency (this->rt_info_, child.rt_info, 1, - RtecBase::TWO_WAY_CALL, - ACE_TRY_ENV); + RtecBase::TWO_WAY_CALL + TAO_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (child.rt_info, ACE_TRY_ENV); + this->scheduler_->get (child.rt_info TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), @@ -249,12 +249,12 @@ TAO_EC_Sched_Filter::init_rt_info (CORBA::Environment &ACE_TRY_ENV) this->scheduler_->add_dependency (this->rt_info_, this->body_info_, 1, - RtecBase::TWO_WAY_CALL, - ACE_TRY_ENV); + RtecBase::TWO_WAY_CALL + TAO_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (this->body_info_, ACE_TRY_ENV); + this->scheduler_->get (this->body_info_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), @@ -266,12 +266,12 @@ TAO_EC_Sched_Filter::init_rt_info (CORBA::Environment &ACE_TRY_ENV) this->scheduler_->add_dependency (this->parent_info_, this->rt_info_, 1, - RtecBase::TWO_WAY_CALL, - ACE_TRY_ENV); + RtecBase::TWO_WAY_CALL + TAO_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (this->parent_info_, ACE_TRY_ENV); + this->scheduler_->get (this->parent_info_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h index f0f63b3f37c..69accbb1460 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h @@ -63,25 +63,25 @@ public: virtual ChildrenIterator end (void) const; virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV); - virtual void get_qos_info (TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV); + const TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL); + virtual void get_qos_info (TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Sched_Filter @@ -90,11 +90,11 @@ private: (const TAO_EC_Sched_Filter&)) /// Initialize our RT_Info handle and dependencies - void init_rt_info (CORBA::Environment& env); + void init_rt_info (TAO_ENV_SINGLE_ARG_DECL); /// Compute a new qos_info to push up. - void compute_qos_info (TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV); + void compute_qos_info (TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); private: /// The RT_Info handle for this object diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 00d03d647ef..5f81a9b265a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -22,26 +22,26 @@ TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder (void) TAO_EC_Filter* TAO_EC_Sched_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *supplier, - RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment &ACE_TRY_ENV) const + RtecEventChannelAdmin::ConsumerQOS& qos + TAO_ENV_ARG_DECL) const { CORBA::ULong pos = 0; CORBA::Object_var tmp = this->event_channel_->scheduler (); RtecScheduler::Scheduler_var scheduler = - RtecScheduler::Scheduler::_narrow (tmp.in (), ACE_TRY_ENV); + RtecScheduler::Scheduler::_narrow (tmp.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // @@ How do we figure out which parent??? RtecScheduler::handle_t parent_info = - scheduler->lookup ("Dispatching_Task-250000.us", ACE_TRY_ENV); + scheduler->lookup ("Dispatching_Task-250000.us" TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->recursive_build (supplier, qos, pos, scheduler.in (), - parent_info, - ACE_TRY_ENV); + parent_info + TAO_ENV_ARG_PARAMETER); } TAO_EC_Filter* @@ -50,8 +50,8 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( RtecEventChannelAdmin::ConsumerQOS& qos, CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, - RtecScheduler::handle_t parent_info, - CORBA::Environment& ACE_TRY_ENV) const + RtecScheduler::handle_t parent_info + TAO_ENV_ARG_DECL) const { const RtecEventComm::Event& e = qos.dependencies[pos].event; @@ -60,12 +60,12 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( CORBA::ULong npos = pos; ACE_CString name; this->recursive_name (qos, npos, - scheduler, name, - ACE_TRY_ENV); + scheduler, name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::handle_t rt_info = - scheduler->create (name.c_str (), ACE_TRY_ENV); + scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); pos++; // Consume the designator @@ -77,8 +77,8 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( { children[i] = this->recursive_build (supplier, qos, pos, scheduler, - rt_info, - ACE_TRY_ENV); + rt_info + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -94,7 +94,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( RtecScheduler::CONJUNCTION), 0); TAO_EC_QOS_Info qos_info; - filter->get_qos_info (qos_info, ACE_TRY_ENV); + filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER); // @@ ACE_CHECK_RETURN (0); return filter; @@ -105,12 +105,12 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( CORBA::ULong npos = pos; ACE_CString name; this->recursive_name (qos, npos, - scheduler, name, - ACE_TRY_ENV); + scheduler, name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::handle_t rt_info = - scheduler->create (name.c_str (), ACE_TRY_ENV); + scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); pos++; // Consume the designator @@ -122,8 +122,8 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( { children[i] = this->recursive_build (supplier, qos, pos, scheduler, - rt_info, - ACE_TRY_ENV); + rt_info + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } TAO_EC_Sched_Filter *filter; @@ -139,7 +139,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( 0); TAO_EC_QOS_Info qos_info; - filter->get_qos_info (qos_info, ACE_TRY_ENV); + filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER); // @@ ACE_CHECK_RETURN (0); return filter; @@ -161,7 +161,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( TAO_EC_QOS_Info qos_info; qos_info.rt_info = - scheduler->create (name.c_str (), ACE_TRY_ENV); + scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Convert the time to the proper units.... @@ -178,15 +178,15 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( RtecScheduler::VERY_LOW_IMPORTANCE, 0, // quantum 1, // threads - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); scheduler->add_dependency (qos_info.rt_info, parent_info, 1, - RtecBase::TWO_WAY_CALL, - ACE_TRY_ENV); + RtecBase::TWO_WAY_CALL + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return new TAO_EC_Timeout_Filter (this->event_channel_, @@ -199,14 +199,14 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info; RtecScheduler::RT_Info_var info = - scheduler->get (body_info, ACE_TRY_ENV); + scheduler->get (body_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_CString name = info->entry_point.in (); name += "#rep"; RtecScheduler::handle_t rt_info = - scheduler->create (name.c_str (), ACE_TRY_ENV); + scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); pos++; @@ -222,7 +222,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( 0); TAO_EC_QOS_Info qos_info; - filter->get_qos_info (qos_info, ACE_TRY_ENV); + filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER); // @@ ACE_CHECK_RETURN (0); return filter; @@ -233,8 +233,8 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( RtecEventChannelAdmin::ConsumerQOS& qos, CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, - ACE_CString& name, - CORBA::Environment& ACE_TRY_ENV) const + ACE_CString& name + TAO_ENV_ARG_DECL) const { const RtecEventComm::Event& e = qos.dependencies[pos].event; @@ -248,8 +248,8 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( ACE_CString child_name; this->recursive_name (qos, pos, scheduler, - child_name, - ACE_TRY_ENV); + child_name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (i == 0) @@ -273,8 +273,8 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( this->recursive_name (qos, pos, scheduler, - child_name, - ACE_TRY_ENV); + child_name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (i == 0) @@ -305,7 +305,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info; RtecScheduler::RT_Info_var info = - scheduler->get (body_info, ACE_TRY_ENV); + scheduler->get (body_info TAO_ENV_ARG_PARAMETER); ACE_CHECK; name = info->entry_point.in (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h index ddf3604bc51..138c02e7d04 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h @@ -47,8 +47,8 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, - RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment &env) const; + RtecEventChannelAdmin::ConsumerQOS& qos + TAO_ENV_ARG_DECL) const; private: /// Recursively build the filter tree. @@ -56,15 +56,15 @@ private: RtecEventChannelAdmin::ConsumerQOS& qos, CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, - RtecScheduler::handle_t parent_info, - CORBA::Environment& env) const; + RtecScheduler::handle_t parent_info + TAO_ENV_ARG_DECL) const; /// Build the name recursively... void recursive_name (RtecEventChannelAdmin::ConsumerQOS& qos, CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, - ACE_CString &name, - CORBA::Environment& env) const; + ACE_CString &name + TAO_ENV_ARG_DECL) const; /// Count the number of children of the current node, i.e. until a /// conjunction or disjunction starts. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h index f846795fe9d..c48249cfa81 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h @@ -47,16 +47,16 @@ public: /// Add all the dependencies between <supplier> and <consumer> virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, - TAO_EC_ProxyPushConsumer *consumer, - CORBA::Environment &ACE_TRY_ENV) = 0; + TAO_EC_ProxyPushConsumer *consumer + TAO_ENV_ARG_DECL) = 0; /// Initializes <qos_info> based on the QoS information for /// <consumer> and the event header. virtual void init_event_qos ( const RtecEventComm::EventHeader& header, TAO_EC_ProxyPushConsumer *consumer, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment &ACE_TRY_ENV) = 0; + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) = 0; }; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index 56a2367174b..b58780478d0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -26,14 +26,14 @@ TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void) } RtecEventChannelAdmin::ProxyPushConsumer_ptr -TAO_EC_SupplierAdmin::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_EC_SupplierAdmin::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obtain (ACE_TRY_ENV); + return this->obtain (TAO_ENV_SINGLE_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_EC_SupplierAdmin::_default_POA (CORBA::Environment&) +TAO_EC_SupplierAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h index 5276ac001f3..73e32e18315 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h @@ -50,11 +50,11 @@ public: // = The RtecEventChannelAdmin::SupplierAdmin methods... virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (CORBA::Environment &) + obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); private: /// Store the default POA. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp index 53c3e2ddd6e..f80673b22f0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp @@ -29,8 +29,8 @@ TAO_EC_SupplierControl::shutdown (void) } void -TAO_EC_SupplierControl::supplier_not_exist (TAO_EC_ProxyPushConsumer *, - CORBA::Environment &) +TAO_EC_SupplierControl::supplier_not_exist (TAO_EC_ProxyPushConsumer * + TAO_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h index 85603bc872e..8c1594f11c5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h @@ -55,8 +55,8 @@ public: * not exists (i.e. _non_existent() returns true and/or the * CORBA::OBJECT_NOT_EXIST exception has been raised). */ - virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy, - CORBA::Environment &); + virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy + TAO_ENV_ARG_DECL_NOT_USED); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp index 54573aa5844..180cf20432c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp @@ -17,9 +17,9 @@ TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void) // **************************************************************** void -TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL) { TAO_EC_QOS_Info qos_info = this->event_info_; - supplier->filter (this->event_, qos_info, ACE_TRY_ENV); + supplier->filter (this->event_, qos_info TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h index d31a3e4081d..5f91240be13 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h @@ -89,20 +89,20 @@ public: /// Concrete implementations can use this methods to keep track of /// the consumers interested in this events. - virtual void connected (TAO_EC_ProxyPushSupplier *supplier, - CORBA::Environment &env) = 0; - virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier, - CORBA::Environment &env) = 0; - virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier, - CORBA::Environment &env) = 0; + virtual void connected (TAO_EC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL) = 0; + virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL) = 0; + virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL) = 0; /// The event channel is shutting down. - virtual void shutdown (CORBA::Environment &env) = 0; + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0; /// The ProxyPushConsumer delegates on this class to actually send /// the event. - virtual void push (const RtecEventComm::EventSet &event, - CORBA::Environment &) = 0; + virtual void push (const RtecEventComm::EventSet &event + TAO_ENV_ARG_DECL_NOT_USED) = 0; /// Increment and decrement the reference count, locking must be /// provided by the user. @@ -118,8 +118,8 @@ public: TAO_EC_Filter_Worker (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info); - virtual void work (TAO_EC_ProxyPushSupplier *supplier, - CORBA::Environment &ACE_TRY_ENV); + virtual void work (TAO_EC_ProxyPushSupplier *supplier + TAO_ENV_ARG_DECL); private: /// The event we push on each case, use a reference to avoid copies. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index ab0ff6a1301..0753bd74bcc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -65,26 +65,26 @@ TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter (void) void TAO_EC_Timeout_Filter::push_to_proxy (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { qos_info.timer_id_ = this->id_; if (this->supplier_ != 0) this->supplier_->filter (event, - qos_info, - ACE_TRY_ENV); + qos_info + TAO_ENV_ARG_PARAMETER); } int TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event, - TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL) { if (qos_info.timer_id_ == this->id_ && this->parent () != 0) { - this->parent ()->push (event, qos_info, ACE_TRY_ENV); + this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -93,13 +93,13 @@ TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event, int TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event, - TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV) + TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL) { if (qos_info.timer_id_ == this->id_ && this->parent () != 0) { - this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV); + this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -108,15 +108,15 @@ TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event, void TAO_EC_Timeout_Filter::push (const RtecEventComm::EventSet&, - TAO_EC_QOS_Info&, - CORBA::Environment&) + TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Timeout_Filter::push_nocopy (RtecEventComm::EventSet&, - TAO_EC_QOS_Info&, - CORBA::Environment&) + TAO_EC_QOS_Info& + TAO_ENV_ARG_DECL_NOT_USED) { } @@ -158,8 +158,8 @@ TAO_EC_Timeout_Filter::can_match ( int TAO_EC_Timeout_Filter::add_dependencies ( const RtecEventComm::EventHeader&, - const TAO_EC_QOS_Info &, - CORBA::Environment &) + const TAO_EC_QOS_Info & + TAO_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h index 7b3a151eabd..a0cb386b195 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h @@ -56,29 +56,29 @@ public: /// Callback from the Timeout_Generator void push_to_proxy (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); // = The TAO_EC_Filter methods, please check the documentation in // TAO_EC_Filter. virtual int filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV); + const TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Timeout_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index 93176469a1e..8ee6be22be4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -41,8 +41,8 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */, TAO_EC_QOS_Info qos_info = filter->qos_info (); filter->push_to_proxy (single_event, - qos_info, - ACE_TRY_ENV); + qos_info + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp index 807af16d1ca..53fb0cb99cf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp @@ -32,31 +32,31 @@ TAO_EC_Trivial_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer*) } void -TAO_EC_Trivial_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment &) +TAO_EC_Trivial_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_Trivial_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment &) +TAO_EC_Trivial_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier*, - CORBA::Environment &) +TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* + TAO_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_Trivial_Supplier_Filter::shutdown (CORBA::Environment &) +TAO_EC_Trivial_Supplier_Filter::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { } void -TAO_EC_Trivial_Supplier_Filter::push (const RtecEventComm::EventSet& event, - CORBA::Environment &ACE_TRY_ENV) +TAO_EC_Trivial_Supplier_Filter::push (const RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL) { TAO_EC_ConsumerAdmin* consumer_admin = this->event_channel_->consumer_admin (); @@ -71,7 +71,7 @@ TAO_EC_Trivial_Supplier_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info qos_info; TAO_EC_Filter_Worker worker (single_event, qos_info); - consumer_admin->for_each (&worker, ACE_TRY_ENV); + consumer_admin->for_each (&worker TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h index 75bc401ab2c..d1cc5818e4c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h @@ -47,15 +47,15 @@ public: // = The TAO_EC_Supplier_Filter methods. virtual void bind (TAO_EC_ProxyPushConsumer* consumer); virtual void unbind (TAO_EC_ProxyPushConsumer* consumer); - virtual void connected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &env); - virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &env); - virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier, - CORBA::Environment &env); - virtual void shutdown (CORBA::Environment &env); - virtual void push (const RtecEventComm::EventSet& event, - CORBA::Environment &); + virtual void connected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL); + virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL); + virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier + TAO_ENV_ARG_DECL); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void push (const RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL_NOT_USED); virtual CORBA::ULong _decr_refcnt (void); virtual CORBA::ULong _incr_refcnt (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp index 5bae518f6ea..cdda4fefccd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -15,8 +15,8 @@ TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header int TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { // @@ It this the right way to do this? if (event.length () != 1) @@ -24,7 +24,7 @@ TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event, if (this->can_match (event[0].header)) { - this->push (event, qos_info, ACE_TRY_ENV); + this->push (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -33,8 +33,8 @@ TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { // @@ It this the right way to do this? if (event.length () != 1) @@ -42,7 +42,7 @@ TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, if (this->can_match (event[0].header)) { - this->push_nocopy (event, qos_info, ACE_TRY_ENV); + this->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -51,20 +51,20 @@ TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Type_Filter::push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info, ACE_TRY_ENV); + this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); } void TAO_EC_Type_Filter::push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& ACE_TRY_ENV) + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV); + this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); } void @@ -117,8 +117,8 @@ TAO_EC_Type_Filter::can_match ( int TAO_EC_Type_Filter::add_dependencies ( const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info &, - CORBA::Environment &) + const TAO_EC_QOS_Info & + TAO_ENV_ARG_DECL_NOT_USED) { return this->can_match (header); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h index d5a1ef62aab..70e0434fc83 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h @@ -40,23 +40,23 @@ public: // = The TAO_EC_Filter methods, please check the documentation in // TAO_EC_Filter. virtual int filter (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, - TAO_EC_QOS_Info& qos_info, - CORBA::Environment& env); + TAO_EC_QOS_Info& qos_info + TAO_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, - const TAO_EC_QOS_Info &qos_info, - CORBA::Environment &ACE_TRY_ENV); + const TAO_EC_QOS_Info &qos_info + TAO_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Type_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index 5c3aef55cbd..06f5cf18acb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp @@ -15,8 +15,8 @@ TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer (void) void TAO_EC_Simple_AddrServer::get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr, - CORBA::Environment&) + RtecUDPAdmin::UDP_Addr_out addr + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { addr.ipaddr = header.type; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h index 8cddee5b51b..e59d2951f33 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h @@ -43,8 +43,8 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr, - CORBA::Environment& env) + RtecUDPAdmin::UDP_Addr_out addr + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp index 49d99ff8966..c45aae1d021 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp @@ -159,8 +159,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Event_Channel_Timeprobe_Description, static RtecScheduler::Preemption_Priority_t Preemption_Priority (RtecScheduler::Scheduler_ptr scheduler, - RtecScheduler::handle_t rtinfo, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::handle_t rtinfo + TAO_ENV_ARG_DECL) { RtecScheduler::OS_Priority thread_priority; RtecScheduler::Preemption_Subpriority_t subpriority; @@ -173,15 +173,15 @@ Preemption_Priority (RtecScheduler::Scheduler_ptr scheduler, (rtinfo, thread_priority, subpriority, - preemption_priority, - ACE_TRY_ENV); + preemption_priority + TAO_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server ()->priority (rtinfo, thread_priority, subpriority, - preemption_priority, - ACE_TRY_ENV); + preemption_priority + TAO_ENV_ARG_PARAMETER); #endif ACE_CHECK_RETURN (0); return preemption_priority; @@ -231,7 +231,7 @@ public: ACE_Scheduler_MIN_PREEMPTION_PRIORITY; while (iter.advance_dependency () == 0) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { RtecEventComm::EventType &type = (*iter).event.header.type; @@ -241,8 +241,8 @@ public: type != ACE_ES_DISJUNCTION_DESIGNATOR) { RtecScheduler::Preemption_Priority_t q = - ::Preemption_Priority (scheduler, (*iter).rt_info, - ACE_TRY_ENV); + ::Preemption_Priority (scheduler, (*iter).rt_info + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (rt_info_ == 0 || q < p) { @@ -324,11 +324,11 @@ public: virtual int execute (void* /* arg = 0 */) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { ACE_ES_Dispatch_Request *request = request_; - dispatching_module_->push (request, ACE_TRY_ENV); + dispatching_module_->push (request TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; delete this; } @@ -367,8 +367,8 @@ ACE_Push_Supplier_Proxy::ACE_Push_Supplier_Proxy (ACE_ES_Supplier_Module *sm) void ACE_Push_Supplier_Proxy::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, - const RtecEventChannelAdmin::SupplierQOS &qos, - CORBA::Environment &ACE_TRY_ENV) + const RtecEventChannelAdmin::SupplierQOS &qos + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)) { @@ -391,12 +391,12 @@ ACE_Push_Supplier_Proxy::connect_push_supplier ( // not work: it usually results in some form of dead-lock. this->source_id_ = qos_.publications[0].event.header.source; - supplier_module_->connected (this, ACE_TRY_ENV); + supplier_module_->connected (this TAO_ENV_ARG_PARAMETER); } void -ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event, - CORBA::Environment &ACE_TRY_ENV) +ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TIMEPROBE (TAO_EVENT_CHANNEL_ENTER_PUSH_SUPPLIER_PROXY_PUSH); @@ -413,14 +413,14 @@ ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event, ACE_const_cast (RtecEventComm::EventSet&, event); this->time_stamp (copy); - this->supplier_module_->push (this, copy, ACE_TRY_ENV); + this->supplier_module_->push (this, copy TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else { RtecEventComm::EventSet copy = event; this->time_stamp (copy); - this->supplier_module_->push (this, copy, ACE_TRY_ENV); + this->supplier_module_->push (this, copy TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -442,14 +442,14 @@ ACE_Push_Supplier_Proxy::time_stamp (RtecEventComm::EventSet& event) void ACE_Push_Supplier_Proxy::disconnect_push_consumer ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TIMEPROBE_PRINT; if (this->connected ()) { this->push_supplier_ = 0; - this->supplier_module_->disconnecting (this, ACE_TRY_ENV); + this->supplier_module_->disconnecting (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -457,10 +457,10 @@ ACE_Push_Supplier_Proxy::disconnect_push_consumer ( void ACE_Push_Supplier_Proxy::shutdown (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - push_supplier_->disconnect_push_supplier (ACE_TRY_ENV); + push_supplier_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -482,8 +482,8 @@ ACE_Push_Consumer_Proxy::~ACE_Push_Consumer_Proxy (void) } void -ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events, - CORBA::Environment &ACE_TRY_ENV) +ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL) { ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_EVENT_TO_CONSUMER_PROXY); @@ -494,15 +494,15 @@ ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events, return; } - push_consumer_->push (events, ACE_TRY_ENV); + push_consumer_->push (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void ACE_Push_Consumer_Proxy::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, - const RtecEventChannelAdmin::ConsumerQOS &qos, - CORBA::Environment &ACE_TRY_ENV) + const RtecEventChannelAdmin::ConsumerQOS &qos + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)) @@ -523,28 +523,28 @@ ACE_Push_Consumer_Proxy::connect_push_consumer ( // ACE_ConsumerQOS_Factory::debug (qos_); - this->consumer_module_->connected (this, ACE_TRY_ENV); + this->consumer_module_->connected (this TAO_ENV_ARG_PARAMETER); } void ACE_Push_Consumer_Proxy::disconnect_push_supplier ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TIMEPROBE_PRINT; this->push_consumer_ = RtecEventComm::PushConsumer::_nil (); - this->consumer_module_->disconnecting (this, ACE_TRY_ENV); + this->consumer_module_->disconnecting (this TAO_ENV_ARG_PARAMETER); } void -ACE_Push_Consumer_Proxy::suspend_connection (CORBA::Environment &) +ACE_Push_Consumer_Proxy::suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { correlation_.suspend (); } void -ACE_Push_Consumer_Proxy::resume_connection (CORBA::Environment &) +ACE_Push_Consumer_Proxy::resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { correlation_.resume (); @@ -553,10 +553,10 @@ ACE_Push_Consumer_Proxy::resume_connection (CORBA::Environment &) void ACE_Push_Consumer_Proxy::shutdown (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - this->push_consumer_->disconnect_push_consumer (ACE_TRY_ENV); + this->push_consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -644,10 +644,10 @@ ACE_EventChannel::~ACE_EventChannel (void) // @@ This should go away, it is too late to raise a CORBA // exception, at this point we should only be cleaning up memory, // not sending messages. - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - this->destroy (ACE_TRY_ENV); + this->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -674,7 +674,7 @@ ACE_EventChannel::~ACE_EventChannel (void) } void -ACE_EventChannel::destroy (CORBA::Environment &) +ACE_EventChannel::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { { @@ -766,28 +766,28 @@ ACE_EventChannel::report_disconnect_i (u_long event) } void -ACE_EventChannel::add_gateway (TAO_EC_Gateway* gw, - CORBA::Environment& ACE_TRY_ENV) +ACE_EventChannel::add_gateway (TAO_EC_Gateway* gw + TAO_ENV_ARG_DECL) { - RtecEventChannelAdmin::Observer_var observer = gw->_this (ACE_TRY_ENV); + RtecEventChannelAdmin::Observer_var observer = gw->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - gw->observer_handle (this->append_observer (observer.in (), ACE_TRY_ENV)); + gw->observer_handle (this->append_observer (observer.in () TAO_ENV_ARG_PARAMETER)); ACE_CHECK; } void -ACE_EventChannel::del_gateway (TAO_EC_Gateway* gw, - CORBA::Environment& ACE_TRY_ENV) +ACE_EventChannel::del_gateway (TAO_EC_Gateway* gw + TAO_ENV_ARG_DECL) { - this->remove_observer (gw->observer_handle (), ACE_TRY_ENV); + this->remove_observer (gw->observer_handle () TAO_ENV_ARG_PARAMETER); ACE_CHECK; gw->observer_handle (0); } void -ACE_EventChannel::update_consumer_gwys (CORBA::Environment& ACE_TRY_ENV) +ACE_EventChannel::update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL) { Observer_Map observers; { @@ -818,13 +818,13 @@ ACE_EventChannel::update_consumer_gwys (CORBA::Environment& ACE_TRY_ENV) i != observers.end (); ++i) { - (*i).int_id_.observer->update_consumer (c_qos, ACE_TRY_ENV); + (*i).int_id_.observer->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -ACE_EventChannel::update_supplier_gwys (CORBA::Environment& ACE_TRY_ENV) +ACE_EventChannel::update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL) { Observer_Map observers; { @@ -854,14 +854,14 @@ ACE_EventChannel::update_supplier_gwys (CORBA::Environment& ACE_TRY_ENV) i != observers.end (); ++i) { - (*i).int_id_.observer->update_supplier (s_qos, ACE_TRY_ENV); + (*i).int_id_.observer->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } RtecEventChannelAdmin::Observer_Handle -ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs, - CORBA::Environment &ACE_TRY_ENV) +ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -882,20 +882,20 @@ ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs, RtecEventChannelAdmin::ConsumerQOS c_qos; this->consumer_module_->fill_qos (c_qos); - obs->update_consumer (c_qos, ACE_TRY_ENV); + obs->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecEventChannelAdmin::SupplierQOS s_qos; this->supplier_module_->fill_qos (s_qos); - obs->update_supplier (s_qos, ACE_TRY_ENV); + obs->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return entry.handle; } void -ACE_EventChannel::remove_observer (RtecEventChannelAdmin::Observer_Handle h, - CORBA::Environment &ACE_TRY_ENV) +ACE_EventChannel::remove_observer (RtecEventChannelAdmin::Observer_Handle h + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -932,22 +932,22 @@ ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info, RtecScheduler::handle_t timer_rtinfo = this->timer_module ()->rt_info (preemption_priority); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { #if 1 this->scheduler_->add_dependency (rt_info, timer_rtinfo, 1, - RtecBase::ONE_WAY_CALL, - ACE_TRY_ENV); + RtecBase::ONE_WAY_CALL + TAO_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency (rt_info, timer_rtinfo, 1, - RtecBase::ONE_WAY_CALL, - ACE_TRY_ENV); + RtecBase::ONE_WAY_CALL + TAO_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -1251,19 +1251,19 @@ ACE_ES_Consumer_Module::open (ACE_ES_Dispatching_Module *down) } void -ACE_ES_Consumer_Module::connected (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &ACE_TRY_ENV) +ACE_ES_Consumer_Module::connected (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, // "EC (%t) Consumer_Module - connecting consumer %x\n", // consumer)); this->channel_->report_connect (ACE_EventChannel::CONSUMER); - this->down_->connected (consumer, ACE_TRY_ENV); + this->down_->connected (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!consumer->qos ().is_gateway) - this->channel_->update_consumer_gwys (ACE_TRY_ENV); + this->channel_->update_consumer_gwys (TAO_ENV_SINGLE_ARG_PARAMETER); } void @@ -1286,12 +1286,12 @@ ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request) // Deactivate the consumer proxy PortableServer::POA_var poa = - sc->consumer ()->_default_POA (ACE_TRY_ENV); + sc->consumer ()->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (sc->consumer (), ACE_TRY_ENV); + poa->servant_to_id (sc->consumer () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Delete the consumer proxy, no need to delete it, is is owned @@ -1299,7 +1299,7 @@ ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request) // delete sc->consumer (); if (!dont_update) - this->channel_->update_consumer_gwys (ACE_TRY_ENV); + this->channel_->update_consumer_gwys (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_GUARD_THROW_EX ( @@ -1347,7 +1347,7 @@ ACE_ES_Consumer_Module::shutdown (void) { Consumer_Iterator iter (copy); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { for (ACE_Push_Consumer_Proxy **proxy = 0; @@ -1359,12 +1359,12 @@ ACE_ES_Consumer_Module::shutdown (void) // servant. // Deactivate the proxy... PortableServer::POA_var poa = - (*proxy)->_default_POA (ACE_TRY_ENV); + (*proxy)->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (*proxy, ACE_TRY_ENV); + poa->servant_to_id (*proxy TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Remove the consumer from our list. @@ -1393,8 +1393,8 @@ DONE: } void -ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &ACE_TRY_ENV) +ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL) { { ACE_GUARD_THROW_EX ( @@ -1411,7 +1411,7 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer, // etc. However, messages may still be queued in the ReactorEx or // in the Dispatching Module for this consumer, so no queues or // proxies can be deleted just yet. - down_->disconnecting (consumer, ACE_TRY_ENV); + down_->disconnecting (consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Send a shutdown message through the system. When this is @@ -1458,8 +1458,8 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer, // copy the event set to be queued. Or a same address-space consumer // can read the set we allocated off the stack. void -ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request, - CORBA::Environment &ACE_TRY_ENV) +ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request + TAO_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "EC (%t) Consumer_Module::push\n")); @@ -1478,12 +1478,12 @@ ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request, ORBSVCS_Time::hrtime_to_TimeT (ev.header.ec_send_time, ec_send); } #endif /* TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS */ - request->consumer ()->push (event_set, ACE_TRY_ENV); + request->consumer ()->push (event_set TAO_ENV_ARG_PARAMETER); } RtecEventChannelAdmin::ProxyPushSupplier_ptr ACE_ES_Consumer_Module::obtain_push_supplier ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushSupplier_ptr proxy = @@ -1510,7 +1510,7 @@ ACE_ES_Consumer_Module::obtain_push_supplier ( ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Module insert failed.\n")); } - proxy = new_consumer->_this (ACE_TRY_ENV); + proxy = new_consumer->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxy); // Give away ownership to the POA.... @@ -1621,8 +1621,8 @@ ACE_ES_Correlation_Module::open (ACE_ES_Dispatching_Module *up, } void -ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &ACE_TRY_ENV) +ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL) { // Initialize the consumer correlation filter. if (consumer->correlation ().connected (consumer, this) == -1) @@ -1630,8 +1630,8 @@ ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer, } void -ACE_ES_Correlation_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &) +ACE_ES_Correlation_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL_NOT_USED) { if (consumer->correlation ().disconnecting () == -1) ACE_ERROR ((LM_ERROR, @@ -1652,8 +1652,8 @@ ACE_ES_Correlation_Module::unsubscribe (ACE_ES_Consumer_Rep *cr) void ACE_ES_Correlation_Module::push (ACE_ES_Consumer_Rep *consumer, - const TAO_EC_Event& event, - CORBA::Environment &ACE_TRY_ENV) + const TAO_EC_Event& event + TAO_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "EC (%t) Correlation_Module::push\n")); @@ -1666,7 +1666,7 @@ ACE_ES_Correlation_Module::push (ACE_ES_Consumer_Rep *consumer, // we need to push the event now. if (request != 0) { - up_->push (request, ACE_TRY_ENV); + up_->push (request TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1814,7 +1814,7 @@ ACE_ES_Consumer_Correlation::~ACE_ES_Consumer_Correlation (void) } void -ACE_ES_Consumer_Correlation::disconnect_push_supplier (CORBA::Environment &) +ACE_ES_Consumer_Correlation::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->connected_ = 0; @@ -2169,10 +2169,10 @@ ACE_ES_Consumer_Correlation::disconnecting (void) // If we were forwarding events, disconnect as a supplier. if (connected_) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - channel_->disconnect_push_consumer (ACE_TRY_ENV); + channel_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2336,14 +2336,14 @@ ACE_ES_Consumer_Rep_Timeout::execute (void* /* arg */) ACE_TIMEPROBE (TAO_EVENT_CHANNEL_CONSUMER_REP_TIMEOUT_EXECUTE); if (this->receiving_events ()) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { ACE_Time_Value tv = ACE_OS::gettimeofday (); ORBSVCS_Time::Time_Value_to_TimeT (this->timeout_event_.header ().creation_time, tv); correlation_->correlation_module_->push (this, - this->timeout_event_, - ACE_TRY_ENV); + this->timeout_event_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2384,8 +2384,8 @@ ACE_ES_Subscription_Module::~ACE_ES_Subscription_Module (void) // starting with any consumers having a type-based subscription in the // global type collection. void -ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier, - CORBA::Environment &ACE_TRY_ENV) +ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier + TAO_ENV_ARG_DECL) { RtecEventComm::EventSourceID sid = 0; // We will record the source_id for later usage. @@ -2462,15 +2462,15 @@ ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier, ((*proxy)->dependency()->rt_info, new_subscribers->dependency_info_->rt_info, new_subscribers->dependency_info_->number_of_calls, - RtecBase::ONE_WAY_CALL, - ACE_TRY_ENV); + RtecBase::ONE_WAY_CALL + TAO_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency ((*proxy)->dependency()->rt_info, new_subscribers->dependency_info_->rt_info, new_subscribers->dependency_info_->number_of_calls, - RtecBase::ONE_WAY_CALL, - ACE_TRY_ENV); + RtecBase::ONE_WAY_CALL + TAO_ENV_ARG_PARAMETER); #endif ACE_CHECK; @@ -2537,8 +2537,8 @@ ACE_ES_Subscription_Module::reregister_consumers (RtecEventComm::EventSourceID s void -ACE_ES_Subscription_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier, - CORBA::Environment &ACE_TRY_ENV) +ACE_ES_Subscription_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier + TAO_ENV_ARG_DECL) { ACE_WRITE_GUARD_THROW_EX ( ACE_ES_RW_LOCK, ace_mon, this->lock_, @@ -2591,8 +2591,8 @@ ACE_ES_Subscription_Module::subscribe_all (ACE_ES_Consumer_Rep *) // Forward <events> to all consumers subscribed to <source> only. int ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source, - const TAO_EC_Event &event, - CORBA::Environment &ACE_TRY_ENV) + const TAO_EC_Event &event + TAO_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "EC (%t) Subscription_Module::push_source\n")); @@ -2626,7 +2626,7 @@ ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source, // and not disconnected. if ((*consumer)->receiving_events ()) { - up_->push (*consumer, event, ACE_TRY_ENV); + up_->push (*consumer, event TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } // If the consumer has disconnected, schedule it for @@ -2674,8 +2674,8 @@ ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source, int ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source, - const TAO_EC_Event &event, - CORBA::Environment& ACE_TRY_ENV) + const TAO_EC_Event &event + TAO_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, // "EC (%t) Subscription_Module::push_source_type: \n")); @@ -2742,7 +2742,7 @@ ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source, { if ((*consumer)->receiving_events ()) { - up_->push (*consumer, event, ACE_TRY_ENV); + up_->push (*consumer, event TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } if ((*consumer)->disconnected ()) @@ -2837,7 +2837,7 @@ ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer, iter2.next (temp) != 0; iter2.advance ()) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { #if 1 @@ -2845,15 +2845,15 @@ ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer, (consumer->dependency()->rt_info, temp->int_id_->dependency_info_->rt_info, temp->int_id_->dependency_info_->number_of_calls, - RtecBase::ONE_WAY_CALL, - ACE_TRY_ENV); + RtecBase::ONE_WAY_CALL + TAO_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency (consumer->dependency()->rt_info, temp->int_id_->dependency_info_->rt_info, temp->int_id_->dependency_info_->number_of_calls, - RtecBase::ONE_WAY_CALL, - ACE_TRY_ENV); + RtecBase::ONE_WAY_CALL + TAO_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -2916,7 +2916,7 @@ ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer, // Success. Add the supplier dependency info to the // consumer's dependency list. // @@ TODO handle exceptions. - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { #if 1 @@ -2924,15 +2924,15 @@ ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer, (consumer->dependency ()->rt_info, dependency_info->rt_info, dependency_info->number_of_calls, - RtecBase::ONE_WAY_CALL, - ACE_TRY_ENV); + RtecBase::ONE_WAY_CALL + TAO_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency (consumer->dependency ()->rt_info, dependency_info->rt_info, dependency_info->number_of_calls, - RtecBase::ONE_WAY_CALL, - ACE_TRY_ENV); + RtecBase::ONE_WAY_CALL + TAO_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -2989,7 +2989,7 @@ ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer // Success. // Add the supplier to the consumer's dependency list. // @@ TODO handle exceptions. - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { #if 1 @@ -2997,15 +2997,15 @@ ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer (consumer->dependency ()->rt_info, dependency_info->rt_info, dependency_info->number_of_calls, - RtecBase::ONE_WAY_CALL, - ACE_TRY_ENV); + RtecBase::ONE_WAY_CALL + TAO_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency (consumer->dependency ()->rt_info, dependency_info->rt_info, dependency_info->number_of_calls, - RtecBase::ONE_WAY_CALL, - ACE_TRY_ENV); + RtecBase::ONE_WAY_CALL + TAO_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -3231,14 +3231,14 @@ ACE_ES_Subscription_Module::unsubscribe_source_type (ACE_ES_Consumer_Rep *consum void ACE_ES_Subscription_Module::push (ACE_Push_Supplier_Proxy *source, - const TAO_EC_Event &event, - CORBA::Environment &ACE_TRY_ENV) + const TAO_EC_Event &event + TAO_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "EC (%t) Subscription_Module::push\n")); ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_TO_SUBSCRIPTION_MODULE); // These are all inline function calls. - int result = this->push_source (source, event, ACE_TRY_ENV); + int result = this->push_source (source, event TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (result == -1) @@ -3247,7 +3247,7 @@ ACE_ES_Subscription_Module::push (ACE_Push_Supplier_Proxy *source, { ACE_FUNCTION_TIMEPROBE (TAO_EVENT_CHANNEL_BEGIN_PUSH_SOURCE_TYPE); - result = this->push_source_type (source, event, ACE_TRY_ENV); + result = this->push_source_type (source, event TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (result == -1) @@ -3320,20 +3320,20 @@ ACE_ES_Supplier_Module::open (ACE_ES_Subscription_Module *up) } void -ACE_ES_Supplier_Module::connected (ACE_Push_Supplier_Proxy *supplier, - CORBA::Environment &ACE_TRY_ENV) +ACE_ES_Supplier_Module::connected (ACE_Push_Supplier_Proxy *supplier + TAO_ENV_ARG_DECL) { channel_->report_connect (ACE_EventChannel::SUPPLIER); - up_->connected (supplier, ACE_TRY_ENV); + up_->connected (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!supplier->qos ().is_gateway) - this->channel_->update_supplier_gwys (ACE_TRY_ENV); + this->channel_->update_supplier_gwys (TAO_ENV_SINGLE_ARG_PARAMETER); } void -ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier, - CORBA::Environment &ACE_TRY_ENV) +ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier + TAO_ENV_ARG_DECL) { CORBA::Boolean need_update = 0; { @@ -3345,7 +3345,7 @@ ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier, if (all_suppliers_.remove (supplier) == -1) ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR()); - up_->disconnecting (supplier, ACE_TRY_ENV); + up_->disconnecting (supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->all_suppliers_.size () <= 0) @@ -3363,7 +3363,7 @@ ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier, // CORBA::release (supplier); } if (need_update) - this->channel_->update_supplier_gwys (ACE_TRY_ENV); + this->channel_->update_supplier_gwys (TAO_ENV_SINGLE_ARG_PARAMETER); } void @@ -3381,14 +3381,14 @@ ACE_ES_Supplier_Module::shutdown (void) { Supplier_Iterator iter (copy); - CORBA::Environment env; + TAO_ENV_DECLARE_NEW_ENV; for (ACE_Push_Supplier_Proxy **proxy = 0; iter.next (proxy) != 0; iter.advance ()) { (*proxy)->shutdown (); - this->disconnecting (*proxy, env); + this->disconnecting (*proxy TAO_ENV_ARG_PARAMETER); } } @@ -3396,7 +3396,7 @@ ACE_ES_Supplier_Module::shutdown (void) } RtecEventChannelAdmin::ProxyPushConsumer_ptr -ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV) +ACE_ES_Supplier_Module::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy = @@ -3418,7 +3418,7 @@ ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV) ACE_ERROR ((LM_ERROR, "ACE_ES_Supplier_Module insert failed.\n")); } - proxy = new_supplier->_this (ACE_TRY_ENV); + proxy = new_supplier->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxy); // Give ownership to the POA @@ -3429,8 +3429,8 @@ ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV) void ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy, - RtecEventComm::EventSet &event_set, - CORBA::Environment &ACE_TRY_ENV) + RtecEventComm::EventSet &event_set + TAO_ENV_ARG_DECL) { // Steal the events from the EventSet and put them into a reference // counted event set. @@ -3447,7 +3447,7 @@ ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy, // the scope. TAO_EC_Event event_copy (event, i); ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_TO_SUPPLIER_MODULE_THRU_SUPPLIER_PROXY); - up_->push (proxy, event_copy, ACE_TRY_ENV); + up_->push (proxy, event_copy TAO_ENV_ARG_PARAMETER); ACE_CHECK; } TAO_EC_Event_Set::_release (event); diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h index 02904d801a1..955838fae77 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h @@ -201,7 +201,7 @@ public: virtual ~ACE_EventChannel (void); // Calls destroy. - RtecEventChannelAdmin::EventChannel_ptr get_ref (CORBA::Environment &); + RtecEventChannelAdmin::EventChannel_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Allow transformations to RtecEventChannelAdmin::EventChannel. ACE_RTU_Manager *rtu_manager (void); @@ -232,12 +232,12 @@ public: void report_disconnect_i (u_long); // Consumer or supplier disconnected. - void add_gateway (TAO_EC_Gateway* gw, CORBA::Environment& _env); - void del_gateway (TAO_EC_Gateway* gw, CORBA::Environment& _env); + void add_gateway (TAO_EC_Gateway* gw TAO_ENV_ARG_DECL); + void del_gateway (TAO_EC_Gateway* gw TAO_ENV_ARG_DECL); // Add and remove gateways from the EC. - void update_consumer_gwys (CORBA::Environment& _env); - void update_supplier_gwys (CORBA::Environment& _env); + void update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL); + void update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL); // The consumer (or supplier) list has changed, thus the EC has to // inform any gateways it has. @@ -247,30 +247,30 @@ public: // = The RtecEventChannelAdmin::EventChannel methods. virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (CORBA::Environment &) + for_consumers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // In this implementation of the EC this returns the interface for // the Consumer_Module. virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (CORBA::Environment &) + for_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return an interface to the Supplier_Module. - virtual void destroy (CORBA::Environment &) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the EC, free all resources, stop all threads and then // shutdown the server where the Servant is running. virtual RtecEventChannelAdmin::Observer_Handle - append_observer (RtecEventChannelAdmin::Observer_ptr observer, - CORBA::Environment &env) + append_observer (RtecEventChannelAdmin::Observer_ptr observer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); - virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle, - CORBA::Environment &env) + virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -840,7 +840,7 @@ public: // that ACE_ES_Consumer_Rep_Timeout::execute can access it. private: - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Called when the channel disconnects us. @@ -943,23 +943,23 @@ public: // Link to the next module. virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (CORBA::Environment &) + obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Factory method for push consumer proxies. - void connected (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &); + void connected (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL_NOT_USED); // Register the consumer with the Event Service. This handles all // the details regarding Correlation_Module and Subscription_Module. - void disconnecting (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &); + void disconnecting (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL_NOT_USED); // Unregister the consumer from the Event Service. - virtual void push (const ACE_ES_Dispatch_Request *request, - CORBA::Environment &); + virtual void push (const ACE_ES_Dispatch_Request *request + TAO_ENV_ARG_DECL_NOT_USED); - RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (CORBA::Environment &); + RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Allow transformations to RtecEventChannelAdmin::ConsumerAdmin. void shutdown_request (ACE_ES_Dispatch_Request *request); @@ -1010,17 +1010,17 @@ public: ACE_ES_Subscription_Module *down); // Link to adjacent modules. - void connected (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &); + void connected (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL_NOT_USED); // Create the consumers filter object. - void disconnecting (ACE_Push_Consumer_Proxy *consumer, - CORBA::Environment &); + void disconnecting (ACE_Push_Consumer_Proxy *consumer + TAO_ENV_ARG_DECL_NOT_USED); // Release the consumers filter object. void push (ACE_ES_Consumer_Rep *consumer, - const TAO_EC_Event &event, - CORBA::Environment &); + const TAO_EC_Event &event + TAO_ENV_ARG_DECL_NOT_USED); // Take in an event and its subscriber. Apply consumer-specific // filters to each event and forward any dispatch requests to the // Dispatching Module. @@ -1098,14 +1098,14 @@ public: int unsubscribe (ACE_ES_Consumer_Rep *consumer); // Removes the -consumer- from any subscription lists. - void connected (ACE_Push_Supplier_Proxy *supplier, - CORBA::Environment &); - void disconnecting (ACE_Push_Supplier_Proxy *supplier, - CORBA::Environment &); + void connected (ACE_Push_Supplier_Proxy *supplier + TAO_ENV_ARG_DECL_NOT_USED); + void disconnecting (ACE_Push_Supplier_Proxy *supplier + TAO_ENV_ARG_DECL_NOT_USED); void push (ACE_Push_Supplier_Proxy *source, - const TAO_EC_Event &event, - CORBA::Environment &); + const TAO_EC_Event &event + TAO_ENV_ARG_DECL_NOT_USED); // Takes in an event and pushes subscriber sets to the // Correlation Module. @@ -1159,19 +1159,19 @@ private: // = Push helper methods. int push_source (ACE_Push_Supplier_Proxy *source, - const TAO_EC_Event &event, - CORBA::Environment &_env); + const TAO_EC_Event &event + TAO_ENV_ARG_DECL); // Push <event> to all consumers subscribed to all events from // <source>. Returns 0 on success, -1 on failure. int push_source_type (ACE_Push_Supplier_Proxy *source, - const TAO_EC_Event &event, - CORBA::Environment &_env); + const TAO_EC_Event &event + TAO_ENV_ARG_DECL); // Push <event> to all consumers subscribed to <event>.type_ from // <source>. Returns 0 on success, -1 on failure. - void push_all (const TAO_EC_Event &event, - CORBA::Environment &); + void push_all (const TAO_EC_Event &event + TAO_ENV_ARG_DECL_NOT_USED); // Push <event> to all_suppliers_. ACE_ES_Correlation_Module *up_; @@ -1216,26 +1216,26 @@ public: // Associate the module to a channel. virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (CORBA::Environment &) + obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Factory method for push supplier proxies. virtual void push (ACE_Push_Supplier_Proxy *proxy, - RtecEventComm::EventSet &event, - CORBA::Environment &); + RtecEventComm::EventSet &event + TAO_ENV_ARG_DECL_NOT_USED); // The supplier module acts on behalf of the supplier proxy to // forward events through the channel. - void connected (ACE_Push_Supplier_Proxy *supplier, - CORBA::Environment &); + void connected (ACE_Push_Supplier_Proxy *supplier + TAO_ENV_ARG_DECL_NOT_USED); // Register the consumer with the Event Service. This handles all // the details regarding Correlation_Module and Subscription_Module. - void disconnecting (ACE_Push_Supplier_Proxy *supplier, - CORBA::Environment &); + void disconnecting (ACE_Push_Supplier_Proxy *supplier + TAO_ENV_ARG_DECL_NOT_USED); // Unregister the consumer from the Event Service. - RtecEventChannelAdmin::SupplierAdmin_ptr get_ref (CORBA::Environment &); + RtecEventChannelAdmin::SupplierAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Allow transformations to RtecEventComm::PushConsumer. void shutdown (void); @@ -1289,21 +1289,21 @@ public: virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, - const RtecEventChannelAdmin::SupplierQOS& qos, - CORBA::Environment &) + const RtecEventChannelAdmin::SupplierQOS& qos + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)); // Suppliers connect via this interface. <push_supplier> is a // reference to the supplier. <qos> represents the publish types of // the supplier. - virtual void push (const RtecEventComm::EventSet &event, - CORBA::Environment &) + virtual void push (const RtecEventComm::EventSet &event + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Data arriving from a PushSupplier that must be sent to // consumers. This is the entry point of all events. - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnect the supplier from the channel. @@ -1373,30 +1373,30 @@ public: virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, - const RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment &) + const RtecEventChannelAdmin::ConsumerQOS& qos + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)); // A push consumer is connecting. <push_consumer> is a reference to // the consumer. <qos> is the subscription types for the consumer. - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The consumer is disconnecting. - virtual void suspend_connection (CORBA::Environment &) + virtual void suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Stop forwarding events to the calling consumer. - virtual void resume_connection (CORBA::Environment &) + virtual void resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Resume forwarding events to the calling consumer. // = Event Channel operations. - void push (const RtecEventComm::EventSet &events, - CORBA::Environment &); + void push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED); // Push <events> to push_consumer_. int connected (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i index bc78c9981b5..395b70bc70b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i @@ -69,37 +69,37 @@ ACE_Push_Consumer_Proxy::correlation (void) } ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr -ACE_ES_Consumer_Module::get_ref (CORBA::Environment &env) +ACE_ES_Consumer_Module::get_ref (TAO_ENV_SINGLE_ARG_DECL) { - return this->_this (env); + return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr -ACE_ES_Supplier_Module::get_ref (CORBA::Environment &env) +ACE_ES_Supplier_Module::get_ref (TAO_ENV_SINGLE_ARG_DECL) { - return this->_this (env); + return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } // ************************************************** ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr -ACE_EventChannel::get_ref (CORBA::Environment &env) +ACE_EventChannel::get_ref (TAO_ENV_SINGLE_ARG_DECL) { - return this->_this (env); + return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr -ACE_EventChannel::for_suppliers (CORBA::Environment &env) +ACE_EventChannel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return supplier_module_->get_ref (env); + return supplier_module_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr -ACE_EventChannel::for_consumers (CORBA::Environment &env) +ACE_EventChannel::for_consumers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return consumer_module_->get_ref (env); + return consumer_module_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE TAO_EC_Timer_Module* diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp index 066a923782c..2582e74ee2e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp @@ -96,7 +96,7 @@ ACE_RT_Task::~ACE_RT_Task (void) int ACE_RT_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // @@ TODO It may be necessary to pass the options to this class @@ -107,7 +107,7 @@ ACE_RT_Task::svc (void) }; int argc = sizeof (argv)/sizeof (argv[0]); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif @@ -120,14 +120,14 @@ ACE_RT_Task::svc (void) (this->rt_info_, thread_priority, subpriority, - preemption_priority, ACE_TRY_ENV); + preemption_priority TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else ACE_Scheduler_Factory::server ()->priority (this->rt_info_, thread_priority, subpriority, - preemption_priority, ACE_TRY_ENV); + preemption_priority TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif if (ACE_OS::thr_setprio (thread_priority) == -1) @@ -257,17 +257,17 @@ ACE_RT_Task::open_task (const char* name) tempname = tempbuffer; } - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { #if 1 rt_info_ = - this->scheduler_->create (tempname, ACE_TRY_ENV); + this->scheduler_->create (tempname TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else rt_info_ = - ACE_Scheduler_Factory::server()->create (tempname, - ACE_TRY_ENV); + ACE_Scheduler_Factory::server()->create (tempname + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif // @@ TODO: We do no initialization of the new rt_info, the @@ -314,7 +314,7 @@ ACE_RT_Task::synch_threads (size_t threads) RtecScheduler::Preemption_Subpriority_t subpriority; RtecScheduler::Preemption_Priority_t preemption_priority; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { { @@ -325,14 +325,14 @@ ACE_RT_Task::synch_threads (size_t threads) (rt_info_, thread_priority, subpriority, - preemption_priority, ACE_TRY_ENV); + preemption_priority TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else ACE_Scheduler_Factory::server ()->priority (rt_info_, thread_priority, subpriority, - preemption_priority, ACE_TRY_ENV); + preemption_priority TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif } diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp index 851cbe05b9e..826009f8d12 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp @@ -75,7 +75,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period) case 0: // @@ TODO handle exceptions { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { #if 1 @@ -89,8 +89,8 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period) RtecScheduler::VERY_LOW_IMPORTANCE, ORBSVCS_Time::zero (), 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->set (rt_info_, @@ -102,8 +102,8 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period) RtecScheduler::VERY_LOW_IMPORTANCE, ORBSVCS_Time::zero (), 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp index 790a39dcd5b..7363d0956f9 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp @@ -19,8 +19,8 @@ TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory (void) TAO_Invocation_Endpoint_Selector * -TAO_FT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *, - CORBA::Environment &ACE_TRY_ENV) +TAO_FT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation * + TAO_ENV_ARG_DECL) { if (this->ft_endpoint_selector_ == 0) { diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h index 6d07c616028..6cb35899442 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h @@ -52,8 +52,8 @@ public: /// Get an Invocation's endpoint selection strategy and /// initialize the endpoint selection state instance. virtual TAO_Invocation_Endpoint_Selector *get_selector ( - TAO_GIOP_Invocation *, - CORBA::Environment &ACE_TRY_ENV); + TAO_GIOP_Invocation * + TAO_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index 4fcda4d248e..ec979f5a1cb 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -13,8 +13,8 @@ ACE_RCSID(FaultTolerance, TAO_FT_IOGR_Property, "$Id$") CORBA::Boolean TAO_FT_IOGR_Property::set_property ( - CORBA::Object_ptr ior, - CORBA::Environment & /*ACE_TRY_ENV*/) + CORBA::Object_ptr ior + TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException, TAO_IOP::Invalid_IOR)) { @@ -62,8 +62,8 @@ TAO_FT_IOGR_Property::set_property ( CORBA::Boolean TAO_FT_IOGR_Property::is_primary_set ( - CORBA::Object_ptr ior, - CORBA::Environment & /*ACE_TRY_ENV*/) + CORBA::Object_ptr ior + TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -77,8 +77,8 @@ TAO_FT_IOGR_Property::is_primary_set ( CORBA::Object_ptr TAO_FT_IOGR_Property::get_primary ( - CORBA::Object_ptr ior, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr ior + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::NotFound @@ -150,8 +150,8 @@ TAO_FT_IOGR_Property::get_primary ( CORBA::Boolean TAO_FT_IOGR_Property::set_primary ( CORBA::Object_ptr ior1, - CORBA::Object_ptr ior2, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr ior2 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::NotFound, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h index 9bb7d5e3ae7..5b40302b226 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h @@ -75,10 +75,9 @@ public: // Decrement the reference count. virtual CORBA::Boolean set_property ( - CORBA::Object_ptr ior, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::Object_ptr ior + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::Invalid_IOR @@ -87,10 +86,9 @@ public: virtual CORBA::Boolean set_primary ( CORBA::Object_ptr ior1, - CORBA::Object_ptr ior2, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::Object_ptr ior2 + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::NotFound, @@ -99,10 +97,9 @@ public: // Set <ior1> as primary which is a part of <ior2> virtual CORBA::Object_ptr get_primary ( - CORBA::Object_ptr ior, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::Object_ptr ior + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::NotFound @@ -110,10 +107,9 @@ public: // Get the primary member from the IOGR <ior> virtual CORBA::Boolean is_primary_set ( - CORBA::Object_ptr ior, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + CORBA::Object_ptr ior + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp index a00cc6dd248..2f07b99f486 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp @@ -31,12 +31,12 @@ TAO_FT_Invocation_Endpoint_Selector::~TAO_FT_Invocation_Endpoint_Selector (void) void TAO_FT_Invocation_Endpoint_Selector::select_endpoint ( - TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV) + TAO_GIOP_Invocation *invocation + TAO_ENV_ARG_DECL) { - int retval = this->select_endpoint_i (invocation, - ACE_TRY_ENV); + int retval = this->select_endpoint_i (invocation + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (retval == 0) @@ -46,8 +46,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint ( "(%P|%t) TAO-FT - Primary doesnt exist.", "Falling back on the default selection routines \n")); - TAO_Default_Endpoint_Selector::select_endpoint (invocation, - ACE_TRY_ENV); + TAO_Default_Endpoint_Selector::select_endpoint (invocation + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -56,8 +56,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint ( // @@ RTCORBA_Subsetting - next should be deprecated... void -TAO_FT_Invocation_Endpoint_Selector::next (TAO_GIOP_Invocation *, - CORBA::Environment &) +TAO_FT_Invocation_Endpoint_Selector::next (TAO_GIOP_Invocation * + TAO_ENV_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("This method is DEPRECATED!\n"))); // if (invocation->stub_->next_profile_retry () == 0) @@ -68,8 +68,8 @@ TAO_FT_Invocation_Endpoint_Selector::next (TAO_GIOP_Invocation *, void TAO_FT_Invocation_Endpoint_Selector::forward (TAO_GIOP_Invocation *invocation, - const TAO_MProfile &mprofile, - CORBA::Environment &ACE_TRY_ENV) + const TAO_MProfile &mprofile + TAO_ENV_ARG_DECL) { invocation->stub ()->add_forward_profiles (mprofile); // This has to be and is thread safe. @@ -105,12 +105,12 @@ TAO_FT_Invocation_Endpoint_Selector::close_connection (TAO_GIOP_Invocation *invo int TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i( - TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV) + TAO_GIOP_Invocation *invocation + TAO_ENV_ARG_DECL) { int retval = - this->select_primary (invocation, - ACE_TRY_ENV); + this->select_primary (invocation + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -165,8 +165,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i( invocation->endpoint (invocation->profile ()->endpoint ()); int status = - this->endpoint_from_profile (invocation, - ACE_TRY_ENV); + this->endpoint_from_profile (invocation + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (status == 1) @@ -184,8 +184,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i( int TAO_FT_Invocation_Endpoint_Selector::select_primary ( - TAO_GIOP_Invocation *invoc, - CORBA::Environment &ACE_TRY_ENV) + TAO_GIOP_Invocation *invoc + TAO_ENV_ARG_DECL) { // Get the current profile TAO_Profile *temp_profile = @@ -198,8 +198,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary ( // Check whether we have a primary profile in hand. retval = this->check_profile_for_primary (invoc, - temp_profile, - ACE_TRY_ENV); + temp_profile + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } else @@ -254,8 +254,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary ( // Check whether we have a primary profile in hand. retval = this->check_profile_for_primary (invoc, - temp_profile, - ACE_TRY_ENV); + temp_profile + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (retval == 1 || retval == -1) @@ -286,8 +286,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary ( int TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary ( TAO_GIOP_Invocation *invocation, - TAO_Profile*pfile, - CORBA::Environment &ACE_TRY_ENV) + TAO_Profile*pfile + TAO_ENV_ARG_DECL) { IOP::TaggedComponent tagged_component; tagged_component.tag = IOP::TAG_FT_PRIMARY; @@ -309,8 +309,8 @@ TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary ( invocation->endpoint (invocation->profile ()->endpoint ()); int status = - this->endpoint_from_profile (invocation, - ACE_TRY_ENV); + this->endpoint_from_profile (invocation + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (status == 1) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h index 9cdf8682b30..62e82e2a09e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h @@ -54,30 +54,28 @@ public: /// Implementation for FT. Please refer to /// $TAO_ROOT/tao/Invocation_Endpoint_Selectors.h for details of /// documentation. - virtual void select_endpoint (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV); + virtual void select_endpoint (TAO_GIOP_Invocation *invocation + TAO_ENV_ARG_DECL); - virtual void next (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); + virtual void next (TAO_GIOP_Invocation *invocation + TAO_ENV_ARG_DECL_WITH_DEFAULTS); virtual void forward (TAO_GIOP_Invocation *invocation, - const TAO_MProfile &mprofile, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); + const TAO_MProfile &mprofile + TAO_ENV_ARG_DECL_WITH_DEFAULTS); virtual void success (TAO_GIOP_Invocation *invocation); virtual void close_connection (TAO_GIOP_Invocation *invocation); protected: - int select_endpoint_i (TAO_GIOP_Invocation *invoc, - CORBA::Environment &ACE_TRY_ENV); + int select_endpoint_i (TAO_GIOP_Invocation *invoc + TAO_ENV_ARG_DECL); - int select_primary (TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV); + int select_primary (TAO_GIOP_Invocation *invocation + TAO_ENV_ARG_DECL); int check_profile_for_primary (TAO_GIOP_Invocation *, - TAO_Profile *, - CORBA::Environment &ACE_TRY_ENV); + TAO_Profile * + TAO_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp index a1c2b16555c..4f8a14173f8 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp @@ -40,8 +40,6 @@ TAO_FT_ORBInitializer::register_policy_factories ( PortableInterceptor::PolicyFactory::_nil (); PortableInterceptor::PolicyFactory_var policy_factory; - TAO_ENV_ARG_DEFN; - // This policy factory is used for all FTCORBA related policies. ACE_NEW_THROW_EX (temp_factory, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp index ebee9f63a80..ba1b9775a2c 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp @@ -22,17 +22,15 @@ TAO_FT_PolicyFactory::create_policy ( CORBA::PolicyError)) { - TAO_ENV_ARG_DEFN; - if (type == FT::REQUEST_DURATION_POLICY) - return TAO_FT_Request_Duration_Policy::create (val, - ACE_TRY_ENV); + return TAO_FT_Request_Duration_Policy::create (val + TAO_ENV_ARG_PARAMETER); else if (type == FT::HEARTBEAT_POLICY) - return TAO_FT_Heart_Beat_Policy::create (val, - ACE_TRY_ENV); + return TAO_FT_Heart_Beat_Policy::create (val + TAO_ENV_ARG_PARAMETER); else if (type == FT::HEARTBEAT_ENABLED_POLICY) - return TAO_FT_Heart_Beat_Enabled_Policy::create (val, - ACE_TRY_ENV); + return TAO_FT_Heart_Beat_Enabled_Policy::create (val + TAO_ENV_ARG_PARAMETER); ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp index e8ce8c4a5d9..0fe68876e0e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp @@ -10,22 +10,22 @@ ACE_RCSID(FaultTolerance, FT_Policy_i, "$Id$") TimeBase::TimeT -TAO_FT_Request_Duration_Policy::request_duration_value (CORBA::Environment &) +TAO_FT_Request_Duration_Policy::request_duration_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->request_duration_; } CORBA::PolicyType -TAO_FT_Request_Duration_Policy::policy_type (CORBA_Environment &) +TAO_FT_Request_Duration_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return FT::REQUEST_DURATION_POLICY; } CORBA::Policy_ptr -TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val, - CORBA::Environment &ACE_TRY_ENV) +TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val + TAO_ENV_ARG_DECL) { TimeBase::TimeT value; if ((val >>= value) == 0) @@ -53,7 +53,7 @@ TAO_FT_Request_Duration_Policy::clone (void) const } CORBA::Policy_ptr -TAO_FT_Request_Duration_Policy::copy (CORBA_Environment &ACE_TRY_ENV) +TAO_FT_Request_Duration_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FT_Request_Duration_Policy* tmp; @@ -66,7 +66,7 @@ TAO_FT_Request_Duration_Policy::copy (CORBA_Environment &ACE_TRY_ENV) } void -TAO_FT_Request_Duration_Policy::destroy (CORBA_Environment &) +TAO_FT_Request_Duration_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -94,7 +94,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value) /*****************************************************************/ FT::HeartbeatPolicyValue -TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (CORBA::Environment &) +TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { FT::HeartbeatPolicyValue val; @@ -107,8 +107,8 @@ TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (CORBA::Environment &) CORBA::Policy_ptr -TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val, - CORBA::Environment &ACE_TRY_ENV) +TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val + TAO_ENV_ARG_DECL) { FT::HeartbeatPolicyValue *value; if ((val >>= value) == 0) @@ -129,7 +129,7 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val, CORBA::PolicyType -TAO_FT_Heart_Beat_Policy::policy_type (CORBA_Environment &) +TAO_FT_Heart_Beat_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return FT::HEARTBEAT_POLICY; @@ -137,7 +137,7 @@ TAO_FT_Heart_Beat_Policy::policy_type (CORBA_Environment &) CORBA::Policy_ptr -TAO_FT_Heart_Beat_Policy::copy (CORBA_Environment &ACE_TRY_ENV) +TAO_FT_Heart_Beat_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FT_Heart_Beat_Policy * tmp; @@ -160,7 +160,7 @@ TAO_FT_Heart_Beat_Policy::clone (void) const } void -TAO_FT_Heart_Beat_Policy::destroy (CORBA_Environment &) +TAO_FT_Heart_Beat_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -189,7 +189,7 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value, CORBA::Boolean TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value ( - CORBA::Environment &) + TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->heartbeat_enabled_value_; @@ -197,8 +197,8 @@ TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value ( CORBA::Policy_ptr -TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val, - CORBA::Environment &ACE_TRY_ENV) +TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val + TAO_ENV_ARG_DECL) { CORBA::Boolean value; @@ -217,7 +217,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val, } CORBA::PolicyType -TAO_FT_Heart_Beat_Enabled_Policy::policy_type (CORBA_Environment &) +TAO_FT_Heart_Beat_Enabled_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return FT::HEARTBEAT_ENABLED_POLICY; @@ -225,7 +225,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::policy_type (CORBA_Environment &) CORBA::Policy_ptr -TAO_FT_Heart_Beat_Enabled_Policy::copy (CORBA_Environment &ACE_TRY_ENV) +TAO_FT_Heart_Beat_Enabled_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_FT_Heart_Beat_Enabled_Policy * tmp; @@ -249,7 +249,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const void -TAO_FT_Heart_Beat_Enabled_Policy::destroy (CORBA_Environment &) +TAO_FT_Heart_Beat_Enabled_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h index 7da5d297aa8..c5231421ea1 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h @@ -60,8 +60,8 @@ public: TAO_FT_Request_Duration_Policy (const TAO_FT_Request_Duration_Policy &rhs); // Copy constructor. - static CORBA::Policy_ptr create (const CORBA::Any& val, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + static CORBA::Policy_ptr create (const CORBA::Any& val + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Helper method for the implementation of // CORBA::ORB::create_policy. @@ -69,19 +69,19 @@ public: // Returns a copy of <this>. // = The FT::RequestDurationPolicy methods - virtual TimeBase::TimeT request_duration_value (CORBA::Environment &ACE_TRY_ENV) + virtual TimeBase::TimeT request_duration_value (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void set_time_value (ACE_Time_Value &time_value); @@ -114,8 +114,8 @@ public: TAO_FT_Heart_Beat_Policy (const TAO_FT_Heart_Beat_Policy &rhs); // Copy constructor. - static CORBA::Policy_ptr create (const CORBA::Any& val, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + static CORBA::Policy_ptr create (const CORBA::Any& val + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Helper method for the implementation of // CORBA::ORB::create_policy. @@ -123,19 +123,19 @@ public: // Returns a copy of <this>. // = The FT::HeartBeatPolicy methods - virtual FT::HeartbeatPolicyValue heartbeat_policy_value (CORBA::Environment &ACE_TRY_ENV) + virtual FT::HeartbeatPolicyValue heartbeat_policy_value (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void set_time_value (ACE_Time_Value &time_value, @@ -177,9 +177,8 @@ public: const TAO_FT_Heart_Beat_Enabled_Policy &rhs); // Copy constructor. - static CORBA::Policy_ptr create (const CORBA::Any& val, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); + static CORBA::Policy_ptr create (const CORBA::Any& val + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Helper method for the implementation of // CORBA::ORB::create_policy. @@ -188,19 +187,19 @@ public: // = The FT::HeartBeatPolicy methods virtual CORBA::Boolean heartbeat_enabled_policy_value ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PolicyType policy_type ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Policy_ptr copy ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index 4db5b479aab..7d75ef8a98b 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -158,8 +158,8 @@ void TAO_FT_Service_Callbacks::service_context_list ( TAO_Stub *&stub, IOP::ServiceContextList &service_list, - CORBA::Boolean restart, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean restart + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -170,14 +170,14 @@ TAO_FT_Service_Callbacks::service_context_list ( { // Pack the group version service context this->group_version_service_context (stub, - service_list, - ACE_TRY_ENV); + service_list + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Pack the request service context this->request_service_context (stub, - service_list, - ACE_TRY_ENV); + service_list + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -187,8 +187,8 @@ TAO_FT_Service_Callbacks::service_context_list ( void TAO_FT_Service_Callbacks::request_service_context ( TAO_Stub *&stub, - IOP::ServiceContextList &service_list, - CORBA::Environment &ACE_TRY_ENV) + IOP::ServiceContextList &service_list + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_OutputCDR cdr; @@ -210,8 +210,8 @@ TAO_FT_Service_Callbacks::request_service_context ( // Check whether the FT::RequestDurationPolicy has been set CORBA::Policy_var policy = - stub->get_policy (FT::REQUEST_DURATION_POLICY, - ACE_TRY_ENV); + stub->get_policy (FT::REQUEST_DURATION_POLICY + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // @@ There are two possibilities a) Duration policy has not been @@ -231,7 +231,7 @@ TAO_FT_Service_Callbacks::request_service_context ( FT::RequestDurationPolicy::_narrow (policy.in ()); exp_time = - duration_policy->request_duration_value (ACE_TRY_ENV); + duration_policy->request_duration_value (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else @@ -288,8 +288,8 @@ TAO_FT_Service_Callbacks::request_service_context ( void TAO_FT_Service_Callbacks::group_version_service_context ( TAO_Stub *&stub, - IOP::ServiceContextList &service_list, - CORBA::Environment &ACE_TRY_ENV) + IOP::ServiceContextList &service_list + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_OutputCDR cdr; @@ -368,8 +368,8 @@ TAO_FT_Service_Callbacks::get_object_group_version (TAO_Profile *profile) int TAO_FT_Service_Callbacks::raise_comm_failure ( TAO_GIOP_Invocation *invoke, - TAO_Profile *profile, - CORBA::Environment &ACE_TRY_ENV) + TAO_Profile *profile + TAO_ENV_ARG_DECL) { if (this->restart_policy_check ( invoke->request_service_context ().service_info (), @@ -402,8 +402,8 @@ TAO_FT_Service_Callbacks::raise_comm_failure ( int TAO_FT_Service_Callbacks::raise_transient_failure ( TAO_GIOP_Invocation *invoke, - TAO_Profile *profile, - CORBA::Environment &ACE_TRY_ENV) + TAO_Profile *profile + TAO_ENV_ARG_DECL) { if (restart_policy_check ( invoke->request_service_context ().service_info (), diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h index 66acf2c3ad1..76148080a80 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h @@ -75,23 +75,23 @@ public: virtual void service_context_list (TAO_Stub *&stub, IOP::ServiceContextList &service_list, - CORBA::Boolean restart, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean restart + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Add relevant stuff to the service context list virtual int raise_comm_failure ( TAO_GIOP_Invocation *invoke, - TAO_Profile *profile, - CORBA::Environment &ACE_TRY_ENV); + TAO_Profile *profile + TAO_ENV_ARG_DECL); // Check whether we need to raise an exception or go for a // reinvocaton. virtual int raise_transient_failure ( TAO_GIOP_Invocation *invoke, - TAO_Profile *profile, - CORBA::Environment &ACE_TRY_ENV); + TAO_Profile *profile + TAO_ENV_ARG_DECL); // Check whether we need to raise an exception or go for a // reinvocaton. @@ -109,14 +109,14 @@ public: private: void request_service_context (TAO_Stub *&stub, - IOP::ServiceContextList &service_list, - CORBA::Environment &ACE_TRY_ENV) + IOP::ServiceContextList &service_list + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Makes the request service_context list void group_version_service_context (TAO_Stub *&stub, - IOP::ServiceContextList &service_list, - CORBA::Environment &ACE_TRY_ENV) + IOP::ServiceContextList &service_list + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Make the group version service context list diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp index 7dbe9cefca5..af98cb7e372 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp @@ -29,8 +29,8 @@ TAO_LB_LoadBalancer::~TAO_LB_LoadBalancer (void) LoadBalancing::ReplicaProxy_ptr TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, - CORBA::Object_ptr replica, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr replica + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)) @@ -47,7 +47,7 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, PortableServer::ServantBase_var proxy_servant = proxy; - proxy->connect (this, control, replica, ACE_TRY_ENV); + proxy->connect (this, control, replica TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (LoadBalancing::ReplicaProxy::_nil ()); if (this->strategy_->insert (proxy) == -1) @@ -56,21 +56,21 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, LoadBalancing::ReplicaProxy::_nil ()); } - return proxy->_this (ACE_TRY_ENV); + return proxy->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA::Object_ptr -TAO_LB_LoadBalancer::group_identity (CORBA::Environment &) +TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Object::_duplicate (this->group_identity_.in ()); } void -TAO_LB_LoadBalancer::load_changed (TAO_LB_ReplicaProxy *proxy, - CORBA::Environment &ACE_TRY_ENV) +TAO_LB_LoadBalancer::load_changed (TAO_LB_ReplicaProxy *proxy + TAO_ENV_ARG_DECL) { - this->strategy_->load_changed (proxy, ACE_TRY_ENV); + this->strategy_->load_changed (proxy TAO_ENV_ARG_PARAMETER); } int @@ -84,14 +84,14 @@ TAO_LB_LoadBalancer::init (const char * repository_id, // for a ServantLocator. PortableServer::RequestProcessingPolicy_var request = root_poa->create_request_processing_policy ( - PortableServer::USE_SERVANT_MANAGER, - ACE_TRY_ENV); + PortableServer::USE_SERVANT_MANAGER + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ServantRetentionPolicy_var retention = root_poa->create_servant_retention_policy ( - PortableServer::NON_RETAIN, - ACE_TRY_ENV); + PortableServer::NON_RETAIN + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create the PolicyList. @@ -107,28 +107,28 @@ TAO_LB_LoadBalancer::init (const char * repository_id, // Create the child POA with the ServantManager (ReplicaLocator) // above policies. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_ = root_poa->create_POA ("TAO_LB_ReplicaLocator_POA", poa_manager.in (), - policy_list, - ACE_TRY_ENV); + policy_list + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the child POA. - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - request->destroy (ACE_TRY_ENV); + request->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - retention->destroy (ACE_TRY_ENV); + retention->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Now set the ReplicaLocator as the child POA's Servant // Manager. - this->poa_->set_servant_manager (&this->locator_, - ACE_TRY_ENV); + this->poa_->set_servant_manager (&this->locator_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ What ObjectId should be used? @@ -137,8 +137,8 @@ TAO_LB_LoadBalancer::init (const char * repository_id, this->group_identity_ = this->poa_->create_reference_with_id (oid.in (), - repository_id, - ACE_TRY_ENV); + repository_id + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h index 1b711b531e6..a410c01cdec 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h @@ -58,18 +58,18 @@ public: // that should let us keep the average load (and other similar // things) pre-computed. // - void load_changed (TAO_LB_ReplicaProxy *proxy, - CORBA::Environment &ACE_TRY_ENV); + void load_changed (TAO_LB_ReplicaProxy *proxy + TAO_ENV_ARG_DECL); // The load for <proxy> has changed, the LoadBalancer can use this // opportunity to determine if the load on one of the services is // too high. - void disconnect (TAO_LB_ReplicaProxy *proxy, - CORBA::Environment &ACE_TRY_ENV) + void disconnect (TAO_LB_ReplicaProxy *proxy + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnect proxy from the Load Balancer. - CORBA::Object_ptr replica (CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return a reference to the Replica to which client requests should // be redirected next. @@ -77,12 +77,12 @@ public: // = See the descriptions in LoadBalancing.idl virtual LoadBalancing::ReplicaProxy_ptr connect ( LoadBalancing::ReplicaControl_ptr control, - CORBA::Object_ptr replica, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr replica + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)); - virtual CORBA::Object_ptr group_identity (CORBA::Environment &ACE_TRY_ENV) + virtual CORBA::Object_ptr group_identity (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i index 884b8ab95ab..f667e95a552 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i +++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i @@ -4,8 +4,8 @@ ACE_INLINE void -TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy, - CORBA::Environment &) +TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Ossama, what is the we cannot raise that exception here! @@ -22,8 +22,8 @@ TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy, ACE_INLINE CORBA::Object_ptr -TAO_LB_LoadBalancer::replica (CORBA::Environment &ACE_TRY_ENV) +TAO_LB_LoadBalancer::replica (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->strategy_->replica (ACE_TRY_ENV); + return this->strategy_->replica (TAO_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp index 7dbe9cefca5..af98cb7e372 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp @@ -29,8 +29,8 @@ TAO_LB_LoadBalancer::~TAO_LB_LoadBalancer (void) LoadBalancing::ReplicaProxy_ptr TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, - CORBA::Object_ptr replica, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr replica + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)) @@ -47,7 +47,7 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, PortableServer::ServantBase_var proxy_servant = proxy; - proxy->connect (this, control, replica, ACE_TRY_ENV); + proxy->connect (this, control, replica TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (LoadBalancing::ReplicaProxy::_nil ()); if (this->strategy_->insert (proxy) == -1) @@ -56,21 +56,21 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, LoadBalancing::ReplicaProxy::_nil ()); } - return proxy->_this (ACE_TRY_ENV); + return proxy->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA::Object_ptr -TAO_LB_LoadBalancer::group_identity (CORBA::Environment &) +TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Object::_duplicate (this->group_identity_.in ()); } void -TAO_LB_LoadBalancer::load_changed (TAO_LB_ReplicaProxy *proxy, - CORBA::Environment &ACE_TRY_ENV) +TAO_LB_LoadBalancer::load_changed (TAO_LB_ReplicaProxy *proxy + TAO_ENV_ARG_DECL) { - this->strategy_->load_changed (proxy, ACE_TRY_ENV); + this->strategy_->load_changed (proxy TAO_ENV_ARG_PARAMETER); } int @@ -84,14 +84,14 @@ TAO_LB_LoadBalancer::init (const char * repository_id, // for a ServantLocator. PortableServer::RequestProcessingPolicy_var request = root_poa->create_request_processing_policy ( - PortableServer::USE_SERVANT_MANAGER, - ACE_TRY_ENV); + PortableServer::USE_SERVANT_MANAGER + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ServantRetentionPolicy_var retention = root_poa->create_servant_retention_policy ( - PortableServer::NON_RETAIN, - ACE_TRY_ENV); + PortableServer::NON_RETAIN + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create the PolicyList. @@ -107,28 +107,28 @@ TAO_LB_LoadBalancer::init (const char * repository_id, // Create the child POA with the ServantManager (ReplicaLocator) // above policies. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_ = root_poa->create_POA ("TAO_LB_ReplicaLocator_POA", poa_manager.in (), - policy_list, - ACE_TRY_ENV); + policy_list + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the child POA. - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - request->destroy (ACE_TRY_ENV); + request->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - retention->destroy (ACE_TRY_ENV); + retention->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Now set the ReplicaLocator as the child POA's Servant // Manager. - this->poa_->set_servant_manager (&this->locator_, - ACE_TRY_ENV); + this->poa_->set_servant_manager (&this->locator_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ What ObjectId should be used? @@ -137,8 +137,8 @@ TAO_LB_LoadBalancer::init (const char * repository_id, this->group_identity_ = this->poa_->create_reference_with_id (oid.in (), - repository_id, - ACE_TRY_ENV); + repository_id + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h index 1b711b531e6..a410c01cdec 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h @@ -58,18 +58,18 @@ public: // that should let us keep the average load (and other similar // things) pre-computed. // - void load_changed (TAO_LB_ReplicaProxy *proxy, - CORBA::Environment &ACE_TRY_ENV); + void load_changed (TAO_LB_ReplicaProxy *proxy + TAO_ENV_ARG_DECL); // The load for <proxy> has changed, the LoadBalancer can use this // opportunity to determine if the load on one of the services is // too high. - void disconnect (TAO_LB_ReplicaProxy *proxy, - CORBA::Environment &ACE_TRY_ENV) + void disconnect (TAO_LB_ReplicaProxy *proxy + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnect proxy from the Load Balancer. - CORBA::Object_ptr replica (CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return a reference to the Replica to which client requests should // be redirected next. @@ -77,12 +77,12 @@ public: // = See the descriptions in LoadBalancing.idl virtual LoadBalancing::ReplicaProxy_ptr connect ( LoadBalancing::ReplicaControl_ptr control, - CORBA::Object_ptr replica, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr replica + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)); - virtual CORBA::Object_ptr group_identity (CORBA::Environment &ACE_TRY_ENV) + virtual CORBA::Object_ptr group_identity (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i index 884b8ab95ab..f667e95a552 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i @@ -4,8 +4,8 @@ ACE_INLINE void -TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy, - CORBA::Environment &) +TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Ossama, what is the we cannot raise that exception here! @@ -22,8 +22,8 @@ TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy, ACE_INLINE CORBA::Object_ptr -TAO_LB_LoadBalancer::replica (CORBA::Environment &ACE_TRY_ENV) +TAO_LB_LoadBalancer::replica (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->strategy_->replica (ACE_TRY_ENV); + return this->strategy_->replica (TAO_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp index a64cf50f4b7..f0b9d4f00f7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp @@ -17,8 +17,8 @@ TAO_LB_LoadBalancing_Strategy::~TAO_LB_LoadBalancing_Strategy (void) } void -TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy *, - CORBA::Environment &) +TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy * + TAO_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h index a13fe85e1e7..946325788d9 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h @@ -47,7 +47,7 @@ public: // @@ The name of the method should be more meaningful, what about: // select_replica(), select_unloaded_replica() or something like // that? - virtual CORBA::Object_ptr replica (CORBA::Environment &ACE_TRY_ENV) + virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Return the object reference to the Replica to which requests should // be redirected. @@ -59,8 +59,8 @@ public: virtual int remove (TAO_LB_ReplicaProxy *) = 0; // Remove ReplicaProxy servant from the set of replica proxies. - virtual void load_changed (TAO_LB_ReplicaProxy *proxy, - CORBA::Environment &ACE_TRY_ENV); + virtual void load_changed (TAO_LB_ReplicaProxy *proxy + TAO_ENV_ARG_DECL); // The load on one proxy has changed. // @@ Ossama: see my comments on LoadBalancing_i about changing the // signature of this method. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp index 696af20d676..06d74819fb2 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp @@ -36,7 +36,7 @@ TAO_LB_Minimum_Dispersion_Strategy::~TAO_LB_Minimum_Dispersion_Strategy (void) } CORBA::Object_ptr -TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) +TAO_LB_Minimum_Dispersion_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { for ( ; ; ) @@ -84,7 +84,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { CORBA::Boolean non_existent = - object->_non_existent (ACE_TRY_ENV); + object->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (!non_existent) { @@ -129,8 +129,8 @@ TAO_LB_Minimum_Dispersion_Strategy::remove (TAO_LB_ReplicaProxy *proxy) } void -TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy, - CORBA::Environment &ACE_TRY_ENV) +TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy + TAO_ENV_ARG_DECL) { int send_load_advisory = 0; @@ -185,7 +185,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy, // dispersion we tolerate before starting to send advisories. if (send_load_advisory == 2) { - proxy->control_->high_load_advisory (ACE_TRY_ENV); + proxy->control_->high_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; // We may not throw an exception, so explicitly return. @@ -199,7 +199,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy, // construction time... if (send_load_advisory == 1) { - proxy->control_->nominal_load_advisory (ACE_TRY_ENV); + proxy->control_->nominal_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h index fcf0b686ae3..df4e679543c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h @@ -56,12 +56,12 @@ public: // Destructor // = The TAO_LB_LoadBalancing_Strategy methods - virtual CORBA::Object_ptr replica (CORBA_Environment &ACE_TRY_ENV) + virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int insert (TAO_LB_ReplicaProxy *); virtual int remove (TAO_LB_ReplicaProxy *); - virtual void load_changed (TAO_LB_ReplicaProxy *, - CORBA::Environment &ACE_TRY_ENV); + virtual void load_changed (TAO_LB_ReplicaProxy * + TAO_ENV_ARG_DECL); private: TAO_LB_ReplicaProxySet proxies_; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp index 03686e655bc..66a03582d03 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp @@ -23,13 +23,11 @@ TAO_LB_ReplicaLocator::preinvoke ( ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - if (this->load_balancer_ == 0) ACE_THROW_RETURN (CORBA::INTERNAL (), 0); CORBA::Object_var replica = - this->load_balancer_->replica (ACE_TRY_ENV); + this->load_balancer_->replica (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Throw a forward exception to force the client to redirect its diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp index 8dc15cbde74..bfc9d025ba7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp @@ -22,8 +22,8 @@ TAO_LB_ReplicaProxy::TAO_LB_ReplicaProxy (void) } void -TAO_LB_ReplicaProxy::current_load (CORBA::Float load, - CORBA::Environment &ACE_TRY_ENV) +TAO_LB_ReplicaProxy::current_load (CORBA::Float load + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Ossama: this is the point were the load dampening should @@ -35,11 +35,11 @@ TAO_LB_ReplicaProxy::current_load (CORBA::Float load, this->current_load_ = load; // ACE_DEBUG ((LM_DEBUG, "Load[%x] = %f\n", long(this), load)); - this->balancer_->load_changed (this, ACE_TRY_ENV); + this->balancer_->load_changed (this TAO_ENV_ARG_PARAMETER); } void -TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV) +TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected, CORBA::SystemException)) { @@ -49,7 +49,7 @@ TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV) if (this->connected_) { - this->balancer_->disconnect (this, ACE_TRY_ENV); + this->balancer_->disconnect (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->connected_ = 0; @@ -63,8 +63,8 @@ TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV) void TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer, LoadBalancing::ReplicaControl_ptr control, - CORBA::Object_ptr replica, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr replica + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h index a4f60a41a06..9eb629ea29f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h @@ -54,8 +54,8 @@ public: CORBA::Object_ptr replica (void); // Return a reference to the Replica. - virtual void current_load (CORBA::Float load, - CORBA::Environment &ACE_TRY_ENV) + virtual void current_load (CORBA::Float load + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Send the value of the current load on the Object being load // balanced, where the definition of "load" is load balancing @@ -69,7 +69,7 @@ public: // without affecting the client, or detect rapid raises in load and // react proactively to those... - virtual void disconnect (CORBA::Environment &ACE_TRY_ENV) + virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected, CORBA::SystemException)); // Send a request to disconnect from the LoadBalancer. @@ -92,8 +92,8 @@ private: void connect (TAO_LB_LoadBalancer *balancer, LoadBalancing::ReplicaControl_ptr control, - CORBA::Object_ptr replica, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr replica + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp index 9c0c198c5d0..4da47b060d7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp @@ -39,7 +39,7 @@ TAO_LB_Round_Robin_Strategy::~TAO_LB_Round_Robin_Strategy (void) } CORBA::Object_ptr -TAO_LB_Round_Robin_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) +TAO_LB_Round_Robin_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h index 523ff488d9e..93887fc6ac0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h @@ -60,7 +60,7 @@ public: // Destructor // = The Load_Balancing_Strategy methods - virtual CORBA::Object_ptr replica (CORBA_Environment &ACE_TRY_ENV) + virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int insert (TAO_LB_ReplicaProxy *); virtual int remove (TAO_LB_ReplicaProxy *); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp index a64cf50f4b7..f0b9d4f00f7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp @@ -17,8 +17,8 @@ TAO_LB_LoadBalancing_Strategy::~TAO_LB_LoadBalancing_Strategy (void) } void -TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy *, - CORBA::Environment &) +TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy * + TAO_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h index a13fe85e1e7..946325788d9 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h @@ -47,7 +47,7 @@ public: // @@ The name of the method should be more meaningful, what about: // select_replica(), select_unloaded_replica() or something like // that? - virtual CORBA::Object_ptr replica (CORBA::Environment &ACE_TRY_ENV) + virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Return the object reference to the Replica to which requests should // be redirected. @@ -59,8 +59,8 @@ public: virtual int remove (TAO_LB_ReplicaProxy *) = 0; // Remove ReplicaProxy servant from the set of replica proxies. - virtual void load_changed (TAO_LB_ReplicaProxy *proxy, - CORBA::Environment &ACE_TRY_ENV); + virtual void load_changed (TAO_LB_ReplicaProxy *proxy + TAO_ENV_ARG_DECL); // The load on one proxy has changed. // @@ Ossama: see my comments on LoadBalancing_i about changing the // signature of this method. diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp index 6bb9811ad30..f121cfc75f3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -14,30 +14,30 @@ BasicLogFactory_i::~BasicLogFactory_i() } DsLogAdmin::BasicLogFactory_ptr -BasicLogFactory_i::activate (PortableServer::POA_ptr poa, - CORBA::Environment &ACE_TRY_ENV) +BasicLogFactory_i::activate (PortableServer::POA_ptr poa + TAO_ENV_ARG_DECL) { DsLogAdmin::BasicLogFactory_var v_return; PortableServer::ObjectId_var oid = - poa->activate_object (this, - ACE_TRY_ENV); + poa->activate_object (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (v_return._retn ()); CORBA::Object_var obj = - poa->id_to_reference (oid.in (), - ACE_TRY_ENV); + poa->id_to_reference (oid.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (v_return._retn ()); // narrow and store the result.. this->log_mgr_ = - DsLogAdmin::LogMgr::_narrow (obj.in (), - ACE_TRY_ENV); + DsLogAdmin::LogMgr::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (v_return._retn ()); v_return = - DsLogAdmin::BasicLogFactory::_narrow (obj.in (), - ACE_TRY_ENV); + DsLogAdmin::BasicLogFactory::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ()); return v_return._retn (); @@ -46,8 +46,8 @@ BasicLogFactory_i::activate (PortableServer::POA_ptr poa, DsLogAdmin::BasicLog_ptr BasicLogFactory_i::create (DsLogAdmin::LogFullAction full_action, CORBA::ULongLong max_rec_size, - DsLogAdmin::LogId_out id, - CORBA::Environment &ACE_TRY_ENV) + DsLogAdmin::LogId_out id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::NoResources )) @@ -58,8 +58,8 @@ BasicLogFactory_i::create (DsLogAdmin::LogFullAction full_action, DsLogAdmin::BasicLog_ptr basiclog = this->create_with_id (this->max_id_, full_action, - max_rec_size, - ACE_TRY_ENV); + max_rec_size + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ()); // Set the id to return.. @@ -70,8 +70,8 @@ BasicLogFactory_i::create (DsLogAdmin::LogFullAction full_action, DsLogAdmin::BasicLog_ptr BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id, DsLogAdmin::LogFullAction full_action, - CORBA::ULongLong max_size, - CORBA::Environment &ACE_TRY_ENV) + CORBA::ULongLong max_size + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DsLogAdmin::NoResources, @@ -101,14 +101,14 @@ BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id, auto_ptr<BasicLog_i> basic_log_auto (basic_log_i); // just in case the activation fails. - basic_log_i->init (ACE_TRY_ENV); + basic_log_i->init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (basic_log._retn ()); // Register with the poa - basic_log = basic_log_i->_this (ACE_TRY_ENV); + basic_log = basic_log_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (basic_log._retn ()); - basic_log_i->_remove_ref (ACE_TRY_ENV); + basic_log_i->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ()); // Add to the Hash table.. diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h index e291baa60e2..58c6c556192 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h @@ -50,15 +50,15 @@ public: // Dtor DsLogAdmin::BasicLogFactory_ptr - activate (PortableServer::POA_ptr poa, - CORBA::Environment &ACE_TRY_ENV); + activate (PortableServer::POA_ptr poa + TAO_ENV_ARG_DECL); // Activate this servant with the POA passed in. DsLogAdmin::BasicLog_ptr create (DsLogAdmin::LogFullAction full_action, CORBA::ULongLong max_size, - DsLogAdmin::LogId_out id, - CORBA_Environment& ACE_TRY_ENV) + DsLogAdmin::LogId_out id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::NoResources )); @@ -68,8 +68,8 @@ public: DsLogAdmin::BasicLog_ptr create_with_id (DsLogAdmin::LogId id, DsLogAdmin::LogFullAction full_action, - CORBA::ULongLong max_size, - CORBA_Environment& ACE_TRY_ENV) + CORBA::ULongLong max_size + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DsLogAdmin::NoResources, diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index bb9e047abd3..4c242a8c376 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -21,7 +21,7 @@ BasicLog_i::~BasicLog_i () } void -BasicLog_i::destroy (CORBA::Environment &ACE_TRY_ENV) +BasicLog_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove ourselves from the list of logs. @@ -29,15 +29,15 @@ BasicLog_i::destroy (CORBA::Environment &ACE_TRY_ENV) // Deregister with POA. PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index aca57dc79ed..483db1f88c6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -65,7 +65,7 @@ public: // Destructor. void - destroy (CORBA::Environment &ACE_TRY_ENV) + destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroy the log object and all contained records. diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp index 942a6b7e715..8483089c925 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -31,29 +31,29 @@ Iterator_i::~Iterator_i (void) } void -Iterator_i::destroy (CORBA::Environment &ACE_TRY_ENV) +Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableServer::POA_ptr poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_ptr poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Goodbye cruel world... // deactivate from the poa. - poa->deactivate_object (oid.in (), - ACE_TRY_ENV); + poa->deactivate_object (oid.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; return; } DsLogAdmin::RecordList* Iterator_i::get (CORBA::ULong position, - CORBA::ULong how_many, - CORBA::Environment &ACE_TRY_ENV) + CORBA::ULong how_many + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)) { @@ -72,8 +72,8 @@ Iterator_i::get (CORBA::ULong position, } // Use an Interpreter to build an expression tree. - TAO_Log_Constraint_Interpreter interpreter (constraint_, - ACE_TRY_ENV); + TAO_Log_Constraint_Interpreter interpreter (constraint_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Sequentially iterate over all the records and pick the ones that @@ -122,7 +122,7 @@ Iterator_i::get (CORBA::ULong position, if (done == 1) { // destroy this object.. - this->destroy (ACE_TRY_ENV); + this->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (rec_list); } diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h index 7b4ff48eb1f..f20c1e7980b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h @@ -57,13 +57,13 @@ public: //Destructor DsLogAdmin::RecordList* get (CORBA::ULong position, - CORBA::ULong how_many, - CORBA::Environment &ACE_TRY_ENV) + CORBA::ULong how_many + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)); // Gets a list of LogRecords. - void destroy (CORBA::Environment &ACE_TRY_ENV) + void destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This destroys the iterator. diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index 79083bb3a25..eef4349d9ff 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -13,7 +13,7 @@ LogMgr_i::~LogMgr_i () } DsLogAdmin::LogList* -LogMgr_i::list_logs (CORBA::Environment &ACE_TRY_ENV) +LogMgr_i::list_logs (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -50,8 +50,8 @@ LogMgr_i::list_logs (CORBA::Environment &ACE_TRY_ENV) } DsLogAdmin::Log_ptr -LogMgr_i::find_log (DsLogAdmin::LogId id, - CORBA::Environment &/*ACE_TRY_ENV*/) +LogMgr_i::find_log (DsLogAdmin::LogId id + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -82,7 +82,7 @@ LogMgr_i::find_log (DsLogAdmin::LogId id, } DsLogAdmin::LogIdList* -LogMgr_i::list_logs_by_id (CORBA::Environment &ACE_TRY_ENV) +LogMgr_i::list_logs_by_id (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h index a3f0d8adf96..8b6455b0fef 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -40,25 +40,22 @@ public: // Destructor. DsLogAdmin::LogList * - list_logs (CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment ()) + list_logs (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); // Lists all logs created by the log factory DsLogAdmin::Log_ptr - find_log (DsLogAdmin::LogId id, - CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment ()) + find_log (DsLogAdmin::LogId id + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); // Returns a reference to the log with the supplied id DsLogAdmin::LogIdList * - list_logs_by_id (CORBA::Environment &ACE_TRY_ENV = - CORBA::default_environment ()) + list_logs_by_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp index 533efe4307f..d87f5406087 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp @@ -4,8 +4,8 @@ #include "Log_Constraint_Visitors.h" TAO_Log_Constraint_Interpreter:: -TAO_Log_Constraint_Interpreter(const char* constraints, - CORBA::Environment& ACE_TRY_ENV) +TAO_Log_Constraint_Interpreter(const char* constraints + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint, CORBA::NO_MEMORY)) { diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h index 07cfca1fd89..a68ab3deedb 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h @@ -36,8 +36,8 @@ class TAO_Log_Export TAO_Log_Constraint_Interpreter : public TAO_Interpreter // "TCL" Interpreter for the Log queries. public: // = Initialization and termination methods. - TAO_Log_Constraint_Interpreter (const char* constraints, - CORBA::Environment& ACE_TRY_ENV) + TAO_Log_Constraint_Interpreter (const char* constraints + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint, CORBA::NO_MEMORY)); // This constructor builds an expression tree representing the diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index 90b54c73063..c9c9aeae5a0 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -29,13 +29,13 @@ visit_property (TAO_Property_Constraint* literal) if (this->props_.find (prop_name, prop_index) == 0) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; CORBA::Any *value = 0; // Retrieve the value of the property from the Property_Evaluator ACE_TRY { - // value = this->prop_eval_.property_value (prop_index, ACE_TRY_ENV); + // value = this->prop_eval_.property_value (prop_index TAO_ENV_ARG_PARAMETER); ACE_NEW_THROW_EX (value, CORBA::Any, CORBA::NO_MEMORY ()); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index dfd6e3c3b6c..8136149246a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -29,7 +29,7 @@ Log_i::Log_i (DsLogAdmin::LogMgr_ptr factory, } void -Log_i::init (CORBA::Environment &ACE_TRY_ENV) +Log_i::init (TAO_ENV_SINGLE_ARG_DECL) { if (recordstore_.open () ==-1) ACE_THROW (CORBA::UNKNOWN ()); @@ -46,21 +46,21 @@ Log_i::~Log_i (void) } DsLogAdmin::LogMgr_ptr -Log_i::my_factory (CORBA::Environment &) +Log_i::my_factory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return DsLogAdmin::LogMgr::_duplicate (factory_.in ()); } DsLogAdmin::LogId -Log_i::id (CORBA::Environment &) +Log_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return logid_; } DsLogAdmin::QoSList* -Log_i::get_qos (CORBA::Environment &ACE_TRY_ENV) +Log_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { DsLogAdmin::QoSList* ret_val; @@ -72,8 +72,8 @@ Log_i::get_qos (CORBA::Environment &ACE_TRY_ENV) } void -Log_i::set_qos (const DsLogAdmin::QoSList &qos, - CORBA::Environment &ACE_TRY_ENV) +Log_i::set_qos (const DsLogAdmin::QoSList &qos + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)) { @@ -100,15 +100,15 @@ Log_i::set_qos (const DsLogAdmin::QoSList &qos, } CORBA::ULong -Log_i::get_max_record_life (CORBA::Environment &) +Log_i::get_max_record_life (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return max_record_life_; } void -Log_i::set_max_record_life (CORBA::ULong life, - CORBA::Environment &ACE_TRY_ENV) +Log_i::set_max_record_life (CORBA::ULong life + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // life is in seconds. @@ -119,15 +119,15 @@ Log_i::set_max_record_life (CORBA::ULong life, } CORBA::ULongLong -Log_i::get_max_size (CORBA::Environment &) +Log_i::get_max_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return recordstore_.get_max_size (); } void -Log_i::set_max_size (CORBA::ULongLong size, - CORBA::Environment &ACE_TRY_ENV) +Log_i::set_max_size (CORBA::ULongLong size + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)) { @@ -146,81 +146,81 @@ Log_i::set_max_size (CORBA::ULongLong size, } CORBA::ULongLong -Log_i::get_current_size (CORBA::Environment &) +Log_i::get_current_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recordstore_.get_current_size (); } CORBA::ULongLong -Log_i::get_n_records (CORBA::Environment &) +Log_i::get_n_records (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recordstore_.get_n_records (); } DsLogAdmin::LogFullAction -Log_i::get_log_full_action (CORBA::Environment &) +Log_i::get_log_full_action (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return log_full_action_; } void -Log_i::set_log_full_action (DsLogAdmin::LogFullAction action, - CORBA::Environment &) +Log_i::set_log_full_action (DsLogAdmin::LogFullAction action + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { log_full_action_ = action; } DsLogAdmin::AdministrativeState -Log_i::get_administrative_state (CORBA::Environment &) +Log_i::get_administrative_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return admin_state_; } void -Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state, - CORBA::Environment &) +Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->admin_state_ = state; } DsLogAdmin::ForwardingState -Log_i::get_forwarding_state (CORBA::Environment &) +Log_i::get_forwarding_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->forward_state_; } void -Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state, - CORBA::Environment &) +Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->forward_state_ = state; } DsLogAdmin::OperationalState -Log_i::get_operational_state (CORBA::Environment &) +Log_i::get_operational_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->op_state_; } DsLogAdmin::TimeInterval -Log_i::get_interval (CORBA::Environment &) +Log_i::get_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->interval_; } void -Log_i::set_interval (const DsLogAdmin::TimeInterval &interval, - CORBA::Environment &ACE_TRY_ENV) +Log_i::set_interval (const DsLogAdmin::TimeInterval &interval + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval)) @@ -232,7 +232,7 @@ Log_i::set_interval (const DsLogAdmin::TimeInterval &interval, } DsLogAdmin::AvailabilityStatus -Log_i::get_availability_status (CORBA::Environment &) +Log_i::get_availability_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO: @@ -249,7 +249,7 @@ Log_i::get_availability_status (CORBA::Environment &) } DsLogAdmin::CapacityAlarmThresholdList* -Log_i::get_capacity_alarm_thresholds (CORBA::Environment &ACE_TRY_ENV) +Log_i::get_capacity_alarm_thresholds (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { DsLogAdmin::CapacityAlarmThresholdList* ret_val; @@ -264,8 +264,8 @@ Log_i::get_capacity_alarm_thresholds (CORBA::Environment &ACE_TRY_ENV) void Log_i::set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList - &threshs, - CORBA::Environment &) + &threshs + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidThreshold)) { @@ -277,7 +277,7 @@ Log_i::set_capacity_alarm_thresholds (const } DsLogAdmin::WeekMask* -Log_i::get_week_mask (CORBA::Environment &ACE_TRY_ENV) +Log_i::get_week_mask (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { DsLogAdmin::WeekMask* ret_val; @@ -290,8 +290,8 @@ Log_i::get_week_mask (CORBA::Environment &ACE_TRY_ENV) } void -Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks, - CORBA::Environment &) +Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval, @@ -305,14 +305,14 @@ Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks, DsLogAdmin::RecordList* Log_i::query_i (const char *constraint, DsLogAdmin::Iterator_out &iter_out, - CORBA::ULong how_many, - CORBA::Environment &ACE_TRY_ENV) + CORBA::ULong how_many + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidConstraint)) { // Use an Interpreter to build an expression tree. - TAO_Log_Constraint_Interpreter interpreter (constraint, - ACE_TRY_ENV); + TAO_Log_Constraint_Interpreter interpreter (constraint + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Sequentially iterate over all the records and pick the ones that @@ -393,11 +393,11 @@ Log_i::query_i (const char *constraint, ACE_CHECK_RETURN (rec_list); // Activate it. - iter_out = iter_query->_this (ACE_TRY_ENV); + iter_out = iter_query->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (rec_list); // Give ownership to the POA. - this->_remove_ref (ACE_TRY_ENV); + this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (rec_list); } @@ -407,20 +407,20 @@ Log_i::query_i (const char *constraint, DsLogAdmin::RecordList* Log_i::query (const char *grammar, const char *constraint, - DsLogAdmin::Iterator_out iter_out, - CORBA::Environment &ACE_TRY_ENV) + DsLogAdmin::Iterator_out iter_out + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { - this->check_grammar (grammar, ACE_TRY_ENV); + this->check_grammar (grammar TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); DsLogAdmin::RecordList* rec_list = this->query_i (constraint, iter_out, - this->max_rec_list_len_, - ACE_TRY_ENV); + this->max_rec_list_len_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (rec_list); return rec_list; @@ -429,8 +429,8 @@ Log_i::query (const char *grammar, DsLogAdmin::RecordList* Log_i::retrieve (DsLogAdmin::TimeT from_time, CORBA::Long how_many, - DsLogAdmin::Iterator_out iter_out, - CORBA::Environment &ACE_TRY_ENV) + DsLogAdmin::Iterator_out iter_out + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Decide between forward vs backward retrieval. @@ -453,8 +453,8 @@ Log_i::retrieve (DsLogAdmin::TimeT from_time, DsLogAdmin::RecordList* rec_list = this->query_i (constraint, iter_out, - how_many, - ACE_TRY_ENV); + how_many + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (rec_list); return rec_list; @@ -462,14 +462,14 @@ Log_i::retrieve (DsLogAdmin::TimeT from_time, CORBA::ULong Log_i::match_i (const char *constraint, - CORBA::Boolean delete_rec, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean delete_rec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidConstraint)) { // Use an Interpreter to build an expression tree. - TAO_Log_Constraint_Interpreter interpreter (constraint, - ACE_TRY_ENV); + TAO_Log_Constraint_Interpreter interpreter (constraint + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Get the underlying storage. @@ -514,17 +514,17 @@ Log_i::match_i (const char *constraint, CORBA::ULong Log_i::match (const char* grammar, - const char *constraint, - CORBA::Environment &ACE_TRY_ENV) + const char *constraint + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { - this->check_grammar (grammar, ACE_TRY_ENV); + this->check_grammar (grammar TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong count = - this->match_i (constraint, 0, ACE_TRY_ENV); + this->match_i (constraint, 0 TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (count); return count; @@ -532,17 +532,17 @@ Log_i::match (const char* grammar, CORBA::ULong Log_i::delete_records (const char *grammar, - const char *constraint, - CORBA::Environment &ACE_TRY_ENV) + const char *constraint + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { - this->check_grammar (grammar, ACE_TRY_ENV); + this->check_grammar (grammar TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong count = - this->match_i (constraint, 1, ACE_TRY_ENV); + this->match_i (constraint, 1 TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (count); return count; @@ -550,8 +550,8 @@ Log_i::delete_records (const char *grammar, CORBA::ULong Log_i::delete_records_by_id (const - DsLogAdmin::RecordIdList &ids, - CORBA::Environment &) + DsLogAdmin::RecordIdList &ids + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong numdone (0); @@ -568,8 +568,8 @@ Log_i::delete_records_by_id (const } void -Log_i::write_records (const DsLogAdmin::Anys &records, - CORBA::Environment &ACE_TRY_ENV) +Log_i::write_records (const DsLogAdmin::Anys &records + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogFull, DsLogAdmin::LogLocked)) @@ -583,13 +583,13 @@ Log_i::write_records (const DsLogAdmin::Anys &records, reclist [i].info = records[i]; } - this->write_recordlist (reclist, ACE_TRY_ENV); + this->write_recordlist (reclist TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist, - CORBA::Environment &ACE_TRY_ENV) +Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogFull, DsLogAdmin::LogLocked)) @@ -601,7 +601,7 @@ Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist, // Check if the log is on duty // @@ Wait for Comittee ruling on the proper behavior DsLogAdmin::AvailabilityStatus avail_stat = - this->get_availability_status (ACE_TRY_ENV); + this->get_availability_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (avail_stat.off_duty == 1) @@ -660,8 +660,8 @@ Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist, void Log_i::set_record_attribute (DsLogAdmin::RecordId id, - const DsLogAdmin::NVList &attr_list, - CORBA::Environment &ACE_TRY_ENV) + const DsLogAdmin::NVList &attr_list + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidRecordId, DsLogAdmin::InvalidAttribute)) @@ -686,7 +686,7 @@ CORBA::ULong Log_i::set_records_attribute (const char *grammar, const char *constraint, const DsLogAdmin::NVList - &attr_list, CORBA::Environment &ACE_TRY_ENV) + &attr_list TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint, @@ -700,8 +700,8 @@ Log_i::set_records_attribute (const char *grammar, } DsLogAdmin::NVList* -Log_i::get_record_attribute (DsLogAdmin::RecordId id, - CORBA::Environment &ACE_TRY_ENV) +Log_i::get_record_attribute (DsLogAdmin::RecordId id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidRecordId)) { @@ -723,8 +723,8 @@ Log_i::get_record_attribute (DsLogAdmin::RecordId id, // @@ These two methods are non-trivial. Let's hold off on them for a while DsLogAdmin::Log_ptr -Log_i::copy (DsLogAdmin::LogId_out id, - CORBA::Environment &ACE_TRY_ENV) +Log_i::copy (DsLogAdmin::LogId_out id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (id); @@ -732,8 +732,8 @@ Log_i::copy (DsLogAdmin::LogId_out id, } DsLogAdmin::Log_ptr -Log_i::copy_with_id (DsLogAdmin::LogId id, - CORBA::Environment &ACE_TRY_ENV) +Log_i::copy_with_id (DsLogAdmin::LogId id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogIdAlreadyExists)) { @@ -743,7 +743,7 @@ Log_i::copy_with_id (DsLogAdmin::LogId id, // @@ Should I just raise the exception? void -Log_i::flush (CORBA::Environment &ACE_TRY_ENV) +Log_i::flush (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)) { @@ -768,8 +768,8 @@ Log_i::scheduled (void) } void -Log_i::check_grammar (const char* grammar, - CORBA::Environment &ACE_TRY_ENV) +Log_i::check_grammar (const char* grammar + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar)) { diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 8d9b3e37ed7..79c5a90aae1 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -55,130 +55,130 @@ public: ~Log_i (); // Destructor. - void init (CORBA::Environment &ACE_TRY_ENV); + void init (TAO_ENV_SINGLE_ARG_DECL); // Initlialize the Log. // = DsLogAdmin::Log methods - DsLogAdmin::LogMgr_ptr my_factory (CORBA::Environment &ACE_TRY_ENV) + DsLogAdmin::LogMgr_ptr my_factory (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the factory of the log - DsLogAdmin::LogId id (CORBA::Environment &ACE_TRY_ENV) + DsLogAdmin::LogId id (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the id of the log DsLogAdmin::QoSList* - get_qos (CORBA::Environment &ACE_TRY_ENV) + get_qos (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the list of the QoS properties supported by the log - void set_qos (const DsLogAdmin::QoSList & qos, - CORBA::Environment &ACE_TRY_ENV) + void set_qos (const DsLogAdmin::QoSList & qos + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)); // Set the list of the QoS properties supported by the log. CORBA::ULong - get_max_record_life (CORBA::Environment &ACE_TRY_ENV) + get_max_record_life (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the record life in seconds (0 infinite) void - set_max_record_life (CORBA::ULong life, - CORBA::Environment &ACE_TRY_ENV) + set_max_record_life (CORBA::ULong life + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Set the record life in seconds (0 infinite) CORBA::ULongLong - get_max_size (CORBA::Environment &ACE_TRY_ENV) + get_max_size (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the maximum size in octets void - set_max_size (CORBA::ULongLong size, - CORBA::Environment &ACE_TRY_ENV) + set_max_size (CORBA::ULongLong size + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)); // Set the maximum size in octets. CORBA::ULongLong - get_current_size (CORBA::Environment &ACE_TRY_ENV) + get_current_size (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the current size of the log in octets. CORBA::ULongLong - get_n_records (CORBA::Environment &ACE_TRY_ENV) + get_n_records (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the number of records in the log DsLogAdmin::LogFullAction - get_log_full_action (CORBA::Environment &ACE_TRY_ENV) + get_log_full_action (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the action to be taken when the log reaches its maximum size void - set_log_full_action (DsLogAdmin::LogFullAction action, - CORBA::Environment &ACE_TRY_ENV) + set_log_full_action (DsLogAdmin::LogFullAction action + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Set the action to be taken when the log reaches its maximum size DsLogAdmin::AdministrativeState - get_administrative_state (CORBA::Environment &ACE_TRY_ENV) + get_administrative_state (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the administrative state of the log. void - set_administrative_state (DsLogAdmin::AdministrativeState state, - CORBA::Environment &ACE_TRY_ENV) + set_administrative_state (DsLogAdmin::AdministrativeState state + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Set the administrative state of the log. virtual DsLogAdmin::ForwardingState - get_forwarding_state (CORBA::Environment &ACE_TRY_ENV) + get_forwarding_state (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the forwarding state of the log. // @@ Note: is it ok to make this method virtual? void - set_forwarding_state (DsLogAdmin::ForwardingState state, - CORBA::Environment &ACE_TRY_ENV) + set_forwarding_state (DsLogAdmin::ForwardingState state + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Set the forwarding state of the log. // @@ Note: is it ok to make this method virtual? DsLogAdmin::OperationalState - get_operational_state (CORBA::Environment &ACE_TRY_ENV) + get_operational_state (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the operational state of the log. DsLogAdmin::TimeInterval - get_interval (CORBA::Environment &ACE_TRY_ENV) + get_interval (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the log duration void - set_interval (const DsLogAdmin::TimeInterval & interval, - CORBA::Environment &ACE_TRY_ENV) + set_interval (const DsLogAdmin::TimeInterval & interval + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval)); // Set the log duration. DsLogAdmin::AvailabilityStatus - get_availability_status (CORBA::Environment &ACE_TRY_ENV) + get_availability_status (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the availability status DsLogAdmin::CapacityAlarmThresholdList* - get_capacity_alarm_thresholds (CORBA::Environment &ACE_TRY_ENV) + get_capacity_alarm_thresholds (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the capacity alarm threshold void set_capacity_alarm_thresholds - (const DsLogAdmin::CapacityAlarmThresholdList & threshs, - CORBA::Environment &ACE_TRY_ENV) + (const DsLogAdmin::CapacityAlarmThresholdList & threshs + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidThreshold)); // Set the capacity alarm threshold. Threshold values represent @@ -189,13 +189,13 @@ public: // 0). DsLogAdmin::WeekMask* - get_week_mask (CORBA::Environment &ACE_TRY_ENV) + get_week_mask (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the weekly scheduling parameters void - set_week_mask (const DsLogAdmin::WeekMask & masks, - CORBA::Environment &ACE_TRY_ENV) + set_week_mask (const DsLogAdmin::WeekMask & masks + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval, @@ -204,9 +204,9 @@ public: DsLogAdmin::RecordList* query (const char * grammar, - const char * c, - DsLogAdmin::Iterator_out i, - CORBA::Environment &ACE_TRY_ENV) + const char * c, + DsLogAdmin::Iterator_out i + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)); @@ -215,17 +215,17 @@ public: DsLogAdmin::RecordList* retrieve (DsLogAdmin::TimeT from_time, - CORBA::Long how_many, - DsLogAdmin::Iterator_out i, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Long how_many, + DsLogAdmin::Iterator_out i + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Retrieve <how_many> records from time <from_time> using iterator // <i>. CORBA::ULong match (const char * grammar, - const char * c, - CORBA::Environment &ACE_TRY_ENV) + const char * c + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)); @@ -233,31 +233,31 @@ public: CORBA::ULong delete_records (const char * grammar, - const char * c, - CORBA::Environment &ACE_TRY_ENV) + const char * c + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)); // Delete records matching constraint <c>. CORBA::ULong - delete_records_by_id (const DsLogAdmin::RecordIdList & ids, - CORBA::Environment &ACE_TRY_ENV) + delete_records_by_id (const DsLogAdmin::RecordIdList & ids + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Delete records matching ids in <ids> void - write_records (const DsLogAdmin::Anys & records, - CORBA::Environment &ACE_TRY_ENV) + write_records (const DsLogAdmin::Anys & records + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogFull, DsLogAdmin::LogLocked)); // Write records to the log storage. void - write_recordlist (const DsLogAdmin::RecordList & list, - CORBA::Environment &ACE_TRY_ENV) + write_recordlist (const DsLogAdmin::RecordList & list + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogFull, DsLogAdmin::LogLocked)); @@ -266,8 +266,8 @@ public: void set_record_attribute (DsLogAdmin::RecordId id, - const DsLogAdmin::NVList & attr_list, - CORBA::Environment &ACE_TRY_ENV) + const DsLogAdmin::NVList & attr_list + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidRecordId, DsLogAdmin::InvalidAttribute)); @@ -275,9 +275,9 @@ public: CORBA::ULong set_records_attribute (const char * grammar, - const char * c, - const DsLogAdmin::NVList & attr_list, - CORBA::Environment &ACE_TRY_ENV) + const char * c, + const DsLogAdmin::NVList & attr_list + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint, @@ -286,30 +286,30 @@ public: // constraints with same attr_list. DsLogAdmin::NVList* - get_record_attribute (DsLogAdmin::RecordId id, - CORBA::Environment &ACE_TRY_ENV) + get_record_attribute (DsLogAdmin::RecordId id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidRecordId)); // Get the attributes of the record with id <id>. Raises // DsLogAdmin::InvalidRecordId DsLogAdmin::Log_ptr - copy (DsLogAdmin::LogId_out id, - CORBA::Environment &ACE_TRY_ENV) + copy (DsLogAdmin::LogId_out id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Copy the log on which the operation was invoked. DsLogAdmin::Log_ptr - copy_with_id (DsLogAdmin::LogId id, - CORBA::Environment &ACE_TRY_ENV) + copy_with_id (DsLogAdmin::LogId id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogIdAlreadyExists)); // Copy the log on which the operation was invoked and assign it the // given id. void - flush (CORBA::Environment &ACE_TRY_ENV) + flush (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)); // Causes all pending events to be written to storage. Raises @@ -320,18 +320,18 @@ protected: DsLogAdmin::RecordList* query_i (const char *constraint, DsLogAdmin::Iterator_out &iter_out, - CORBA::ULong how_many, - CORBA::Environment &ACE_TRY_ENV) + CORBA::ULong how_many + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidConstraint)); CORBA::ULong match_i (const char *constraint, - CORBA::Boolean delete_rec, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean delete_rec + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidConstraint)); - void check_grammar (const char* grammar, CORBA::Environment &ACE_TRY_ENV) + void check_grammar (const char* grammar TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar)); // Throws DsLogAdmin::InvalidGrammar if we don't support this grammar. diff --git a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp index 696af20d676..06d74819fb2 100644 --- a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp +++ b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp @@ -36,7 +36,7 @@ TAO_LB_Minimum_Dispersion_Strategy::~TAO_LB_Minimum_Dispersion_Strategy (void) } CORBA::Object_ptr -TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) +TAO_LB_Minimum_Dispersion_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { for ( ; ; ) @@ -84,7 +84,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { CORBA::Boolean non_existent = - object->_non_existent (ACE_TRY_ENV); + object->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (!non_existent) { @@ -129,8 +129,8 @@ TAO_LB_Minimum_Dispersion_Strategy::remove (TAO_LB_ReplicaProxy *proxy) } void -TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy, - CORBA::Environment &ACE_TRY_ENV) +TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy + TAO_ENV_ARG_DECL) { int send_load_advisory = 0; @@ -185,7 +185,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy, // dispersion we tolerate before starting to send advisories. if (send_load_advisory == 2) { - proxy->control_->high_load_advisory (ACE_TRY_ENV); + proxy->control_->high_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; // We may not throw an exception, so explicitly return. @@ -199,7 +199,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy, // construction time... if (send_load_advisory == 1) { - proxy->control_->nominal_load_advisory (ACE_TRY_ENV); + proxy->control_->nominal_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h index fcf0b686ae3..df4e679543c 100644 --- a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h +++ b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h @@ -56,12 +56,12 @@ public: // Destructor // = The TAO_LB_LoadBalancing_Strategy methods - virtual CORBA::Object_ptr replica (CORBA_Environment &ACE_TRY_ENV) + virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int insert (TAO_LB_ReplicaProxy *); virtual int remove (TAO_LB_ReplicaProxy *); - virtual void load_changed (TAO_LB_ReplicaProxy *, - CORBA::Environment &ACE_TRY_ENV); + virtual void load_changed (TAO_LB_ReplicaProxy * + TAO_ENV_ARG_DECL); private: TAO_LB_ReplicaProxySet proxies_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp index ce20b14bc53..1349a07e442 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp @@ -31,19 +31,19 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator (void) // Since we are going away, decrement the reference count on the // Naming Context we were iterating over. - context_->interface ()->_remove_ref (ACE_TRY_ENV); + context_->interface ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); } // Return the Default POA of this Servant template <class ITERATOR, class TABLE_ENTRY> PortableServer::POA_ptr -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (CORBA::Environment &/*env*/) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) { return PortableServer::POA::_duplicate (this->poa_.in ()); } template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b, - CORBA::Environment &ACE_TRY_ENV) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosNaming::Binding *binding; @@ -71,7 +71,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b // self-destruct. if (context_->destroyed ()) { - destroy (ACE_TRY_ENV); + destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); @@ -100,8 +100,8 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many, - CosNaming::BindingList_out bl, - CORBA::Environment &ACE_TRY_ENV) + CosNaming::BindingList_out bl + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // We perform an allocation before obtaining the lock so that an out @@ -125,7 +125,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many, // self-destruct. if (context_->destroyed ()) { - destroy (ACE_TRY_ENV); + destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); @@ -167,7 +167,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many, } template <class ITERATOR, class TABLE_ENTRY> void -TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, @@ -184,12 +184,12 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (CORBA::Environment &ACE_T this->destroyed_ = 1; PortableServer::ObjectId_var id = - poa_->servant_to_id (this, - ACE_TRY_ENV); + poa_->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa_->deactivate_object (id.in (), - ACE_TRY_ENV); + poa_->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h index 66cbea7d01e..8881a030306 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h @@ -63,26 +63,26 @@ public: ~TAO_Bindings_Iterator (void); // Destructor. - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); // Returns the Default POA of this Servant object // = Idl methods. - CORBA::Boolean next_one (CosNaming::Binding_out b, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean next_one (CosNaming::Binding_out b + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation passes back the next unseen binding. True is // returned if a binding is passed back, and false is returned otherwise. CORBA::Boolean next_n (CORBA::ULong how_many, - CosNaming::BindingList_out bl, - CORBA::Environment &ACE_TRY_ENV) + CosNaming::BindingList_out bl + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation passes back at most <how_many> unseen bindings. // True is returned if bindings were passed back, and false is // returned if no bindings were passed back. - void destroy (CORBA::Environment &ACE_TRY_ENV) + void destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation destroys the iterator. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp index df040362419..98a689c88f7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp @@ -49,8 +49,8 @@ TAO_Hash_Naming_Context::_default_POA (void) } CosNaming::NamingContext_ptr -TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name, - CORBA::Environment &ACE_TRY_ENV) +TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name + TAO_ENV_ARG_DECL) { // Naming context we will return. CosNaming::NamingContext_var result = @@ -68,13 +68,13 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name, ACE_TRY { // Resolve the name. - CORBA::Object_var context = resolve (comp_name, - ACE_TRY_ENV); + CORBA::Object_var context = resolve (comp_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try narrowing object reference to the NamingContext type. - result = CosNaming::NamingContext::_narrow (context.in (), - ACE_TRY_ENV); + result = CosNaming::NamingContext::_narrow (context.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::NotFound, ex) @@ -108,8 +108,8 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name, void TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -134,13 +134,13 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, if (name_len > 1) { CosNaming::NamingContext_var context = - this->get_context (n, ACE_TRY_ENV); + this->get_context (n TAO_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->bind (simple_name, obj, ACE_TRY_ENV); + context->bind (simple_name, obj TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // If we received a simple name, we need to bind it in this context. @@ -162,8 +162,8 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, void TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -188,13 +188,13 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, if (name_len > 1) { CosNaming::NamingContext_var context = - get_context (n, ACE_TRY_ENV); + get_context (n TAO_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->rebind (simple_name, obj, ACE_TRY_ENV); + context->rebind (simple_name, obj TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -218,8 +218,8 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, void TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n, - CosNaming::NamingContext_ptr nc, - CORBA::Environment &ACE_TRY_ENV) + CosNaming::NamingContext_ptr nc + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -248,13 +248,13 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n, if (name_len > 1) { CosNaming::NamingContext_var context = - get_context (n, ACE_TRY_ENV); + get_context (n TAO_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->bind_context (simple_name, nc, ACE_TRY_ENV); + context->bind_context (simple_name, nc TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // If we received a simple name, we need to bind it in this context. @@ -276,8 +276,8 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n, void TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n, - CosNaming::NamingContext_ptr nc, - CORBA::Environment &ACE_TRY_ENV) + CosNaming::NamingContext_ptr nc + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -302,13 +302,13 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n, if (name_len > 1) { CosNaming::NamingContext_var context = - get_context (n, ACE_TRY_ENV); + get_context (n TAO_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->rebind_context (simple_name, nc, ACE_TRY_ENV); + context->rebind_context (simple_name, nc TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -331,8 +331,8 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n, } CORBA::Object_ptr -TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n, - CORBA::Environment &ACE_TRY_ENV) +TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -381,8 +381,8 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n, if (type == CosNaming::ncontext) { // Narrow to NamingContext. - context = CosNaming::NamingContext::_narrow (result.in (), - ACE_TRY_ENV); + context = CosNaming::NamingContext::_narrow (result.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result._retn ()); } else @@ -415,8 +415,8 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n, + 1); // If there are any exceptions, they will propagate up. - return context->resolve (rest_of_name, - ACE_TRY_ENV); + return context->resolve (rest_of_name + TAO_ENV_ARG_PARAMETER); } } // If the name we had to resolve was simple, we just need to return @@ -425,8 +425,8 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n, } void -TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n, - CORBA::Environment &ACE_TRY_ENV) +TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, @@ -451,13 +451,13 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n, if (name_len > 1) { CosNaming::NamingContext_var context = - get_context (n, ACE_TRY_ENV); + get_context (n TAO_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->unbind (simple_name, ACE_TRY_ENV); + context->unbind (simple_name TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // If we received a simple name, we need to unbind it in this @@ -471,8 +471,8 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n, } CosNaming::NamingContext_ptr -TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n, - CORBA::Environment &ACE_TRY_ENV) +TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n + TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, @@ -491,15 +491,15 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n, CosNaming::NamingContext::_nil (); // Create new context. - result = new_context (ACE_TRY_ENV); + result = new_context (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); // Bind the new context to the name. ACE_TRY { bind_context (n, - result.in (), - ACE_TRY_ENV); + result.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -508,10 +508,10 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n, // created context, should any exceptions be raised by the // destroy() operation we want to ignore them. { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY_EX(DESTROY) { - result->destroy (ACE_TRY_ENV); + result->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX(DESTROY); } ACE_CATCHANY {} ACE_ENDTRY; @@ -526,7 +526,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n, } void -TAO_Hash_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_Hash_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, @@ -562,8 +562,8 @@ TAO_Hash_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV) ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index 5002530994b..c98b13d2b1a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -122,8 +122,8 @@ public: // = CosNaming::NamingContext idl interface methods. virtual void bind (const CosNaming::Name &n, - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL); // Create a binding for name <n> and object <obj> in the naming // context. Compound names are treated as follows: ctx->bind (<c1; // c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>, @@ -133,49 +133,49 @@ public: // participate in name resolution later. virtual void rebind (const CosNaming::Name &n, - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL); // This is similar to <bind> operation above, except for when the // binding for the specified name already exists in the specified // context. In that case, the existing binding is replaced with the // new one. virtual void bind_context (const CosNaming::Name &n, - CosNaming::NamingContext_ptr nc, - CORBA::Environment &ACE_TRY_ENV); + CosNaming::NamingContext_ptr nc + TAO_ENV_ARG_DECL); // This is the version of <bind> specifically for binding naming // contexts, so that they will participate in name resolution when // compound names are passed to be resolved. virtual void rebind_context (const CosNaming::Name &n, - CosNaming::NamingContext_ptr nc, - CORBA::Environment &ACE_TRY_ENV); + CosNaming::NamingContext_ptr nc + TAO_ENV_ARG_DECL); // This is a version of <rebind> specifically for naming contexts, // so that they can participate in name resolution when compound // names are passed. - virtual CORBA::Object_ptr resolve (const CosNaming::Name &n, - CORBA::Environment &ACE_TRY_ENV); + virtual CORBA::Object_ptr resolve (const CosNaming::Name &n + TAO_ENV_ARG_DECL); // Return object reference that is bound to the name. Compound name // resolve is defined as follows: ctx->resolve (<c1; c2; cn>) = // ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The naming service // does not return the type of the object. Clients are responsible // for "narrowing" the object to the appropriate type. - virtual void unbind (const CosNaming::Name &n, - CORBA::Environment &ACE_TRY_ENV); + virtual void unbind (const CosNaming::Name &n + TAO_ENV_ARG_DECL); // Remove the name binding from the context. When compound names // are used, unbind is defined as follows: ctx->unbind (<c1; c2; // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>) - virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n, - CORBA::Environment &ACE_TRY_ENV); + virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n + TAO_ENV_ARG_DECL); // This operation creates a new context and binds it to the name // supplied as an argument. The newly-created context is // implemented by the same server as the context in which it was // bound (the name argument excluding the last component). - virtual void destroy (CORBA::Environment &ACE_TRY_ENV); + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL); // Delete the naming context. The user should take care to <unbind> any // bindings in which the given context is bound to some names, to // avoid dangling references when invoking <destroy> operation. @@ -189,8 +189,8 @@ public: protected: // = Helper method used by other methods. - CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name, - CORBA::Environment &_env); + CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name + TAO_ENV_ARG_DECL); // <get_context> is used by methods that need to resolve a compound // name before performing the actual operation (e.g., bind, unbind, // etc.) <get_context> takes a full name (including the last diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp index a673ba3c6b2..5b9065fa68d 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -1,4 +1,5 @@ // $Id$ + // ============================================================================ // // = LIBRARY @@ -25,118 +26,118 @@ TAO_Naming_Context::~TAO_Naming_Context (void) } PortableServer::POA_ptr -TAO_Naming_Context::_default_POA (CORBA::Environment &/*env*/) +TAO_Naming_Context::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) { return impl_->_default_POA (); } void TAO_Naming_Context::bind (const CosNaming::Name &n, - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName, CosNaming::NamingContext::AlreadyBound)) { - impl_->bind (n, obj, ACE_TRY_ENV); + impl_->bind (n, obj TAO_ENV_ARG_PARAMETER); } void TAO_Naming_Context::rebind (const CosNaming::Name &n, - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - impl_->rebind (n, obj, ACE_TRY_ENV); + impl_->rebind (n, obj TAO_ENV_ARG_PARAMETER); } void TAO_Naming_Context::bind_context (const CosNaming::Name &n, - CosNaming::NamingContext_ptr nc, - CORBA::Environment &ACE_TRY_ENV) + CosNaming::NamingContext_ptr nc + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName, CosNaming::NamingContext::AlreadyBound)) { - impl_->bind_context (n, nc, ACE_TRY_ENV); + impl_->bind_context (n, nc TAO_ENV_ARG_PARAMETER); } void TAO_Naming_Context::rebind_context (const CosNaming::Name &n, - CosNaming::NamingContext_ptr nc, - CORBA::Environment &ACE_TRY_ENV) + CosNaming::NamingContext_ptr nc + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - impl_->rebind_context (n, nc, ACE_TRY_ENV); + impl_->rebind_context (n, nc TAO_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Naming_Context::resolve (const CosNaming::Name &n, - CORBA::Environment &ACE_TRY_ENV) +TAO_Naming_Context::resolve (const CosNaming::Name &n + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - return impl_->resolve (n, ACE_TRY_ENV); + return impl_->resolve (n TAO_ENV_ARG_PARAMETER); } void -TAO_Naming_Context::unbind (const CosNaming::Name &n, - CORBA::Environment &ACE_TRY_ENV) +TAO_Naming_Context::unbind (const CosNaming::Name &n + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - impl_->unbind (n, ACE_TRY_ENV); + impl_->unbind (n TAO_ENV_ARG_PARAMETER); } CosNaming::NamingContext_ptr -TAO_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) +TAO_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return impl_->new_context (ACE_TRY_ENV); + return impl_->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); } CosNaming::NamingContext_ptr -TAO_Naming_Context::bind_new_context (const CosNaming::Name &n, - CORBA::Environment &ACE_TRY_ENV) +TAO_Naming_Context::bind_new_context (const CosNaming::Name &n + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::AlreadyBound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - return impl_->bind_new_context (n, ACE_TRY_ENV); + return impl_->bind_new_context (n TAO_ENV_ARG_PARAMETER); } void -TAO_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotEmpty)) { - impl_->destroy (ACE_TRY_ENV); + impl_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); } void TAO_Naming_Context::list (CORBA::ULong how_many, CosNaming::BindingList_out bl, - CosNaming::BindingIterator_out bi, - CORBA::Environment &ACE_TRY_ENV) + CosNaming::BindingIterator_out bi + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - impl_->list (how_many, bl, bi, ACE_TRY_ENV); + impl_->list (how_many, bl, bi TAO_ENV_ARG_PARAMETER); } void @@ -171,8 +172,8 @@ to_string_helper_assign (char * &k, const char * &src) } char * -TAO_Naming_Context::to_string (const CosNaming::Name &n, - CORBA::Environment &ACE_TRY_ENV) +TAO_Naming_Context::to_string (const CosNaming::Name &n + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)) { @@ -287,8 +288,8 @@ to_name_helper (char *dest, const char*& src) } CosNaming::Name * -TAO_Naming_Context::to_name (const char *sn, - CORBA::Environment &ACE_TRY_ENV) +TAO_Naming_Context::to_name (const char *sn + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)) { @@ -406,8 +407,8 @@ TAO_Naming_Context::to_url_is_alnum_or_punctuation (char c) size_t TAO_Naming_Context::to_url_validate_and_compute_size ( const char *addr, - const char *sn, - CORBA::Environment &ACE_TRY_ENV) + const char *sn + TAO_ENV_ARG_DECL) { size_t addr_len = ACE_OS_String::strlen (addr); @@ -437,16 +438,16 @@ TAO_Naming_Context::to_url_validate_and_compute_size ( char * TAO_Naming_Context::to_url (const char * addr, - const char * sn, - CORBA::Environment &ACE_TRY_ENV) + const char * sn + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContextExt::InvalidAddress, CosNaming::NamingContext::InvalidName)) { /// Compute how many characters will be required for the URL CORBA::ULong no_char = - TAO_Naming_Context::to_url_validate_and_compute_size (addr, sn, - ACE_TRY_ENV); + TAO_Naming_Context::to_url_validate_and_compute_size (addr, sn + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -500,8 +501,8 @@ TAO_Naming_Context::to_url (const char * addr, } CORBA::Object_ptr -TAO_Naming_Context::resolve_str (const char * n, - CORBA::Environment &ACE_TRY_ENV) +TAO_Naming_Context::resolve_str (const char * n + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -512,11 +513,11 @@ TAO_Naming_Context::resolve_str (const char * n, // argument instead of a Name. // Get the unstrigified name. - CosNaming::Name_var name = this->to_name (n, ACE_TRY_ENV); + CosNaming::Name_var name = this->to_name (n TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Pass this unstringified name to resolve and return an Object_ptr - return this->resolve (name.in (), ACE_TRY_ENV); + return this->resolve (name.in () TAO_ENV_ARG_PARAMETER); } TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl (void) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index afe36fc0d1a..7168ed8deb4 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -54,9 +54,8 @@ public: // = CosNaming::NamingContext idl interface methods. virtual void bind (const CosNaming::Name &n, - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -72,9 +71,8 @@ public: // participate in name resolution later. virtual void rebind (const CosNaming::Name &n, - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -86,9 +84,8 @@ public: // new one. virtual void bind_context (const CosNaming::Name &n, - CosNaming::NamingContext_ptr nc, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + CosNaming::NamingContext_ptr nc + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -100,9 +97,8 @@ public: // compound names are passed to be resolved. virtual void rebind_context (const CosNaming::Name &n, - CosNaming::NamingContext_ptr nc, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + CosNaming::NamingContext_ptr nc + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -111,9 +107,8 @@ public: // so that they can participate in name resolution when compound // names are passed. - virtual CORBA::Object_ptr resolve (const CosNaming::Name &n, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::Object_ptr resolve (const CosNaming::Name &n + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -124,9 +119,8 @@ public: // does not return the type of the object. Clients are responsible // for "narrowing" the object to the appropriate type. - virtual void unbind (const CosNaming::Name &n, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void unbind (const CosNaming::Name &n + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -137,8 +131,7 @@ public: // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>) virtual CosNaming::NamingContext_ptr new_context ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation returns a new naming context implemented by the @@ -146,9 +139,8 @@ public: // context is not bound. virtual CosNaming::NamingContext_ptr bind_new_context ( - const CosNaming::Name &n, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + const CosNaming::Name &n + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::AlreadyBound, @@ -161,8 +153,7 @@ public: // bound (the name argument excluding the last component). - virtual void destroy (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotEmpty)); // Delete the naming context. The user should take care to <unbind> any @@ -174,9 +165,8 @@ public: virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out bl, - CosNaming::BindingIterator_out bi, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + CosNaming::BindingIterator_out bi + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns at most the requested number of bindings <how_many> in @@ -184,30 +174,26 @@ public: // are returned with a BindingIterator. In the naming context does // not contain any additional bindings <bi> returned as null. - virtual char * to_string (const CosNaming::Name &n, - CORBA::Environment - &ACE_TRY_ENV = - TAO_default_environment ()) + virtual char * to_string (const CosNaming::Name &n + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)); // Stringify the name using '\' as the escape character. The // characters '.' , '/' and '\' are to be escaped. If the input name // is invalid i.e. if the number of characters in the name is zero, - // an InvalidName exception is to be raised. - - virtual CosNaming::Name * to_name (const char *sn, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + // an InvalidName exception is to be raised. + + virtual CosNaming::Name * to_name (const char *sn + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)); // The in parameter is an stringified name. This function removes the // escape character '\' and destringifies the stringified name and returns // it. - + virtual char * to_url ( const char * addr, - const char * sn, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + const char * sn + TAO_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -218,10 +204,9 @@ public: // and sn refers to the strigified name of the object in that // context. This function returns a fully formed URL string like // iiopname://1.1@myhost.555xyz.com:9999/a/b/c - - virtual CORBA::Object_ptr resolve_str (const char * n, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + + virtual CORBA::Object_ptr resolve_str (const char * n + TAO_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -230,12 +215,12 @@ public: CosNaming::NamingContext::InvalidName, CosNaming::NamingContext::AlreadyBound )); - + // Similar to <resolve> as in the CosNaming::NamingContext interface. // It accepts a strigified name as an argument instead of a Name. - - virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env = TAO_default_environment ()); + + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Returns the Default POA of this Servant object private: @@ -266,8 +251,8 @@ private: // punctuation. static size_t to_url_validate_and_compute_size (const char *add, - const char *sn, - CORBA::Environment &ACE_TRY_ENV); + const char *sn + TAO_ENV_ARG_DECL); // Validate the to_url() method input, and compute the size of the // returned URL address. @@ -295,8 +280,8 @@ public: // = CosNaming::NamingContext idl interface methods. virtual void bind (const CosNaming::Name &n, - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV) = 0; + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL) = 0; // Create a binding for name <n> and object <obj> in the naming // context. Compound names are treated as follows: ctx->bind (<c1; // c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>, @@ -306,55 +291,54 @@ public: // participate in name resolution later. virtual void rebind (const CosNaming::Name &n, - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV) = 0; + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL) = 0; // This is similar to <bind> operation above, except for when the // binding for the specified name already exists in the specified // context. In that case, the existing binding is replaced with the // new one. virtual void bind_context (const CosNaming::Name &n, - CosNaming::NamingContext_ptr nc, - CORBA::Environment &ACE_TRY_ENV) = 0; + CosNaming::NamingContext_ptr nc + TAO_ENV_ARG_DECL) = 0; // This is the version of <bind> specifically for binding naming // contexts, so that they will participate in name resolution when // compound names are passed to be resolved. virtual void rebind_context (const CosNaming::Name &n, - CosNaming::NamingContext_ptr nc, - CORBA::Environment &ACE_TRY_ENV) = 0; + CosNaming::NamingContext_ptr nc + TAO_ENV_ARG_DECL) = 0; // This is a version of <rebind> specifically for naming contexts, // so that they can participate in name resolution when compound // names are passed. - virtual CORBA::Object_ptr resolve (const CosNaming::Name &n, - CORBA::Environment &ACE_TRY_ENV) = 0; + virtual CORBA::Object_ptr resolve (const CosNaming::Name &n + TAO_ENV_ARG_DECL) = 0; // Return object reference that is bound to the name. Compound name // resolve is defined as follows: ctx->resolve (<c1; c2; cn>) = // ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The naming service // does not return the type of the object. Clients are responsible // for "narrowing" the object to the appropriate type. - virtual void unbind (const CosNaming::Name &n, - CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void unbind (const CosNaming::Name &n + TAO_ENV_ARG_DECL) = 0; // Remove the name binding from the context. When compound names // are used, unbind is defined as follows: ctx->unbind (<c1; c2; // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>) - virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment - &ACE_TRY_ENV) = 0; + virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL) = 0; // This operation returns a new naming context implemented by the // same naming server in which the operation was invoked. The // context is not bound. - virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n, - CORBA::Environment &ACE_TRY_ENV) = 0; + virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n + TAO_ENV_ARG_DECL) = 0; // This operation creates a new context and binds it to the name // supplied as an argument. The newly-created context is // implemented by the same server as the context in which it was // bound (the name argument excluding the last component). - virtual void destroy (CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) = 0; // Delete the naming context. The user should take care to <unbind> any // bindings in which the given context is bound to some names, to // avoid dangling references when invoking <destroy> operation. @@ -364,8 +348,8 @@ public: virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, - CosNaming::BindingIterator_out &bi, - CORBA::Environment &ACE_TRY_ENV) = 0; + CosNaming::BindingIterator_out &bi + TAO_ENV_ARG_DECL) = 0; // Returns at most the requested number of bindings <how_many> in // <bl>. If the naming context contains additional bindings, they // are returned with a BindingIterator. In the naming context does diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index 240f2368547..1e12d7b1383 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -31,17 +31,17 @@ TAO_Naming_Loader::~TAO_Naming_Loader (void) int TAO_Naming_Loader::init (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This function call initializes the Naming Service CORBA::Object_var object = - this->create_object (orb.in (), argc, argv, ACE_TRY_ENV); + this->create_object (orb.in (), argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -62,8 +62,8 @@ TAO_Naming_Loader::fini (void) CORBA::Object_ptr TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, - int argc, char *argv[], - CORBA::Environment &) + int argc, char *argv[] + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { int result; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h index ddbcab690bc..61e0066a192 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h @@ -45,8 +45,8 @@ public: // This function call initializes the Naming Service given a reference to the // ORB and the command line parameters. CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, - int argc, char *argv[], - CORBA::Environment &ACE_TRY_ENV) + int argc, char *argv[] + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp index 6955036110f..059b9c7587c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp @@ -14,7 +14,9 @@ #include "ace/Auto_Ptr.h" #include "ace/Get_Opt.h" -ACE_RCSID(Naming, Naming_Utils, "$Id$") +ACE_RCSID (Naming, + Naming_Utils, + "$Id$") TAO_Naming_Server::TAO_Naming_Server (void) : naming_context_ (), @@ -75,14 +77,14 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb, { if (resolve_for_existing_naming_service) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Try to find an existing Naming Service. CORBA::Object_var naming_obj = orb->resolve_initial_references ("NameService", - timeout, - ACE_TRY_ENV); + timeout + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (naming_obj.in ())) @@ -95,13 +97,13 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb, "\nNameService found!\n")); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->naming_service_ior_ = - orb->object_to_string (naming_obj.in (), - ACE_TRY_ENV); + orb->object_to_string (naming_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -200,7 +202,7 @@ TAO_Naming_Server::init_with_orb (int argc, { int result; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Duplicate the ORB @@ -208,7 +210,7 @@ TAO_Naming_Server::init_with_orb (int argc, // Get the POA from the ORB. CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -219,16 +221,16 @@ TAO_Naming_Server::init_with_orb (int argc, } // Get the POA object. - this->root_poa_ = PortableServer::POA::_narrow (poa_object.in (), - ACE_TRY_ENV); + this->root_poa_ = PortableServer::POA::_narrow (poa_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_Manager. PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (ACE_TRY_ENV); + this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies (2); @@ -236,22 +238,22 @@ TAO_Naming_Server::init_with_orb (int argc, // Id Assignment policy policies[0] = - this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID, - ACE_TRY_ENV); + this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan policy policies[1] = - this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT, - ACE_TRY_ENV); + this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We use a different POA, otherwise the user would have to change // the object key each time it invokes the server. this->ns_poa_ = this->root_poa_->create_POA ("NameService", poa_manager.in (), - policies, - ACE_TRY_ENV); + policies + TAO_ENV_ARG_PARAMETER); // Warning! If create_POA fails, then the policies won't be // destroyed and there will be hell to pay in memory leaks! ACE_TRY_CHECK; @@ -262,7 +264,7 @@ TAO_Naming_Server::init_with_orb (int argc, ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (ACE_TRY_ENV); + policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -326,7 +328,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, size_t context_size, int enable_multicast) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { if (persistence_location != 0) @@ -361,24 +363,24 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, this->naming_context_ = TAO_Transient_Naming_Context::make_new_context (poa, TAO_ROOT_NAMING_CONTEXT, - context_size, - ACE_TRY_ENV); + context_size + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } // Set the ior of the root Naming Context. this->naming_service_ior_= - orb->object_to_string (this->naming_context_.in (), - ACE_TRY_ENV); + orb->object_to_string (this->naming_context_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable", ACE_TRY_ENV); + orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV); + IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { @@ -387,10 +389,10 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, else { CORBA::String_var ior = - orb->object_to_string (this->naming_context_.in (), - ACE_TRY_ENV); + orb->object_to_string (this->naming_context_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - adapter->bind ("NameService", ior.in (), ACE_TRY_ENV); + adapter->bind ("NameService", ior.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -490,17 +492,17 @@ TAO_Naming_Server::fini (void) // the Naming Service ACE_TRY_NEW_ENV { - this->ns_poa_->destroy (1, 1, ACE_TRY_ENV); + this->ns_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var table_object = - this->orb_->resolve_initial_references ("IORTable", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("IORTable" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV); + IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { @@ -508,7 +510,7 @@ TAO_Naming_Server::fini (void) } else { - adapter->unbind ("NameService", ACE_TRY_ENV); + adapter->unbind ("NameService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -562,11 +564,11 @@ int TAO_Naming_Client::init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService", timeout, ACE_TRY_ENV); + orb->resolve_initial_references ("NameService", timeout TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -574,8 +576,8 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb, " (%P|%t) Unable to initialize the NameService.\n"), -1); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index 01e5234a342..1fe01ea657a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -173,14 +173,14 @@ TAO_Persistent_Context_Index::init (size_t context_size) // CASE 1:there are no Naming Contexts registered. We need to create // one. { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; this->root_context_ = TAO_Persistent_Naming_Context::make_new_context (poa_.in (), TAO_ROOT_NAMING_CONTEXT, context_size, - this, - ACE_TRY_ENV); + this + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -246,16 +246,16 @@ TAO_Persistent_Context_Index::recreate_all (void) PortableServer::ServantBase_var s = context; // Register with the POA. - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId (entry->ext_id_.poa_id_); this->poa_->activate_object_with_id (id.in (), - context, - ACE_TRY_ENV); + context + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - CosNaming::NamingContext_var result = context->_this (ACE_TRY_ENV); + CosNaming::NamingContext_var result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // If this is the root Naming Context, take a note of it. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp index 41edb44f3f7..43567878765 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp @@ -70,8 +70,8 @@ TAO_Persistent_Bindings_Map::find (const char *id, return -1; else { - ACE_DECLARE_NEW_CORBA_ENV; - obj = orb_->string_to_object (entry.ref_, ACE_TRY_ENV); + TAO_ENV_DECLARE_NEW_ENV; + obj = orb_->string_to_object (entry.ref_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); type = entry.type_; @@ -163,8 +163,8 @@ TAO_Persistent_Bindings_Map::shared_bind (const char * id, int rebind) { // Obtain a stringified ior of <obj> (i.e., the representation we can store). - ACE_DECLARE_NEW_CORBA_ENV; - CORBA::String_var ref = orb_->object_to_string (obj, ACE_TRY_ENV); + TAO_ENV_DECLARE_NEW_ENV; + CORBA::String_var ref = orb_->object_to_string (obj TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Calculate and allocate the memory we need to store this name to @@ -322,8 +322,8 @@ CosNaming::NamingContext_ptr TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa, const char *poa_id, size_t context_size, - TAO_Persistent_Context_Index * ind, - CORBA::Environment &ACE_TRY_ENV) + TAO_Persistent_Context_Index * ind + TAO_ENV_ARG_DECL) { // Store the stub we will return here. CosNaming::NamingContext_var result; @@ -376,11 +376,11 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa, PortableServer::string_to_ObjectId (poa_id); poa->activate_object_with_id (id.in (), - context, - ACE_TRY_ENV); + context + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result._retn ()); - result = context->_this (ACE_TRY_ENV); + result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); // Everything went smoothly, without errors - we don't need any cleanup. @@ -390,7 +390,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa, } CosNaming::NamingContext_ptr -TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) +TAO_Persistent_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, @@ -415,8 +415,8 @@ TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) make_new_context (this->poa_.in (), poa_id, this->persistent_context_->total_size (), - this->index_, - ACE_TRY_ENV); + this->index_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); return result._retn (); @@ -425,8 +425,8 @@ TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) void TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, - CosNaming::BindingIterator_out &bi, - CORBA::Environment &ACE_TRY_ENV) + CosNaming::BindingIterator_out &bi + TAO_ENV_ARG_DECL) { // Allocate nil out parameters in case we won't be able to complete // the operation. @@ -515,7 +515,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, // Increment reference count on this Naming Context, so it doesn't get // deleted before the BindingIterator servant gets deleted. - interface_->_add_ref (ACE_TRY_ENV); + interface_->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Register with the POA. @@ -528,11 +528,11 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, PortableServer::string_to_ObjectId (poa_id); this->poa_->activate_object_with_id (id.in (), - bind_iter, - ACE_TRY_ENV); + bind_iter + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - bi = bind_iter->_this (ACE_TRY_ENV); + bi = bind_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h index a9fbbf636d9..80be98ec6e5 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h @@ -179,8 +179,8 @@ public: static CosNaming::NamingContext_ptr make_new_context (PortableServer::POA_ptr poa, const char *poa_id, size_t context_size, - TAO_Persistent_Context_Index *ind, - CORBA::Environment &ACE_TRY_ENV); + TAO_Persistent_Context_Index *ind + TAO_ENV_ARG_DECL); // This utility method factors out the code needed to create a new // Persistent Naming Context servant and activate it under the // specified POA with the specified id. This function is static so @@ -189,15 +189,15 @@ public: // = Methods not implemented in TAO_Hash_Naming_Context. - virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV); + virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL); // This operation returns a new naming context implemented by the // same naming server in which the operation was invoked. The // context is not bound. virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, - CosNaming::BindingIterator_out &bi, - CORBA::Environment &ACE_TRY_ENV); + CosNaming::BindingIterator_out &bi + TAO_ENV_ARG_DECL); // Returns at most the requested number of bindings <how_many> in // <bl>. If the naming context contains additional bindings, they // are returned with a BindingIterator. In the naming context does diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index 57782b697fb..14a4cf459a7 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -141,8 +141,8 @@ TAO_Transient_Naming_Context::~TAO_Transient_Naming_Context (void) CosNaming::NamingContext_ptr TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa, const char *poa_id, - size_t context_size, - CORBA::Environment &ACE_TRY_ENV) + size_t context_size + TAO_ENV_ARG_DECL) { // Store the stub we will return here. CosNaming::NamingContext_var result; @@ -180,18 +180,18 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa, PortableServer::string_to_ObjectId (poa_id); poa->activate_object_with_id (id.in (), - context, - ACE_TRY_ENV); + context + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result._retn ()); - result = context->_this (ACE_TRY_ENV); + result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); return result._retn (); } CosNaming::NamingContext_ptr -TAO_Transient_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) +TAO_Transient_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, @@ -216,8 +216,8 @@ TAO_Transient_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) CosNaming::NamingContext_var result = make_new_context (this->poa_.in (), poa_id, - this->transient_context_->total_size (), - ACE_TRY_ENV); + this->transient_context_->total_size () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); return result._retn (); @@ -226,8 +226,8 @@ TAO_Transient_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV) void TAO_Transient_Naming_Context::list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, - CosNaming::BindingIterator_out &bi, - CORBA::Environment &ACE_TRY_ENV) + CosNaming::BindingIterator_out &bi + TAO_ENV_ARG_DECL) { // Allocate nil out parameters in case we won't be able to complete // the operation. @@ -316,7 +316,7 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, // Increment reference count on this Naming Context, so it doesn't get // deleted before the BindingIterator servant gets deleted. - interface_->_add_ref (ACE_TRY_ENV); + interface_->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Register with the POA. @@ -329,11 +329,11 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, PortableServer::string_to_ObjectId (poa_id); this->poa_->activate_object_with_id (id.in (), - bind_iter, - ACE_TRY_ENV); + bind_iter + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - bi = bind_iter->_this (ACE_TRY_ENV); + bi = bind_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h index d66265afdfe..31912db4da8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h @@ -139,8 +139,8 @@ public: // = Utility methods. static CosNaming::NamingContext_ptr make_new_context (PortableServer::POA_ptr poa, const char *poa_id, - size_t context_size, - CORBA::Environment &ACE_TRY_ENV); + size_t context_size + TAO_ENV_ARG_DECL); // This utility method factors out the code needed to create a new // Transient Naming Context servant and activate it under the // specified POA with the specified id. This function is static so @@ -149,15 +149,15 @@ public: // = Methods not implemented in TAO_Hash_Naming_Context. - virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV); + virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL); // This operation returns a new naming context implemented by the // same naming server in which the operation was invoked. The // context is not bound. virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, - CosNaming::BindingIterator_out &bi, - CORBA::Environment &ACE_TRY_ENV); + CosNaming::BindingIterator_out &bi + TAO_ENV_ARG_DECL); // Returns at most the requested number of bindings <how_many> in // <bl>. If the naming context contains additional bindings, they // are returned with a BindingIterator. In the naming context does diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp index e160f649712..2d71b2be604 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp @@ -21,7 +21,7 @@ TAO_Notify_AdminProperties::~TAO_Notify_AdminProperties () } CosNotification::AdminProperties* -TAO_Notify_AdminProperties::get_admin (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_AdminProperties::get_admin (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -55,7 +55,7 @@ TAO_Notify_AdminProperties::get_admin (CORBA::Environment &ACE_TRY_ENV) } void -TAO_Notify_AdminProperties::set_admin (const CosNotification::AdminProperties & admin, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_AdminProperties::set_admin (const CosNotification::AdminProperties & admin TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedAdmin diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h index 43172179ecb..4ee03f658e5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h @@ -43,15 +43,15 @@ public: virtual ~TAO_Notify_AdminProperties (); virtual CosNotification::AdminProperties * get_admin ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void set_admin ( - const CosNotification::AdminProperties & admin, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::AdminProperties & admin + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp index 739903a3b5e..1a047909a33 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp @@ -22,7 +22,7 @@ TAO_Notify_Buffering_Strategy::~TAO_Notify_Buffering_Strategy () } void -TAO_Notify_Buffering_Strategy::execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb, CORBA::Environment& /*ACE_TRY_ENV*/, ACE_Time_Value *tv) +TAO_Notify_Buffering_Strategy::execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/, ACE_Time_Value *tv) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Enqueing command priority %d, queue_length = %d\n", diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h index 2b1eb90d8b0..db96b8e31f6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h @@ -45,7 +45,7 @@ public: virtual ~TAO_Notify_Buffering_Strategy (); - virtual void execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb, CORBA::Environment& ACE_TRY_ENV, ACE_Time_Value *tv); + virtual void execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv); // Execute this strategy. void max_queue_length (CORBA::Long max_queue_length); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h index 38498326b37..b8df19fd784 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h @@ -59,55 +59,55 @@ class TAO_Notify_Export TAO_Notify_CO_Factory : public ACE_Service_Object // public: // = Creation methods - virtual TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent, CORBA::Environment &ACE_TRY_ENV)=0; + virtual TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent TAO_ENV_ARG_DECL)=0; // Create an Event Channel. - virtual TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV)=0; + virtual TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)=0; // Create a Consumer Admin. - virtual TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV)=0; + virtual TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)=0; // Create a Supplier Admin. - virtual TAO_Notify_FilterFactory_i* create_filter_factory (CORBA::Environment &ACE_TRY_ENV)=0; + virtual TAO_Notify_FilterFactory_i* create_filter_factory (TAO_ENV_SINGLE_ARG_DECL)=0; // Create the Filter Factory. // = Proxy Creation methods. - virtual TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0; + virtual TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)=0; // Create a Structured ProxyPushSupplier. - virtual TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0; + virtual TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)=0; // Create a Sequence ProxyPushSupplier. - virtual TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0; + virtual TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)=0; // Create a ProxyPushSupplier. - virtual TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0; + virtual TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0; // Create a Structured ProxyPushConsumer. - virtual TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0; + virtual TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0; // Create a Sequence ProxyPushConsumer. - virtual TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0; + virtual TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0; // Create a ProxyPushConsumer. //= Locks // = Methods to create locks. - virtual ACE_Lock* create_channel_factory_lock (CORBA::Environment &ACE_TRY_ENV)=0; + virtual ACE_Lock* create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by channel factory. - virtual ACE_Lock* create_event_channel_lock (CORBA::Environment &ACE_TRY_ENV)=0; + virtual ACE_Lock* create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by EC's. - virtual ACE_Lock* create_consumer_admin_lock (CORBA::Environment &ACE_TRY_ENV)=0; + virtual ACE_Lock* create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by Consumer Admin's. - virtual ACE_Lock* create_supplier_admin_lock (CORBA::Environment &ACE_TRY_ENV)=0; + virtual ACE_Lock* create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by Supplier Admin's. - virtual ACE_Lock* create_proxy_supplier_lock (CORBA::Environment &ACE_TRY_ENV)=0; + virtual ACE_Lock* create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by proxy supplier. - virtual ACE_Lock* create_proxy_consumer_lock (CORBA::Environment &ACE_TRY_ENV)=0; + virtual ACE_Lock* create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by proxy consumer. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp index 042f5cdd761..ee8f631d50b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp @@ -52,9 +52,9 @@ TAO_Notify_Shutdown_Worker::TAO_Notify_Shutdown_Worker (void) } void -TAO_Notify_Shutdown_Worker::work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Shutdown_Worker::work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL) { - listener->shutdown (ACE_TRY_ENV); + listener->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } /********************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h index 2ecadfb8b77..046ed275efd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h @@ -80,7 +80,7 @@ class TAO_Notify_Export TAO_Notify_Shutdown_Worker : public TAO_ESF_Worker<TAO_N TAO_Notify_Shutdown_Worker (void); // = TAO_ESF_Worker method - void work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV); + void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL); }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h index 64bd4e8e80b..54fa37c4495 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h @@ -40,10 +40,10 @@ class TAO_Notify_Export TAO_Notify_Collection_Factory : public ACE_Service_Objec // public: // = Methods to create listener collections. - virtual TAO_Notify_EventListener_List* create_event_listener_list (CORBA::Environment &ACE_TRY_ENV) = 0; + virtual TAO_Notify_EventListener_List* create_event_listener_list (TAO_ENV_SINGLE_ARG_DECL) = 0; // Create the event listener list. - virtual TAO_Notify_UpdateListener_List* create_update_listener_list (CORBA::Environment &ACE_TRY_ENV) = 0; + virtual TAO_Notify_UpdateListener_List* create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL) = 0; // create update listener list. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h index d14b4ea5a66..127a0966189 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h @@ -46,7 +46,7 @@ class TAO_Notify_Export TAO_Notify_Command : public ACE_Message_Block TAO_Notify_Command (TAO_Notify_Event_Processor* event_processor, TAO_Notify_Event* event); ~TAO_Notify_Command (); - virtual int execute (CORBA::Environment& ACE_TRY_ENV) = 0; + virtual int execute (TAO_ENV_SINGLE_ARG_DECL) = 0; // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp index 221c84cc271..880651b59be 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp @@ -14,8 +14,8 @@ TAO_Notify_Constraint_Interpreter::~TAO_Notify_Constraint_Interpreter (void) } void -TAO_Notify_Constraint_Interpreter::build_tree (const char* constraints, - CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Constraint_Interpreter::build_tree (const char* constraints + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosNotifyFilter::InvalidConstraint, CORBA::NO_MEMORY)) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h index 00d9fe03ba3..4f481578719 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -47,8 +47,8 @@ public: ~TAO_Notify_Constraint_Interpreter (void); // Destructor - void build_tree (const char* constraints, - CORBA::Environment& ACE_TRY_ENV) + void build_tree (const char* constraints + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosNotifyFilter::InvalidConstraint, CORBA::NO_MEMORY)); // This constructor builds an expression tree representing the diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp index 84872f1268c..0e406596476 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp @@ -54,8 +54,6 @@ TAO_Notify_ConsumerAdmin_i::~TAO_Notify_ConsumerAdmin_i (void) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"in CA %d dtor\n", this->my_id_)); - ACE_DECLARE_NEW_CORBA_ENV; - delete this->lock_; delete this->event_listener_list_; @@ -89,32 +87,32 @@ TAO_Notify_ConsumerAdmin_i::_decr_refcnt (void) } void -TAO_Notify_ConsumerAdmin_i::_add_ref (CORBA_Environment &/*ACE_TRY_ENV*/) +TAO_Notify_ConsumerAdmin_i::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) { this->_incr_refcnt (); } void -TAO_Notify_ConsumerAdmin_i::_remove_ref (CORBA_Environment &/*ACE_TRY_ENV*/) +TAO_Notify_ConsumerAdmin_i::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) { this->_decr_refcnt (); } void -TAO_Notify_ConsumerAdmin_i::dispatch_event (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL) { // Dispatch the event to all the registered listeners. TAO_Notify_Dispatch_Command_Worker worker (&event, this->event_manager_->event_processor ()); // Propogate the filter command. - this->event_listener_list_->for_each (&worker, ACE_TRY_ENV); + this->event_listener_list_->for_each (&worker TAO_ENV_ARG_PARAMETER); } CORBA::Boolean -TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean /*eval_parent*/, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean /*eval_parent*/ TAO_ENV_ARG_DECL) { CORBA::Boolean bval = - this->get_filter_admin ().match (event, ACE_TRY_ENV); + this->get_filter_admin ().match (event TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ((bval == 1 && this->filter_operator_ == CosNotifyChannelAdmin::AND_OP) || @@ -127,7 +125,7 @@ TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boo // note the last param. we ask that the parent filter *not* be evaluated again // because we've done it here. - this->event_listener_list_->for_each (&worker, ACE_TRY_ENV); + this->event_listener_list_->for_each (&worker TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Propogate the filter command. @@ -140,7 +138,7 @@ TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boo // OR we could instead do: // - // this->dispatch_event (event, ACE_TRY_ENV); + // this->dispatch_event (event TAO_ENV_ARG_PARAMETER); // return 0; // // This will short circuit a few steps, because the event processor is going to @@ -161,25 +159,25 @@ TAO_Notify_ConsumerAdmin_i::proxy_pushsupplier_destroyed (CosNotifyChannelAdmin: void TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator, - PortableServer::POA_ptr my_POA, - CORBA::Environment &ACE_TRY_ENV) + PortableServer::POA_ptr my_POA + TAO_ENV_ARG_DECL) { my_POA_ = PortableServer::POA::_duplicate (my_POA); this->lock_ = - this->channel_objects_factory_->create_consumer_admin_lock (ACE_TRY_ENV); + this->channel_objects_factory_->create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_pushsupplier_POA_ = this->poa_factory_-> - create_proxy_pushsupplier_POA (this->my_POA_.in (), my_id, - ACE_TRY_ENV); + create_proxy_pushsupplier_POA (this->my_POA_.in (), my_id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->my_id_ = my_id; this->filter_operator_ = filter_operator; this->event_listener_list_ = - this->collection_factory_->create_event_listener_list (ACE_TRY_ENV); + this->collection_factory_->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the task to forward filtering/dispatching commands to: @@ -187,12 +185,12 @@ TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, // add a "get_singleton_reactive_task" to the event manager factory interface. this->dispatching_task_ = new TAO_Notify_Worker_Task (); - /*this->event_manager_objects_factory_->create_dispatching_task (ACE_TRY_ENV); + /*this->event_manager_objects_factory_->create_dispatching_task (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; */ this->filter_eval_task_ = new TAO_Notify_Worker_Task (); - // this->event_manager_objects_factory_->create_listener_eval_task (ACE_TRY_ENV); + // this->event_manager_objects_factory_->create_listener_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -220,7 +218,7 @@ TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, } void -TAO_Notify_ConsumerAdmin_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) { CosNotification::EventTypeSeq removed; @@ -233,50 +231,50 @@ TAO_Notify_ConsumerAdmin_i::destroy_i (CORBA::Environment &ACE_TRY_ENV) this->subscription_list_.populate (removed); this->event_manager_->subscribe_for_events (this, - added, removed, ACE_TRY_ENV); + added, removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate ourselves - this->poa_factory_->deactivate_object (this, this->my_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->deactivate_object (this, this->my_POA_.in () + TAO_ENV_ARG_PARAMETER); // shutdown proxy's. TAO_Notify_Shutdown_Worker shutdown_worker; - this->event_listener_list_->for_each (&shutdown_worker, ACE_TRY_ENV); + this->event_listener_list_->for_each (&shutdown_worker TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->event_listener_list_->shutdown (ACE_TRY_ENV); + this->event_listener_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->poa_factory_->destroy_POA (this->proxy_pushsupplier_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->destroy_POA (this->proxy_pushsupplier_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->dispatching_task_->shutdown (ACE_TRY_ENV); + this->dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->filter_eval_task_->shutdown (ACE_TRY_ENV); + this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_ConsumerAdmin_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // unregister from EC - this->event_channel_->unregister_listener (this, ACE_TRY_ENV); + this->event_channel_->unregister_listener (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->destroy_i (ACE_TRY_ENV); + this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_ConsumerAdmin_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) { - this->destroy_i (ACE_TRY_ENV); + this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); } TAO_Notify_Worker_Task* @@ -292,14 +290,14 @@ TAO_Notify_ConsumerAdmin_i::filter_eval_task (void) } void -TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType )) { this->event_manager_->subscribe_for_events (this, //*this->event_listener_list_, - added, removed, ACE_TRY_ENV); + added, removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, @@ -313,15 +311,15 @@ TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTyp } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_ConsumerAdmin_i::get_ref (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_var obj = this->poa_factory_-> - servant_to_reference (this->my_POA_.in (), this, ACE_TRY_ENV); + servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); - return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in (), - ACE_TRY_ENV); + return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } TAO_Notify_Event_Manager* @@ -337,30 +335,30 @@ TAO_Notify_ConsumerAdmin_i::get_filter_admin (void) } void -TAO_Notify_ConsumerAdmin_i::register_listener (TAO_Notify_EventListener *listener, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::register_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL) { // register it. - this->event_listener_list_->connected (listener, ACE_TRY_ENV); + this->event_listener_list_->connected (listener TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_ConsumerAdmin_i::unregister_listener (TAO_Notify_EventListener *listener, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::unregister_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL) { - this->event_listener_list_->disconnected (listener, ACE_TRY_ENV); + this->event_listener_list_->disconnected (listener TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_ConsumerAdmin_i::deactivate_proxy_pushsupplier (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::deactivate_proxy_pushsupplier (PortableServer::Servant servant TAO_ENV_ARG_DECL) { this->poa_factory_-> - deactivate_object (servant, this->proxy_pushsupplier_POA_.in (), - ACE_TRY_ENV); + deactivate_object (servant, this->proxy_pushsupplier_POA_.in () + TAO_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::AdminID -TAO_Notify_ConsumerAdmin_i::MyID (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_ConsumerAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -369,16 +367,16 @@ TAO_Notify_ConsumerAdmin_i::MyID (CORBA::Environment &/*ACE_TRY_ENV*/) } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_ConsumerAdmin_i::MyChannel (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::MyChannel (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return event_channel_->get_ref (ACE_TRY_ENV); + return event_channel_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_ConsumerAdmin_i::MyOperator (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_ConsumerAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -387,16 +385,16 @@ TAO_Notify_ConsumerAdmin_i::MyOperator (CORBA::Environment &/*ACE_TRY_ENV*/) } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_ConsumerAdmin_i::push_suppliers (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::push_suppliers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->proxy_pushsupplier_ids_.get_sequence (ACE_TRY_ENV); + return this->proxy_pushsupplier_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::ProxySupplier_ptr -TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ProxyNotFound @@ -404,74 +402,74 @@ TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID p { CORBA::Object_var obj = this->poa_factory_->id_to_reference (proxy_id, - proxy_pushsupplier_POA_.in (), - ACE_TRY_ENV); + proxy_pushsupplier_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); return CosNotifyChannelAdmin::ProxySupplier::_narrow (obj.in ()); } CORBA::Object_ptr -TAO_Notify_ConsumerAdmin_i::obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) { TAO_Notify_StructuredProxyPushSupplier_i* struct_proxy_pushsupplier = - this->channel_objects_factory_->create_struct_proxy_pushsupplier (this, - ACE_TRY_ENV); + this->channel_objects_factory_->create_struct_proxy_pushsupplier (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushsupplier_var (struct_proxy_pushsupplier); - struct_proxy_pushsupplier->init (proxy_id, ACE_TRY_ENV); + struct_proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushsupplier_POA_.in (), - struct_proxy_pushsupplier, - ACE_TRY_ENV); + struct_proxy_pushsupplier + TAO_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_ConsumerAdmin_i::obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) { TAO_Notify_SequenceProxyPushSupplier_i* seq_proxy_pushsupplier = - this->channel_objects_factory_->create_seq_proxy_pushsupplier (this, - ACE_TRY_ENV); + this->channel_objects_factory_->create_seq_proxy_pushsupplier (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushsupplier_var (seq_proxy_pushsupplier); - seq_proxy_pushsupplier->init (proxy_id, ACE_TRY_ENV); + seq_proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushsupplier_POA_.in (), - seq_proxy_pushsupplier, - ACE_TRY_ENV); + seq_proxy_pushsupplier + TAO_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_ConsumerAdmin_i::obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) { TAO_Notify_ProxyPushSupplier_i* proxy_pushsupplier = - this->channel_objects_factory_->create_proxy_pushsupplier (this, ACE_TRY_ENV); + this->channel_objects_factory_->create_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushsupplier_var (proxy_pushsupplier); - proxy_pushsupplier->init (proxy_id, ACE_TRY_ENV); + proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushsupplier_POA_.in (), - proxy_pushsupplier, - ACE_TRY_ENV); + proxy_pushsupplier + TAO_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::ProxySupplier_ptr -TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminLimitExceeded @@ -491,21 +489,21 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelA { case CosNotifyChannelAdmin::ANY_EVENT: { - obj = this->obtain_proxy_pushsupplier_i (proxy_id, ACE_TRY_ENV); + obj = this->obtain_proxy_pushsupplier_i (proxy_id TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); } break; case CosNotifyChannelAdmin::STRUCTURED_EVENT: { - obj = this->obtain_struct_proxy_pushsupplier_i (proxy_id, ACE_TRY_ENV); + obj = this->obtain_struct_proxy_pushsupplier_i (proxy_id TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); } break; case CosNotifyChannelAdmin::SEQUENCE_EVENT: { - obj = this->obtain_sequence_proxy_pushsupplier_i (proxy_id, - ACE_TRY_ENV); + obj = this->obtain_sequence_proxy_pushsupplier_i (proxy_id + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); } break; @@ -516,88 +514,88 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelA } this->proxy_pushsupplier_ids_.next (); // commit this id to the pool - return CosNotifyChannelAdmin::ProxySupplier::_narrow (obj.in (), - ACE_TRY_ENV); + return CosNotifyChannelAdmin::ProxySupplier::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CosNotification::QoSProperties* -TAO_Notify_ConsumerAdmin_i::get_qos (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->qos_admin_.get_qos (ACE_TRY_ENV); + return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_ConsumerAdmin_i::set_qos (const CosNotification::QoSProperties & qos, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.set_qos (qos, ACE_TRY_ENV); + this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_ConsumerAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.validate_qos (required_qos, available_qos, ACE_TRY_ENV); + this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterID -TAO_Notify_ConsumerAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.add_filter (new_filter, ACE_TRY_ENV); + return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_ConsumerAdmin_i::remove_filter (CosNotifyFilter::FilterID filter, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::remove_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - this->filter_admin_.remove_filter (filter, ACE_TRY_ENV); + this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER); } CosNotifyFilter::Filter_ptr -TAO_Notify_ConsumerAdmin_i::get_filter (CosNotifyFilter::FilterID filter, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - return this->filter_admin_.get_filter (filter, ACE_TRY_ENV); + return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterIDSeq* -TAO_Notify_ConsumerAdmin_i::get_all_filters (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.get_all_filters (ACE_TRY_ENV); + return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_ConsumerAdmin_i::remove_all_filters (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->filter_admin_.remove_all_filters (ACE_TRY_ENV); + this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -610,21 +608,21 @@ TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_EN PortableServer::ServantBase_var proxy_var (cosec_proxy); - cosec_proxy->init (ACE_TRY_ENV); + cosec_proxy->init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushSupplier::_nil ()); PortableServer::POA_var def_poa = this->event_channel_->get_default_POA (); CORBA::Object_var obj = this->poa_factory_-> - activate_object (def_poa.in (), cosec_proxy, ACE_TRY_ENV); + activate_object (def_poa.in (), cosec_proxy TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushSupplier::_nil ()); return CosEventChannelAdmin::ProxyPushSupplier::_narrow (obj.in ()); } CosNotifyChannelAdmin::ProxySupplier_ptr -TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminLimitExceeded @@ -635,7 +633,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelA } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -646,7 +644,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (CORBA::Environment &ACE_TRY_EN CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ConsumerAdmin_i::priority_filter (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::priority_filter (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -656,7 +654,7 @@ TAO_Notify_ConsumerAdmin_i::priority_filter (CORBA::Environment &ACE_TRY_ENV) } void -TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -665,7 +663,7 @@ TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr } CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ConsumerAdmin_i::lifetime_filter (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -675,7 +673,7 @@ TAO_Notify_ConsumerAdmin_i::lifetime_filter (CORBA::Environment &ACE_TRY_ENV) } void -TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -684,7 +682,7 @@ TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_ConsumerAdmin_i::pull_suppliers (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ConsumerAdmin_i::pull_suppliers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -702,10 +700,10 @@ TAO_Notify_Filter_Command_Worker::TAO_Notify_Filter_Command_Worker (TAO_Notify_E } void -TAO_Notify_Filter_Command_Worker::work (TAO_Notify_EventListener* event_listener, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Filter_Command_Worker::work (TAO_Notify_EventListener* event_listener TAO_ENV_ARG_DECL) { this->event_processor_->evaluate_listener_filter (this->event_, event_listener, - this->eval_parent_, ACE_TRY_ENV); + this->eval_parent_ TAO_ENV_ARG_PARAMETER); } /****************************************************************************************************/ @@ -721,9 +719,9 @@ TAO_Notify_Dispatch_Command_Worker::~TAO_Notify_Dispatch_Command_Worker () } void -TAO_Notify_Dispatch_Command_Worker::work (TAO_Notify_EventListener* event_listener, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Dispatch_Command_Worker::work (TAO_Notify_EventListener* event_listener TAO_ENV_ARG_DECL) { - this->event_processor_->dispatch_event (this->event_, event_listener, ACE_TRY_ENV); + this->event_processor_->dispatch_event (this->event_, event_listener TAO_ENV_ARG_PARAMETER); } /****************************************************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h index 40457951016..1e7aa09ff50 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h @@ -69,17 +69,17 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList virtual CORBA::ULong _decr_refcnt (void); // = The Servant methods - virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV); - virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV); + virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); //= TAO_Notify_EventListener methods - virtual void dispatch_event (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV); + virtual void dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL); // Callback methods to supply the event to the listener. - virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV); + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL); // Evaluates true if this event is acceptable by the listener. - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); // Ask the listener to relinqish any bindings and prepare to be disposed. virtual TAO_Notify_Worker_Task* event_dispatch_task (void); @@ -91,11 +91,11 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList void init (CosNotifyChannelAdmin::AdminID myID, CosNotifyChannelAdmin::InterFilterGroupOperator myOperator, - PortableServer::POA_ptr my_POA, - CORBA::Environment &ACE_TRY_ENV); + PortableServer::POA_ptr my_POA + TAO_ENV_ARG_DECL); // Initialize the Consumer Admin. - CosNotifyChannelAdmin::ConsumerAdmin_ptr get_ref (CORBA::Environment &ACE_TRY_ENV); + CosNotifyChannelAdmin::ConsumerAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL); // Return the CORBA object for this servant. TAO_Notify_Event_Manager* get_event_manager (void); @@ -104,13 +104,13 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList TAO_Notify_FilterAdmin_i& get_filter_admin (void); // Get our filter admin. - void deactivate_proxy_pushsupplier (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV); + void deactivate_proxy_pushsupplier (PortableServer::Servant servant TAO_ENV_ARG_DECL); // Deactivate servant from <proxy_pushsupplier_POA_>. - void register_listener (TAO_Notify_EventListener *listener, CORBA::Environment &ACE_TRY_ENV); + void register_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL); // Register with parent for subscription updates. - void unregister_listener (TAO_Notify_EventListener *listener, CORBA::Environment &ACE_TRY_ENV); + void unregister_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL); // Unregister with parent from subscription updates. void proxy_pushsupplier_destroyed (CosNotifyChannelAdmin::ProxyID proxyID); @@ -118,73 +118,73 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList // = Interface methods virtual CosNotifyChannelAdmin::AdminID MyID ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::EventChannel_ptr MyChannel ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyFilter::MappingFilter_ptr priority_filter ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void priority_filter ( - CosNotifyFilter::MappingFilter_ptr priority_filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::MappingFilter_ptr priority_filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void lifetime_filter ( - CosNotifyFilter::MappingFilter_ptr lifetime_filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::MappingFilter_ptr lifetime_filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier ( - CosNotifyChannelAdmin::ProxyID proxy_id, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::ProxyID proxy_id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -193,8 +193,8 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier ( virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_supplier ( CosNotifyChannelAdmin::ClientType ctype, - CosNotifyChannelAdmin::ProxyID_out proxy_id, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::ProxyID_out proxy_id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -203,8 +203,8 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_suppli virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_supplier ( CosNotifyChannelAdmin::ClientType ctype, - CosNotifyChannelAdmin::ProxyID_out proxy_id, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::ProxyID_out proxy_id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -212,22 +212,22 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_suppli )); virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotification::QoSProperties * get_qos ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void set_qos ( - const CosNotification::QoSProperties & qos, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::QoSProperties & qos + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -236,8 +236,8 @@ virtual void set_qos ( virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, - CosNotification::NamedPropertyRangeSeq_out available_qos, - CORBA::Environment &ACE_TRY_ENV + CosNotification::NamedPropertyRangeSeq_out available_qos + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -246,8 +246,8 @@ virtual void validate_qos ( virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -255,16 +255,16 @@ virtual void subscription_change ( )); virtual CosNotifyFilter::FilterID add_filter ( - CosNotifyFilter::Filter_ptr new_filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::Filter_ptr new_filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_filter ( - CosNotifyFilter::FilterID filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::FilterID filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -272,8 +272,8 @@ virtual void remove_filter ( )); virtual CosNotifyFilter::Filter_ptr get_filter ( - CosNotifyFilter::FilterID filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::FilterID filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -281,28 +281,28 @@ virtual CosNotifyFilter::Filter_ptr get_filter ( )); virtual CosNotifyFilter::FilterIDSeq * get_all_filters ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_filters ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -310,16 +310,16 @@ virtual CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ( protected: // = Helper methods - void destroy_i (CORBA::Environment &ACE_TRY_ENV); + void destroy_i (TAO_ENV_SINGLE_ARG_DECL); // Destroy CA - CORBA::Object_ptr obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); // Obtain a proxy pushsupplier object - CORBA::Object_ptr obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); // Obtain a structured proxy pushsupplier object. - CORBA::Object_ptr obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); // Obtain a sequence proxy pushsupplier object. // = Data members @@ -400,7 +400,7 @@ public: TAO_Notify_Filter_Command_Worker (TAO_Notify_Event* event, TAO_Notify_Event_Processor* event_processor, CORBA::Boolean eval_parent); // = TAO_ESF_Worker method - void work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV); + void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL); protected: TAO_Notify_Event* event_; @@ -423,7 +423,7 @@ public: ~TAO_Notify_Dispatch_Command_Worker (); // = TAO_ESF_Worker method - void work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV); + void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL); protected: TAO_Notify_Event* event_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp index f328a199504..f1baba38849 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp @@ -46,7 +46,7 @@ TAO_Notify_Default_CO_Factory::fini (void) TAO_Notify_EventChannel_i* -TAO_Notify_Default_CO_Factory::create_event_channel (TAO_Notify_EventChannelFactory_i* parent, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_event_channel (TAO_Notify_EventChannelFactory_i* parent TAO_ENV_ARG_DECL) { TAO_Notify_EventChannel_i* channel; ACE_NEW_THROW_EX (channel, @@ -56,8 +56,8 @@ TAO_Notify_Default_CO_Factory::create_event_channel (TAO_Notify_EventChannelFact } TAO_Notify_ConsumerAdmin_i* -TAO_Notify_Default_CO_Factory::create_consumer_admin (TAO_Notify_EventChannel_i* event_channel, - CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_consumer_admin (TAO_Notify_EventChannel_i* event_channel + TAO_ENV_ARG_DECL) { TAO_Notify_ConsumerAdmin_i* consumer_admin_i; ACE_NEW_THROW_EX (consumer_admin_i, @@ -67,8 +67,8 @@ TAO_Notify_Default_CO_Factory::create_consumer_admin (TAO_Notify_EventChannel_i* } TAO_Notify_SupplierAdmin_i* -TAO_Notify_Default_CO_Factory::create_supplier_admin (TAO_Notify_EventChannel_i* event_channel, - CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_supplier_admin (TAO_Notify_EventChannel_i* event_channel + TAO_ENV_ARG_DECL) { TAO_Notify_SupplierAdmin_i* supplier_admin_i; @@ -80,7 +80,7 @@ TAO_Notify_Default_CO_Factory::create_supplier_admin (TAO_Notify_EventChannel_i* TAO_Notify_FilterFactory_i* -TAO_Notify_Default_CO_Factory::create_filter_factory (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_filter_factory (TAO_ENV_SINGLE_ARG_DECL) { TAO_Notify_FilterFactory_i* filterfactory; ACE_NEW_THROW_EX (filterfactory, @@ -91,7 +91,7 @@ TAO_Notify_Default_CO_Factory::create_filter_factory (CORBA::Environment &ACE_TR TAO_Notify_StructuredProxyPushSupplier_i* -TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL) { TAO_Notify_StructuredProxyPushSupplier_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -101,7 +101,7 @@ TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_Cons } TAO_Notify_SequenceProxyPushSupplier_i* -TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL) { TAO_Notify_SequenceProxyPushSupplier_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -111,7 +111,7 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_Consume } TAO_Notify_ProxyPushSupplier_i* -TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL) { TAO_Notify_ProxyPushSupplier_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -122,7 +122,7 @@ TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdm TAO_Notify_StructuredProxyPushConsumer_i* -TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL) { TAO_Notify_StructuredProxyPushConsumer_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -132,7 +132,7 @@ TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_Supp } TAO_Notify_ProxyPushConsumer_i* -TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL) { TAO_Notify_ProxyPushConsumer_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -142,7 +142,7 @@ TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdm } TAO_Notify_SequenceProxyPushConsumer_i* -TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL) { TAO_Notify_SequenceProxyPushConsumer_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -153,13 +153,13 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_Supplie ACE_Lock* -TAO_Notify_Default_CO_Factory::create_channel_factory_lock (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL) { - return create_event_channel_lock (ACE_TRY_ENV); + return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_event_channel_lock (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL) { ACE_Lock* lock; ACE_NEW_THROW_EX (lock, @@ -169,31 +169,31 @@ TAO_Notify_Default_CO_Factory::create_event_channel_lock (CORBA::Environment &AC } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_consumer_admin_lock (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL) { // Later: - return create_event_channel_lock (ACE_TRY_ENV); + return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_supplier_admin_lock (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL) { // Later: - return create_event_channel_lock (ACE_TRY_ENV); + return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_proxy_supplier_lock (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL) { // Later: - return create_event_channel_lock (ACE_TRY_ENV); + return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_proxy_consumer_lock (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_CO_Factory::create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL) { // Later: - return create_event_channel_lock (ACE_TRY_ENV); + return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h index 47a1e10260f..8dd11836a7b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h @@ -51,55 +51,55 @@ public: // = TAO_Notify_CO_Factory methods // = Creation methods - TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent, CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent TAO_ENV_ARG_DECL); // Create an Event Channel. - TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL); // Create a Consumer Admin. - TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL); // Create a Supplier Admin. - TAO_Notify_FilterFactory_i* create_filter_factory (CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_FilterFactory_i* create_filter_factory (TAO_ENV_SINGLE_ARG_DECL); // Create the Filter Factory. // = Proxy Creation methods. - TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL); // Create a Structured ProxyPushSupplier. - TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL); // Create a Sequence ProxyPushSupplier. - TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL); // Create a ProxyPushSupplier. - TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL); // Create a Structured ProxyPushConsumer. - TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL); // Create a Sequence ProxyPushConsumer. - TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL); // Create a ProxyPushConsumer. //= Locks // = Methods to create locks. - ACE_Lock* create_channel_factory_lock (CORBA::Environment &ACE_TRY_ENV); + ACE_Lock* create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL); // Create lock type used by channel factory. - ACE_Lock* create_event_channel_lock (CORBA::Environment &ACE_TRY_ENV); + ACE_Lock* create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL); // Create lock type used by EC's. - ACE_Lock* create_consumer_admin_lock (CORBA::Environment &ACE_TRY_ENV); + ACE_Lock* create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL); // Create lock type used by Consumer Admin's. - ACE_Lock* create_supplier_admin_lock (CORBA::Environment &ACE_TRY_ENV); + ACE_Lock* create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL); // Create lock type used by Supplier Admin's. - ACE_Lock* create_proxy_supplier_lock (CORBA::Environment &ACE_TRY_ENV); + ACE_Lock* create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL); // Create lock type used by proxy supplier. - ACE_Lock* create_proxy_consumer_lock (CORBA::Environment &ACE_TRY_ENV); + ACE_Lock* create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL); // Create lock type used by proxy consumer. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp index 5c3eb07c344..da83f014891 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp @@ -39,7 +39,7 @@ TAO_Notify_Default_Collection_Factory::fini (void) } TAO_Notify_EventListener_List* -TAO_Notify_Default_Collection_Factory::create_event_listener_list (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_Default_Collection_Factory::create_event_listener_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) { // @@ Pradeep: the copy_on_write versions are a much better choice // for a default than the immediate changes version. The latter @@ -68,7 +68,7 @@ ACE_NEW_THROW_EX (listener_list, } TAO_Notify_UpdateListener_List* -TAO_Notify_Default_Collection_Factory::create_update_listener_list (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_Default_Collection_Factory::create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) { /* TAO_Notify_UpdateListener_List* listener_list = diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h index 1baa1622268..78c621a790d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h @@ -51,10 +51,10 @@ public: virtual int fini (void); // = Methods to create listener collections. - virtual TAO_Notify_EventListener_List* create_event_listener_list (CORBA::Environment &ACE_TRY_ENV); + virtual TAO_Notify_EventListener_List* create_event_listener_list (TAO_ENV_SINGLE_ARG_DECL); // Create the event listener list. - virtual TAO_Notify_UpdateListener_List* create_update_listener_list (CORBA::Environment &ACE_TRY_ENV); + virtual TAO_Notify_UpdateListener_List* create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL); // create update listener list. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp index 102c11c435e..8504fedf3a2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp @@ -129,7 +129,7 @@ TAO_Notify_Default_EMO_Factory::init (int argc, char* argv[]) } TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_task (int mt, int tp_size,CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_EMO_Factory::create_task (int mt, int tp_size TAO_ENV_ARG_DECL) { TAO_Notify_Worker_Task* task; @@ -166,21 +166,21 @@ TAO_Notify_Default_EMO_Factory::init_instance (void) int TAO_Notify_Default_EMO_Factory::preallocate_tasks (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; this->prealloc_source_eval_task_ = - create_task (EMO_OPTIONS::instance ()->mt_source_eval_, EMO_OPTIONS::instance ()->source_threads_, - ACE_TRY_ENV); + create_task (EMO_OPTIONS::instance ()->mt_source_eval_, EMO_OPTIONS::instance ()->source_threads_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->prealloc_listener_eval_task_ = - create_task (EMO_OPTIONS::instance ()->mt_listener_eval_, EMO_OPTIONS::instance ()->listener_threads_, - ACE_TRY_ENV); + create_task (EMO_OPTIONS::instance ()->mt_listener_eval_, EMO_OPTIONS::instance ()->listener_threads_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->prealloc_dispatching_task_ = - create_task (EMO_OPTIONS::instance ()->mt_dispatching_, EMO_OPTIONS::instance ()->dispatching_threads_, - ACE_TRY_ENV); + create_task (EMO_OPTIONS::instance ()->mt_dispatching_, EMO_OPTIONS::instance ()->dispatching_threads_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -194,7 +194,7 @@ TAO_Notify_Default_EMO_Factory::fini (void) } TAO_Notify_Event_Manager* -TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL) { TAO_Notify_Event_Manager* event_manager; ACE_NEW_THROW_EX (event_manager, @@ -204,7 +204,7 @@ TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i* } TAO_Notify_Event_Map* -TAO_Notify_Default_EMO_Factory::create_event_map (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_EMO_Factory::create_event_map (TAO_ENV_SINGLE_ARG_DECL) { TAO_Notify_Event_Map* event_map; ACE_NEW_THROW_EX (event_map, @@ -214,7 +214,7 @@ TAO_Notify_Default_EMO_Factory::create_event_map (CORBA::Environment &ACE_TRY_EN } TAO_Notify_Event_Processor* -TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL) { TAO_Notify_Event_Processor* event_processor; ACE_NEW_THROW_EX (event_processor, @@ -225,49 +225,49 @@ TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_source_eval_task (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_EMO_Factory::create_source_eval_task (TAO_ENV_SINGLE_ARG_DECL) { if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1) return create_task (EMO_OPTIONS::instance ()->mt_source_eval_, - EMO_OPTIONS::instance ()->source_threads_, - ACE_TRY_ENV); + EMO_OPTIONS::instance ()->source_threads_ + TAO_ENV_ARG_PARAMETER); else return prealloc_source_eval_task_; } TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_lookup_task (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_EMO_Factory::create_lookup_task (TAO_ENV_SINGLE_ARG_DECL) { return create_task (EMO_OPTIONS::instance ()->mt_lookup_, - EMO_OPTIONS::instance ()->lookup_threads_, ACE_TRY_ENV); + EMO_OPTIONS::instance ()->lookup_threads_ TAO_ENV_ARG_PARAMETER); } TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_listener_eval_task (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_EMO_Factory::create_listener_eval_task (TAO_ENV_SINGLE_ARG_DECL) { if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1) return create_task (EMO_OPTIONS::instance ()->mt_listener_eval_, - EMO_OPTIONS::instance ()->listener_threads_, - ACE_TRY_ENV); + EMO_OPTIONS::instance ()->listener_threads_ + TAO_ENV_ARG_PARAMETER); else return prealloc_listener_eval_task_; } TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_dispatching_task (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_EMO_Factory::create_dispatching_task (TAO_ENV_SINGLE_ARG_DECL) { if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1) return create_task (EMO_OPTIONS::instance ()->mt_dispatching_, - EMO_OPTIONS::instance ()->dispatching_threads_, - ACE_TRY_ENV); + EMO_OPTIONS::instance ()->dispatching_threads_ + TAO_ENV_ARG_PARAMETER); else return prealloc_dispatching_task_; } TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_updates_task (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_EMO_Factory::create_updates_task (TAO_ENV_SINGLE_ARG_DECL) { - return create_task (EMO_OPTIONS::instance ()->asynch_updates_, ASYNCH_UPDATES_THREADS, ACE_TRY_ENV); + return create_task (EMO_OPTIONS::instance ()->asynch_updates_, ASYNCH_UPDATES_THREADS TAO_ENV_ARG_PARAMETER); } void diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h index bc693dd6b0f..18ada3e25f0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h @@ -70,21 +70,21 @@ class TAO_Notify_Export TAO_Notify_Default_EMO_Factory : public TAO_Notify_EMO_F virtual int init (int argc, char* argv[]); virtual int fini (void); - virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV); + virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL); // Create an event manager. - virtual TAO_Notify_Event_Map* create_event_map (CORBA::Environment &ACE_TRY_ENV); + virtual TAO_Notify_Event_Map* create_event_map (TAO_ENV_SINGLE_ARG_DECL); // Create the event map. - virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV); + virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL); // Create event processor. // = Create processing tasks. - virtual TAO_Notify_Worker_Task* create_source_eval_task (CORBA::Environment &ACE_TRY_ENV); - virtual TAO_Notify_Worker_Task* create_lookup_task (CORBA::Environment &ACE_TRY_ENV); - virtual TAO_Notify_Worker_Task* create_listener_eval_task ( CORBA::Environment &ACE_TRY_ENV); - virtual TAO_Notify_Worker_Task* create_dispatching_task (CORBA::Environment &ACE_TRY_ENV); - virtual TAO_Notify_Worker_Task* create_updates_task (CORBA::Environment &ACE_TRY_ENV); + virtual TAO_Notify_Worker_Task* create_source_eval_task (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Worker_Task* create_lookup_task (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Worker_Task* create_listener_eval_task ( TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Worker_Task* create_dispatching_task (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Worker_Task* create_updates_task (TAO_ENV_SINGLE_ARG_DECL); virtual void destroy_source_eval_task (TAO_Notify_Worker_Task* task); virtual void destroy_lookup_task (TAO_Notify_Worker_Task* task); @@ -97,7 +97,7 @@ class TAO_Notify_Export TAO_Notify_Default_EMO_Factory : public TAO_Notify_EMO_F protected: //= Protected Methods - TAO_Notify_Worker_Task* create_task (int mt, int tp_size,CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_Worker_Task* create_task (int mt, int tp_size TAO_ENV_ARG_DECL); // Create a worker task, mt => is this a MT task, if so, tp_size is thread pool size. int preallocate_tasks (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp index 3f16e410f11..6db78cedef9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp @@ -36,59 +36,59 @@ TAO_Notify_Default_POA_Factory::fini (void) } PortableServer::POA_ptr -TAO_Notify_Default_POA_Factory::create_event_channel_POA (PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_POA_Factory::create_event_channel_POA (PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL) { return this->create_generic_childPOA_i (EC_POA_NAME, - parent_poa, ACE_TRY_ENV); + parent_poa TAO_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_Notify_Default_POA_Factory::create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_POA_Factory::create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) { char child_poa_name[BUFSIZ]; ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "SA"); - return this->create_generic_childPOA_i (child_poa_name, parent_poa, - ACE_TRY_ENV); + return this->create_generic_childPOA_i (child_poa_name, parent_poa + TAO_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_Notify_Default_POA_Factory::create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_POA_Factory::create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) { char child_poa_name[BUFSIZ]; ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "CA"); return this->create_generic_childPOA_i (child_poa_name, - parent_poa, ACE_TRY_ENV); + parent_poa TAO_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_Notify_Default_POA_Factory::create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_POA_Factory::create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) { char child_poa_name[BUFSIZ]; ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "PPC"); return this->create_generic_childPOA_i (child_poa_name, - parent_poa, ACE_TRY_ENV); + parent_poa TAO_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_Notify_Default_POA_Factory::create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_POA_Factory::create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) { char child_poa_name[BUFSIZ]; ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "PPS"); return this->create_generic_childPOA_i (child_poa_name, - parent_poa, ACE_TRY_ENV); + parent_poa TAO_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) { // @@ Pradeep: if the Notification service is ever going to be // persistent or fault tolerant you may need to create this stuff @@ -99,17 +99,17 @@ TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa // Create a UNIQUE_ID and USER_ID policy because we want the POA // to detect duplicates for us. PortableServer::IdUniquenessPolicy_var idpolicy = - poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID, - ACE_TRY_ENV); + poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil()); PortableServer::IdAssignmentPolicy_var assignpolicy = - poa->create_id_assignment_policy (PortableServer::USER_ID, - ACE_TRY_ENV); + poa->create_id_assignment_policy (PortableServer::USER_ID + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); PortableServer::POAManager_var manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Create a PolicyList @@ -125,11 +125,11 @@ TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa // Create the child POA. PortableServer::POA_var poa_ret = poa->create_POA (child_poa_name, manager.in (), - policy_list, - ACE_TRY_ENV); + policy_list + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil()); - idpolicy->destroy (ACE_TRY_ENV); + idpolicy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil()); assignpolicy->destroy (); @@ -169,83 +169,83 @@ TAO_Notify_Default_POA_Factory::long_to_ObjectId (const CORBA::Long id) } CORBA::Object_ptr -TAO_Notify_Default_POA_Factory::activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa, PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_POA_Factory::activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa, PortableServer::Servant servant TAO_ENV_ARG_DECL) { // Convert CORBA::Long to ObjectId PortableServer::ObjectId_var oid = this->long_to_ObjectId (id); poa->activate_object_with_id (oid.in (), - servant, - ACE_TRY_ENV); + servant + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return poa->id_to_reference (oid.in (), - ACE_TRY_ENV); + return poa->id_to_reference (oid.in () + TAO_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_Default_POA_Factory::activate_object (PortableServer::POA_ptr poa, PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_POA_Factory::activate_object (PortableServer::POA_ptr poa, PortableServer::Servant servant TAO_ENV_ARG_DECL) { - PortableServer::ObjectId_var oid = poa->activate_object (servant, ACE_TRY_ENV); + PortableServer::ObjectId_var oid = poa->activate_object (servant TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return poa->id_to_reference (oid.in (), ACE_TRY_ENV); + return poa->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_Default_POA_Factory::servant_to_reference (PortableServer::POA_ptr poa, PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_POA_Factory::servant_to_reference (PortableServer::POA_ptr poa, PortableServer::Servant servant TAO_ENV_ARG_DECL) { - PortableServer::ObjectId_var oid = poa->servant_to_id (servant, ACE_TRY_ENV); + PortableServer::ObjectId_var oid = poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return poa->id_to_reference (oid.in (), ACE_TRY_ENV); + return poa->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_Default_POA_Factory::id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_POA_Factory::id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) { // Convert CORBA::Long to ObjectId PortableServer::ObjectId_var oid = this->long_to_ObjectId (id); - return poa->id_to_reference (oid.in (), - ACE_TRY_ENV); + return poa->id_to_reference (oid.in () + TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_Default_POA_Factory::destroy_POA (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_POA_Factory::destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) { if (!CORBA::is_nil (poa)) - poa->destroy (1,0,ACE_TRY_ENV); + poa->destroy (1,0 TAO_ENV_ARG_PARAMETER); // The <wait_for_completion> flag causes a deadlock when destroying the POA // because we are involved in an upcall. // TODO:I have to think about what the implications of not waiting are. } void -TAO_Notify_Default_POA_Factory::deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_POA_Factory::deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) { if (CORBA::is_nil (poa) || CORBA::is_nil (obj)) return; PortableServer::ObjectId_var id = - poa->reference_to_id (obj, ACE_TRY_ENV); + poa->reference_to_id (obj TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_Default_POA_Factory::deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Default_POA_Factory::deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) { if (CORBA::is_nil (poa) || servant == 0) return; PortableServer::ObjectId_var id = - poa->servant_to_id (servant, ACE_TRY_ENV); + poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h index 3953733fefd..44b314cfdf0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h @@ -47,41 +47,41 @@ public: virtual int init (int argc, char* argv[]); virtual int fini (void); - PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV); + PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL); // Create the POA to activate Event Channels in. - PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV); + PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL); // Create the POA to activate SA's in. - PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV); + PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL); // Create the POA to activate CA's in. - PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV); + PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL); // Create the POA to activate proxy push consumers in. - PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV); + PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL); // Create the POA to activate proxy push suppliers in. // = Object activation and POA methods - CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL); // Converts <id> to an ObjectId and registers with the POA <poa>. - CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL); // Registers with the POA <poa>. - CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL); // Registers with the POA <poa>. - CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); // Look for the Object with id <id> in <poa>. - void destroy_POA (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV); + void destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); // Destroy the <poa> - void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV); + void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); // Deactivate the object. - void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr, CORBA::Environment &ACE_TRY_ENV); + void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr TAO_ENV_ARG_DECL); // Deactivate the object. protected: @@ -90,7 +90,7 @@ protected: PortableServer::ObjectId* long_to_ObjectId (const CORBA::Long id); // Converts a CORBA::Long to an ObjectId - PortableServer::POA_ptr create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV); + PortableServer::POA_ptr create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL); // Create the POA with the most generic policies required of our POA's. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp index 71d9096c54e..ced35b8551e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp @@ -244,22 +244,22 @@ TAO_Notify_Any::event_type (void) const } CORBA::Boolean -TAO_Notify_Any::do_match (CosNotifyFilter::Filter_ptr filter, - CORBA::Environment &ACE_TRY_ENV) const +TAO_Notify_Any::do_match (CosNotifyFilter::Filter_ptr filter + TAO_ENV_ARG_DECL) const { - return filter->match (*this->data_, ACE_TRY_ENV); + return filter->match (*this->data_ TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_Any::do_push (CosEventComm::PushConsumer_ptr consumer, - CORBA::Environment &ACE_TRY_ENV) const +TAO_Notify_Any::do_push (CosEventComm::PushConsumer_ptr consumer + TAO_ENV_ARG_DECL) const { - consumer->push (*this->data_, ACE_TRY_ENV); + consumer->push (*this->data_ TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_Any::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer, - CORBA::Environment &ACE_TRY_ENV) const +TAO_Notify_Any::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer + TAO_ENV_ARG_DECL) const { // translation pg. 28 CosNotification::StructuredEvent event; @@ -267,7 +267,7 @@ TAO_Notify_Any::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer, event.header.fixed_header.event_type.type_name = CORBA::string_dup ("%ANY"); event.header.fixed_header.event_type.domain_name = CORBA::string_dup (""); - consumer->push_structured_event (event, ACE_TRY_ENV); + consumer->push_structured_event (event TAO_ENV_ARG_PARAMETER); } // **************************************************************** @@ -379,26 +379,26 @@ TAO_Notify_StructuredEvent::event_type (void) const } CORBA::Boolean -TAO_Notify_StructuredEvent::do_match (CosNotifyFilter::Filter_ptr filter, - CORBA::Environment &ACE_TRY_ENV) const +TAO_Notify_StructuredEvent::do_match (CosNotifyFilter::Filter_ptr filter + TAO_ENV_ARG_DECL) const { - return filter->match_structured (*this->data_, ACE_TRY_ENV); + return filter->match_structured (*this->data_ TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_StructuredEvent::do_push (CosEventComm::PushConsumer_ptr consumer, - CORBA::Environment &ACE_TRY_ENV) const +TAO_Notify_StructuredEvent::do_push (CosEventComm::PushConsumer_ptr consumer + TAO_ENV_ARG_DECL) const { // translation pg. 28 CORBA::Any any; any <<= *this->data_; // is the typecode set by this operation or do we need to set it explicity. - consumer->push (any, ACE_TRY_ENV); + consumer->push (any TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_StructuredEvent::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const +TAO_Notify_StructuredEvent::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const { - consumer->push_structured_event (*this->data_, ACE_TRY_ENV); + consumer->push_structured_event (*this->data_ TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h index d51903b117d..e105f3ed138 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h @@ -123,11 +123,11 @@ public: // ownership of the data to the new object otherwise we copy the data // for the new object. - virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter, CORBA::Environment &ACE_TRY_ENV) const = 0; + virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL) const = 0; // Returns true if the filter matches. - virtual void do_push (CosEventComm::PushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const = 0; - virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const = 0; + virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const = 0; + virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const = 0; // Push self to <consumer> // = QoS Properties. @@ -198,9 +198,9 @@ public: virtual CORBA::Boolean is_special_event_type (void) const; virtual const TAO_Notify_EventType& event_type (void) const; - virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter, CORBA::Environment &ACE_TRY_ENV) const; - virtual void do_push (CosEventComm::PushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const; - virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const; + virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL) const; + virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const; + virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const; protected: CORBA::Any* data_; @@ -230,9 +230,9 @@ public: virtual CORBA::Boolean is_special_event_type (void) const; virtual const TAO_Notify_EventType& event_type (void) const; - virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter, CORBA::Environment &ACE_TRY_ENV) const; - virtual void do_push (CosEventComm::PushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const; - virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const; + virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL) const; + virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const; + virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const; protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp index 9199a8e5c5a..708164dc121 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp @@ -23,7 +23,7 @@ TAO_Notify_EventChannelFactory_i::~TAO_Notify_EventChannelFactory_i (void) } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL) { TAO_Notify_EventChannelFactory_i* channelfactory; ACE_NEW_THROW_EX (channelfactory, @@ -33,22 +33,22 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA, C PortableServer::ServantBase_var channelfactory_var (channelfactory); - channelfactory->init_i (default_POA, ACE_TRY_ENV); + channelfactory->init_i (default_POA TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ()); CORBA::Object_var obj = channelfactory->poa_factory_-> activate_object (channelfactory->my_POA_.in (), - channelfactory, ACE_TRY_ENV); + channelfactory TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ()); return CosNotifyChannelAdmin::EventChannelFactory - ::_narrow (obj.in (), ACE_TRY_ENV); + ::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL) { - TAO_Notify_Factory::init (ACE_TRY_ENV); + TAO_Notify_Factory::init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->my_POA_ = PortableServer::POA::_duplicate (default_POA); @@ -60,23 +60,23 @@ TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA, C // The POA that we should activate the Event Channels in. this->ec_POA_ = this->poa_factory_-> - create_event_channel_POA (this->my_POA_.in (), ACE_TRY_ENV); + create_event_channel_POA (this->my_POA_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->lock_ = - this->channel_objects_factory_->create_channel_factory_lock (ACE_TRY_ENV); + this->channel_objects_factory_->create_channel_factory_lock (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->default_filter_factory_ = - this->create_default_filter_factory_i (ACE_TRY_ENV); + this->create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_EventChannelFactory_i::get_ref (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannelFactory_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) { return CosNotifyChannelAdmin::EventChannelFactory ::_narrow (this->poa_factory_-> - servant_to_reference (this->my_POA_.in (), this, ACE_TRY_ENV)); + servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER)); } void @@ -88,29 +88,33 @@ TAO_Notify_EventChannelFactory_i::event_channel_destroyed (CosNotifyChannelAdmin ACE_DEBUG ((LM_DEBUG, "event_channel_destroyed %d\n", channel_id)); } -void TAO_Notify_EventChannelFactory_i::shutdown (CORBA::Environment &ACE_TRY_ENV, CORBA::Boolean destroy_children) +void TAO_Notify_EventChannelFactory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL +#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) + , +#endif + CORBA::Boolean destroy_children) { if (destroy_children == 1) { - this->poa_factory_->destroy_POA (this->ec_POA_.in (), ACE_TRY_ENV); + this->poa_factory_->destroy_POA (this->ec_POA_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->poa_factory_->deactivate_object(this->default_filter_factory_.in (), - this->my_POA_.in (), - ACE_TRY_ENV); + this->my_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // Deactivate ourselves. this->poa_factory_->deactivate_object (this, - this->my_POA_.in (), - ACE_TRY_ENV); + this->my_POA_.in () + TAO_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::EventChannel_ptr TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, - CosNotifyChannelAdmin::ChannelID_out ec_id, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::ChannelID_out ec_id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -119,8 +123,8 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope )) { TAO_Notify_EventChannel_i* channel = - this->channel_objects_factory_->create_event_channel (this, - ACE_TRY_ENV); + this->channel_objects_factory_->create_event_channel (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); PortableServer::ServantBase_var channel_var (channel); @@ -135,13 +139,13 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope ACE_DEBUG ((LM_DEBUG, "event_channel created %d\n", ec_id)); } - channel->init (ec_id, initial_qos, initial_admin, this->my_POA_.in (), this->ec_POA_.in (), - ACE_TRY_ENV); + channel->init (ec_id, initial_qos, initial_admin, this->my_POA_.in (), this->ec_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); CORBA::Object_var obj = this->poa_factory_-> - activate_object_with_id (ec_id, this->ec_POA_.in (), channel, - ACE_TRY_ENV); + activate_object_with_id (ec_id, this->ec_POA_.in (), channel + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); this->ec_ids_.next (); @@ -149,18 +153,18 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope } CosNotifyChannelAdmin::ChannelIDSeq* -TAO_Notify_EventChannelFactory_i::get_all_channels (CORBA::Environment & ACE_TRY_ENV) +TAO_Notify_EventChannelFactory_i::get_all_channels (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); - return this->ec_ids_.get_sequence (ACE_TRY_ENV); + return this->ec_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::ChannelID id, CORBA::Environment & ACE_TRY_ENV) +TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::ChannelID id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ChannelNotFound @@ -170,8 +174,8 @@ TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::Chan ACE_TRY { - obj = this->poa_factory_->id_to_reference (id, this->ec_POA_.in (), - ACE_TRY_ENV); + obj = this->poa_factory_->id_to_reference (id, this->ec_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY // Translate any exception to "not found" @@ -181,14 +185,14 @@ TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::Chan ACE_ENDTRY; ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); - return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in (), ACE_TRY_ENV); + return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterFactory_ptr -TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_DECL) { TAO_Notify_FilterFactory_i* filterfactory = - this->channel_objects_factory_->create_filter_factory (ACE_TRY_ENV); + this->channel_objects_factory_->create_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ()); PortableServer::ServantBase_var filterfactory_var (filterfactory); @@ -198,7 +202,7 @@ TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (CORBA::Enviro CORBA::Object_var obj = this->poa_factory_->activate_object (this->my_POA_.in (), - filterfactory, ACE_TRY_ENV); + filterfactory TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ()); return CosNotifyFilter::FilterFactory::_narrow (obj.in ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h index 8f9700a04c3..243a60aa35d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -61,14 +61,18 @@ public: virtual ~TAO_Notify_EventChannelFactory_i (void); // Destructor - static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA, CORBA::Environment &ACE_TRY_ENV); + static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL); // Create a factory servant and activates it with the default POA. // Also creates a resource factory and assigns it this default_POA. - CosNotifyChannelAdmin::EventChannelFactory_ptr get_ref (CORBA::Environment &ACE_TRY_ENV); + CosNotifyChannelAdmin::EventChannelFactory_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL); // Get the CORBA object. - void shutdown (CORBA::Environment &ACE_TRY_ENV, CORBA::Boolean destroy_children = 0); + void shutdown (TAO_ENV_SINGLE_ARG_DECL +#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) + , // This is ugly -- destroy_children should come BEFORE the env arg. +#endif + CORBA::Boolean destroy_children = 0); // Destroy the factory // By default, the factory's lifetime is not coupled with its creations // Setting the <destroy_children> flag to 'true' will destory all event_channels that were created by this factory. @@ -84,8 +88,8 @@ public: virtual CosNotifyChannelAdmin::EventChannel_ptr create_channel ( const CosNotification::QoSProperties & initial_qos, const CosNotification::AdminProperties & initial_admin, - CosNotifyChannelAdmin::ChannelID_out id, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::ChannelID_out id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -94,15 +98,15 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr create_channel ( )); virtual CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::EventChannel_ptr get_event_channel ( - CosNotifyChannelAdmin::ChannelID id, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::ChannelID id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -113,10 +117,10 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr get_event_channel ( TAO_Notify_EventChannelFactory_i (void); // Constructor - void init_i (PortableServer::POA_ptr default_POA, CORBA::Environment &ACE_TRY_ENV); + void init_i (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL); // Initializes this object. - CosNotifyFilter::FilterFactory_ptr create_default_filter_factory_i (CORBA::Environment& ACE_TRY_ENV); + CosNotifyFilter::FilterFactory_ptr create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_DECL); // Create the default filter factory. // = Data members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp index 430e7bcd0ef..ff92e190c84 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp @@ -50,7 +50,7 @@ TAO_Notify_EventChannel_i::~TAO_Notify_EventChannel_i (void) } void -TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr default_POA, PortableServer::POA_ptr my_POA, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr default_POA, PortableServer::POA_ptr my_POA TAO_ENV_ARG_DECL) { this->channel_id_ = channel_id; @@ -58,38 +58,38 @@ TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, co this->default_POA_ = PortableServer::POA::_duplicate (default_POA); this->lock_ = - this->channel_objects_factory_->create_event_channel_lock (ACE_TRY_ENV); + this->channel_objects_factory_->create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->event_manager_ = - this->event_manager_objects_factory_->create_event_manager (this, ACE_TRY_ENV); + this->event_manager_objects_factory_->create_event_manager (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->event_manager_->init (ACE_TRY_ENV); + this->event_manager_->init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // try to set initial qos params - this->set_qos (initial_qos, ACE_TRY_ENV); + this->set_qos (initial_qos TAO_ENV_ARG_PARAMETER); ACE_CHECK; // try to set initial admin params - this->set_admin (initial_admin, ACE_TRY_ENV); + this->set_admin (initial_admin TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create the POA for the CA's this->CA_POA_ = - this->poa_factory_->create_consumer_admin_POA (this->my_POA_.in (), channel_id, - ACE_TRY_ENV); + this->poa_factory_->create_consumer_admin_POA (this->my_POA_.in (), channel_id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create the POA for the SA's this->SA_POA_ = - this->poa_factory_->create_supplier_admin_POA (this->my_POA_.in (), channel_id, - ACE_TRY_ENV); + this->poa_factory_->create_supplier_admin_POA (this->my_POA_.in (), channel_id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->event_listener_list_ = - TAO_Notify_Factory::get_collection_factory ()->create_event_listener_list (ACE_TRY_ENV); + TAO_Notify_Factory::get_collection_factory ()->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the default Consumer Admin. Because the ID_Pool is being used @@ -97,11 +97,11 @@ TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, co CosNotifyChannelAdmin::AdminID id_unused; CosNotifyChannelAdmin::ConsumerAdmin_var def_consumer_admin = - this->new_for_consumers (default_op_, id_unused, ACE_TRY_ENV); + this->new_for_consumers (default_op_, id_unused TAO_ENV_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::SupplierAdmin_var def_supplier_admin = - this->new_for_suppliers (default_op_, id_unused, ACE_TRY_ENV); + this->new_for_suppliers (default_op_, id_unused TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -130,10 +130,10 @@ TAO_Notify_EventChannel_i::get_default_POA (void) } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_EventChannel_i::get_ref (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_var obj = this->poa_factory_-> - servant_to_reference (this->my_POA_.in (), this, ACE_TRY_ENV); + servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ()); @@ -141,76 +141,76 @@ TAO_Notify_EventChannel_i::get_ref (CORBA::Environment &ACE_TRY_ENV) void -TAO_Notify_EventChannel_i::unregister_listener (TAO_Notify_EventListener* group_listener, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::unregister_listener (TAO_Notify_EventListener* group_listener TAO_ENV_ARG_DECL) { // UnRegister the group listener. - this->event_listener_list_->disconnected (group_listener, ACE_TRY_ENV); + this->event_listener_list_->disconnected (group_listener TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_EventChannel_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->event_manager_->shutdown (ACE_TRY_ENV); + this->event_manager_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Deactivate ourselves. this->poa_factory_->deactivate_object (this, - this->my_POA_.in (), - ACE_TRY_ENV); + this->my_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // shutdown consumer admins's. TAO_Notify_Shutdown_Worker shutdown_worker; - this->event_listener_list_->for_each (&shutdown_worker, ACE_TRY_ENV); + this->event_listener_list_->for_each (&shutdown_worker TAO_ENV_ARG_PARAMETER); ACE_CHECK; // release all references. - this->event_listener_list_->shutdown (ACE_TRY_ENV); + this->event_listener_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // @@ TODO: We need a way to send shutdown messages to the proxy consumers too. // (event listeners are proxy suppliers or CA's in disguise) - this->poa_factory_->destroy_POA (this->CA_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->destroy_POA (this->CA_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->poa_factory_->destroy_POA (this->SA_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->destroy_POA (this->SA_POA_.in () + TAO_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_EventChannel_i::MyFactory (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::MyFactory (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->channel_factory_->get_ref (ACE_TRY_ENV); + return this->channel_factory_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::default_consumer_admin (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::default_consumer_admin (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->get_consumeradmin (this->default_id_, ACE_TRY_ENV); + return this->get_consumeradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel_i::default_supplier_admin (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::default_supplier_admin (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->get_supplieradmin (this->default_id_, ACE_TRY_ENV); + return this->get_supplieradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterFactory_ptr -TAO_Notify_EventChannel_i::default_filter_factory (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_EventChannel_i::default_filter_factory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -219,14 +219,14 @@ TAO_Notify_EventChannel_i::default_filter_factory (CORBA::Environment &/*ACE_TRY } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // @@ use auto_ptr TAO_Notify_ConsumerAdmin_i* consumer_admin = - this->channel_objects_factory_->create_consumer_admin (this, ACE_TRY_ENV); + this->channel_objects_factory_->create_consumer_admin (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); PortableServer::ServantBase_var consumeradmin_var (consumer_admin); @@ -239,18 +239,18 @@ TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilter id = this->consumer_admin_ids_.get (); } - consumer_admin->init (id, op, this->CA_POA_.in (), ACE_TRY_ENV); + consumer_admin->init (id, op, this->CA_POA_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); CORBA::Object_var obj = this->poa_factory_->activate_object_with_id (id, this->CA_POA_.in (), - consumer_admin, - ACE_TRY_ENV); + consumer_admin + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); // Register the group listener. - this->event_listener_list_->connected (consumer_admin, ACE_TRY_ENV); + this->event_listener_list_->connected (consumer_admin TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); this->consumer_admin_ids_.next (); @@ -258,13 +258,13 @@ TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilter } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { TAO_Notify_SupplierAdmin_i* supplieradmin = - this->channel_objects_factory_->create_supplier_admin (this, ACE_TRY_ENV); + this->channel_objects_factory_->create_supplier_admin (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); PortableServer::ServantBase_var supplieradmin_var (supplieradmin); @@ -275,14 +275,14 @@ TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilter id = this->supplier_admin_ids_.get (); } - supplieradmin->init (id, op, this->SA_POA_.in (), ACE_TRY_ENV); + supplieradmin->init (id, op, this->SA_POA_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); CORBA::Object_var obj = this->poa_factory_-> activate_object_with_id (id, this->SA_POA_.in (), - supplieradmin, - ACE_TRY_ENV); + supplieradmin + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); this->supplier_admin_ids_.next (); @@ -290,46 +290,46 @@ TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilter } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminNotFound )) { CORBA::Object_var obj = - this->poa_factory_->id_to_reference (id, this->CA_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->id_to_reference (id, this->CA_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in ()); } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminNotFound )) { CORBA::Object_var obj = - this->poa_factory_->id_to_reference (id, this->SA_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->id_to_reference (id, this->SA_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ()); } CosNotifyChannelAdmin::AdminIDSeq* -TAO_Notify_EventChannel_i::get_all_consumeradmins (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::get_all_consumeradmins (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->consumer_admin_ids_.get_sequence (ACE_TRY_ENV); + return this->consumer_admin_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::AdminIDSeq* -TAO_Notify_EventChannel_i::get_all_supplieradmins (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::get_all_supplieradmins (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -338,60 +338,60 @@ TAO_Notify_EventChannel_i::get_all_supplieradmins (CORBA::Environment &ACE_TRY_E CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); - return this->supplier_admin_ids_.get_sequence (ACE_TRY_ENV); + return this->supplier_admin_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); } CosNotification::QoSProperties* -TAO_Notify_EventChannel_i::get_qos (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->qos_admin_.get_qos (ACE_TRY_ENV); + return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_EventChannel_i::set_qos (const CosNotification::QoSProperties & qos,CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.set_qos (qos, ACE_TRY_ENV); + this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_EventChannel_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.validate_qos (required_qos, available_qos, ACE_TRY_ENV); + this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER); } CosNotification::AdminProperties* -TAO_Notify_EventChannel_i::get_admin (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::get_admin (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // Delegate to Event Manager. - return this->event_manager_->admin_properties ()->get_admin (ACE_TRY_ENV); + return this->event_manager_->admin_properties ()->get_admin (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_EventChannel_i::set_admin (const CosNotification::AdminProperties & admin, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_EventChannel_i::set_admin (const CosNotification::AdminProperties & admin TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedAdmin )) { - this->event_manager_->admin_properties ()->set_admin (admin, ACE_TRY_ENV); + this->event_manager_->admin_properties ()->set_admin (admin TAO_ENV_ARG_PARAMETER); } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::for_consumers (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -401,25 +401,25 @@ TAO_Notify_EventChannel_i::for_consumers (CORBA::Environment& ACE_TRY_ENV) // TODO: find a way to disable the destroy method in the default Admin. CORBA::Object_var obj = - this->get_consumeradmin (this->default_id_, ACE_TRY_ENV); + this->get_consumeradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::ConsumerAdmin::_nil ()); - return CosEventChannelAdmin::ConsumerAdmin::_narrow (obj.in (), - ACE_TRY_ENV); + return CosEventChannelAdmin::ConsumerAdmin::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel_i::for_suppliers (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_EventChannel_i::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { CORBA::Object_var obj = - this->get_supplieradmin (this->default_id_, ACE_TRY_ENV); + this->get_supplieradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::SupplierAdmin::_nil ()); - return CosEventChannelAdmin::SupplierAdmin::_narrow (obj.in (), - ACE_TRY_ENV); + return CosEventChannelAdmin::SupplierAdmin::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h index e3c5ea3bfbd..e0035352597 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h @@ -75,8 +75,8 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr default_POA, - PortableServer::POA_ptr my_POA, - CORBA::Environment &ACE_TRY_ENV); + PortableServer::POA_ptr my_POA + TAO_ENV_ARG_DECL); // Initialize this object. // checks if the <initial_qos> and <initial admin> are valid. // creates default filter, consumer admin and supplier admin. @@ -85,7 +85,7 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify PortableServer::POA_ptr get_default_POA (void); // Get the default POA. - CosNotifyChannelAdmin::EventChannel_ptr get_ref (CORBA::Environment &ACE_TRY_ENV); + CosNotifyChannelAdmin::EventChannel_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL); // Get the CORBA object for this servant TAO_Notify_Event_Manager* get_event_manager (void); @@ -98,34 +98,34 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify void supplier_admin_destroyed (CosNotifyChannelAdmin::AdminID SA_ID); // This id is no longer in use.It can be reused by <supplier_admin_ids_>. - void unregister_listener (TAO_Notify_EventListener* group_listener, CORBA::Environment &ACE_TRY_ENV); + void unregister_listener (TAO_Notify_EventListener* group_listener TAO_ENV_ARG_DECL); // Consumer Admin's are Group Listeners that are registered automatically with the EC when a ConsumerAdmin // is created. When a consumer is destroyed, it asks the EC to unregister itself. // = Interface methods virtual CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyFilter::FilterFactory_ptr default_filter_factory ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -133,8 +133,8 @@ virtual CosNotifyFilter::FilterFactory_ptr default_filter_factory ( virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers ( CosNotifyChannelAdmin::InterFilterGroupOperator op, - CosNotifyChannelAdmin::AdminID_out id, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::AdminID_out id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -142,16 +142,16 @@ virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers ( virtual CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers ( CosNotifyChannelAdmin::InterFilterGroupOperator op, - CosNotifyChannelAdmin::AdminID_out id, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::AdminID_out id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin ( - CosNotifyChannelAdmin::AdminID id, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::AdminID id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -159,8 +159,8 @@ virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin ( )); virtual CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin ( - CosNotifyChannelAdmin::AdminID id, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::AdminID id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -168,29 +168,29 @@ virtual CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin ( )); virtual CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotification::QoSProperties * get_qos ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void set_qos ( - const CosNotification::QoSProperties & qos, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::QoSProperties & qos + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -199,8 +199,8 @@ virtual CosNotification::QoSProperties * get_qos ( virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, - CosNotification::NamedPropertyRangeSeq_out available_qos, - CORBA::Environment &ACE_TRY_ENV + CosNotification::NamedPropertyRangeSeq_out available_qos + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -208,15 +208,15 @@ virtual CosNotification::QoSProperties * get_qos ( )); virtual CosNotification::AdminProperties * get_admin ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void set_admin ( - const CosNotification::AdminProperties & admin, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::AdminProperties & admin + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -224,21 +224,21 @@ virtual CosNotification::QoSProperties * get_qos ( )); virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp index a6be3b5bd8a..fa626cea37d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp @@ -30,9 +30,9 @@ TAO_Notify_Event_Dispatch_Command::~TAO_Notify_Event_Dispatch_Command () } int -TAO_Notify_Event_Dispatch_Command::execute (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Event_Dispatch_Command::execute (TAO_ENV_SINGLE_ARG_DECL) { - this->event_listener_->dispatch_event (*this->event_, ACE_TRY_ENV); + this->event_listener_->dispatch_event (*this->event_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h index 342f6f3a066..b1646aabdcd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h @@ -45,7 +45,7 @@ class TAO_Notify_Export TAO_Notify_Event_Dispatch_Command : public TAO_Notify_Co ~TAO_Notify_Event_Dispatch_Command (); - virtual int execute (CORBA::Environment& ACE_TRY_ENV); + virtual int execute (TAO_ENV_SINGLE_ARG_DECL); // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp index 17d5970b0ad..e0d1a48bcbe 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp @@ -35,7 +35,7 @@ TAO_Notify_Event_Manager::~TAO_Notify_Event_Manager () } void -TAO_Notify_Event_Manager::init (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Manager::init (TAO_ENV_SINGLE_ARG_DECL) { ACE_NEW_THROW_EX (this->lock_, ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (), @@ -46,22 +46,22 @@ TAO_Notify_Event_Manager::init (CORBA::Environment &ACE_TRY_ENV) this->admin_properties_ = new TAO_Notify_AdminProperties (); this->event_map_ = - this->emo_factory_->create_event_map (ACE_TRY_ENV); + this->emo_factory_->create_event_map (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->event_processor_ = - this->emo_factory_->create_event_processor (this, ACE_TRY_ENV); + this->emo_factory_->create_event_processor (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->updates_dispatching_task_ = - this->emo_factory_->create_updates_task (ACE_TRY_ENV); + this->emo_factory_->create_updates_task (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Init the objects - this->event_map_->init (ACE_TRY_ENV); + this->event_map_->init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->event_processor_->init (ACE_TRY_ENV); + this->event_processor_->init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // @@ check return value @@ -70,58 +70,58 @@ TAO_Notify_Event_Manager::init (CORBA::Environment &ACE_TRY_ENV) } void -TAO_Notify_Event_Manager::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Manager::shutdown (TAO_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); ACE_CHECK; - this->event_processor_->shutdown (ACE_TRY_ENV); + this->event_processor_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->event_map_->shutdown (ACE_TRY_ENV); + this->event_map_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->updates_dispatching_task_->shutdown (ACE_TRY_ENV); + this->updates_dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_Event_Manager::subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Manager::subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) { TAO_Notify_EventType_List added_update, removed_update; this->event_map_->subscribe_for_events (event_listener, added_update, - added, ACE_TRY_ENV); + added TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->event_map_->unsubscribe_from_events (event_listener, removed_update, - removed, ACE_TRY_ENV); + removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; // if either of the lists are *not* empty, send updates if (added_update.is_empty () == 0 || removed_update.is_empty () == 0) this->dispatch_updates_i (this->event_map_->subscription_change_listeners (), - added_update, removed_update, ACE_TRY_ENV); + added_update, removed_update TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Manager::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Manager::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) { TAO_Notify_EventType_List added_list; TAO_Notify_EventType_List removed_list; this->event_map_->update_publication_list (added, removed, - added_list, removed_list, ACE_TRY_ENV); + added_list, removed_list TAO_ENV_ARG_PARAMETER); ACE_CHECK; // if either of the lists are *not* empty, send updates if (added_list.is_empty () == 0 || removed_list.is_empty () == 0) this->dispatch_updates_i (this->event_map_->publication_change_listeners (), - added_list, removed_list, ACE_TRY_ENV); + added_list, removed_list TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed TAO_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); @@ -129,7 +129,7 @@ TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List* up TAO_Notify_Update_Worker update_worker (this->updates_dispatching_task_, added, removed); - update_listener_list->for_each (&update_worker, ACE_TRY_ENV); + update_listener_list->for_each (&update_worker TAO_ENV_ARG_PARAMETER); } /********************************************************************/ @@ -142,13 +142,13 @@ TAO_Notify_Update_Worker::TAO_Notify_Update_Worker (TAO_Notify_Worker_Task * upd } void -TAO_Notify_Update_Worker::work (TAO_Notify_UpdateListener* listener, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Update_Worker::work (TAO_Notify_UpdateListener* listener TAO_ENV_ARG_DECL) { TAO_Notify_Update_Dispatch_Command* mb = new TAO_Notify_Update_Dispatch_Command (listener, this->added_, this->removed_); - this->updates_dispatching_task_->process_event (mb, ACE_TRY_ENV); + this->updates_dispatching_task_->process_event (mb TAO_ENV_ARG_PARAMETER); } /********************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h index a72162954e5..78fe19a3be8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h @@ -59,34 +59,34 @@ class TAO_Notify_Export TAO_Notify_Event_Manager ~TAO_Notify_Event_Manager (); // Destructor. - void init (CORBA::Environment &ACE_TRY_ENV); + void init (TAO_ENV_SINGLE_ARG_DECL); // Init - void shutdown (CORBA::Environment &ACE_TRY_ENV); + void shutdown (TAO_ENV_SINGLE_ARG_DECL); // Shutdown operations. // = Publish/Subscribe management // = Subscription - void subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV); + void subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL); // Subscribes <event_listener> for events <added>. // Unsubscribes <event_listener> for events <removed>. // = Publications - void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV); + void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL); // Suppliers can send anonymous requests to the Event Manager to indicate // what kind of events they expect to produce. // = Updates - void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); + void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); // Registers the subscription update listener with the Event Manager. - void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); + void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); // Unregister from subscription updates. - void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); + void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); // Registers the publication update listener with the Event Manager. - void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); + void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); // Unregister from publication updates. // = Accessors @@ -110,8 +110,8 @@ class TAO_Notify_Export TAO_Notify_Event_Manager // = Event forwarding methods. void process_event (TAO_Notify_Event* event, - TAO_Notify_EventSource* event_source, - CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_EventSource* event_source + TAO_ENV_ARG_DECL); // Delivers the event to listeners subscribed for <event> // <event_source> is the <event> source to the Event Manager. @@ -119,8 +119,8 @@ protected: // = Event dispatching methods. void dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, - TAO_Notify_EventType_List& removed, - CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_EventType_List& removed + TAO_ENV_ARG_DECL); // Dispatch the updates to the <update_listener_list> // = Data members. @@ -161,7 +161,7 @@ class TAO_Notify_Export TAO_Notify_Update_Worker : public TAO_ESF_Worker<TAO_Not TAO_Notify_Update_Worker (TAO_Notify_Worker_Task * updates_dispatching_task, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed); // = TAO_ESF_Worker method - void work (TAO_Notify_UpdateListener* listener, CORBA::Environment &ACE_TRY_ENV); + void work (TAO_Notify_UpdateListener* listener TAO_ENV_ARG_DECL); protected: // = Data members. TAO_Notify_EventType_List& added_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i index 374b1f2b47d..88a95c1baf2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i @@ -7,45 +7,45 @@ ACE_INLINE void TAO_Notify_Event_Manager::process_event (TAO_Notify_Event* event, - TAO_Notify_EventSource* event_source, - CORBA::Environment &ACE_TRY_ENV) + TAO_Notify_EventSource* event_source + TAO_ENV_ARG_DECL) { if (admin_properties_->reject_new_events () == 1 && admin_properties_->queue_full ()) ACE_THROW (CORBA::IMP_LIMIT ()); this->event_processor_->evaluate_source_filter (event, - event_source, - ACE_TRY_ENV); + event_source + TAO_ENV_ARG_PARAMETER); // Start by checking if the event passes through the Source's filter. } ACE_INLINE void -TAO_Notify_Event_Manager::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Event_Manager::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) { - this->event_map_->register_for_publication_updates (update_listener, - ACE_TRY_ENV); + this->event_map_->register_for_publication_updates (update_listener + TAO_ENV_ARG_PARAMETER); } ACE_INLINE void -TAO_Notify_Event_Manager::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Event_Manager::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) { - this->event_map_->register_for_subscription_updates (update_listener, - ACE_TRY_ENV); + this->event_map_->register_for_subscription_updates (update_listener + TAO_ENV_ARG_PARAMETER); } ACE_INLINE void -TAO_Notify_Event_Manager:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Event_Manager:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) { - this->event_map_->unregister_from_subscription_updates (update_listener, - ACE_TRY_ENV); + this->event_map_->unregister_from_subscription_updates (update_listener + TAO_ENV_ARG_PARAMETER); } ACE_INLINE void -TAO_Notify_Event_Manager::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Event_Manager::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) { - this->event_map_->unregister_from_publication_updates(update_listener, - ACE_TRY_ENV); + this->event_map_->unregister_from_publication_updates(update_listener + TAO_ENV_ARG_PARAMETER); } ACE_INLINE TAO_Notify_Event_Map* diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h index 2403e2a0d63..77c84b86954 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h @@ -47,23 +47,23 @@ class TAO_Notify_Export TAO_Notify_EMO_Factory : public ACE_Service_Object public: virtual ~TAO_Notify_EMO_Factory (){}; - virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV)= 0; + virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)= 0; // Create an event manager. - virtual TAO_Notify_Event_Map* create_event_map (CORBA::Environment &ACE_TRY_ENV)= 0; + virtual TAO_Notify_Event_Map* create_event_map (TAO_ENV_SINGLE_ARG_DECL)= 0; // Create the event map. - virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV)= 0; + virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL)= 0; // Create event processor. // = Create processing tasks. - virtual TAO_Notify_Worker_Task* create_source_eval_task (CORBA::Environment &ACE_TRY_ENV)= 0; - virtual TAO_Notify_Worker_Task* create_lookup_task (CORBA::Environment &ACE_TRY_ENV)= 0; - virtual TAO_Notify_Worker_Task* create_listener_eval_task (CORBA::Environment &ACE_TRY_ENV)= 0; + virtual TAO_Notify_Worker_Task* create_source_eval_task (TAO_ENV_SINGLE_ARG_DECL)= 0; + virtual TAO_Notify_Worker_Task* create_lookup_task (TAO_ENV_SINGLE_ARG_DECL)= 0; + virtual TAO_Notify_Worker_Task* create_listener_eval_task (TAO_ENV_SINGLE_ARG_DECL)= 0; - virtual TAO_Notify_Worker_Task* create_dispatching_task (CORBA::Environment &ACE_TRY_ENV)= 0; + virtual TAO_Notify_Worker_Task* create_dispatching_task (TAO_ENV_SINGLE_ARG_DECL)= 0; // Task that dispatches events. - virtual TAO_Notify_Worker_Task* create_updates_task (CORBA::Environment &ACE_TRY_ENV)= 0; + virtual TAO_Notify_Worker_Task* create_updates_task (TAO_ENV_SINGLE_ARG_DECL)= 0; // Task that dispatches updates. // Destroy processing tasks. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp index 16dda3f7da0..1ccbc9eb6aa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp @@ -41,23 +41,23 @@ TAO_Notify_Event_Map::~TAO_Notify_Event_Map () } void -TAO_Notify_Event_Map::init (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Map::init (TAO_ENV_SINGLE_ARG_DECL) { this->default_subscription_list_ = - this->collection_factory_->create_event_listener_list (ACE_TRY_ENV); + this->collection_factory_->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the default list of listeners. this->subscription_change_listeners_ - = this->collection_factory_->create_update_listener_list (ACE_TRY_ENV); + = this->collection_factory_->create_update_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->publication_change_listeners_ - = this->collection_factory_->create_update_listener_list (ACE_TRY_ENV); + = this->collection_factory_->create_update_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_Event_Map::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Map::shutdown (TAO_ENV_SINGLE_ARG_DECL) { // Shutdown all event listener lists in the event map. EVENT_RECIPIENT_MAP::ITERATOR iterator (this->event_recipient_map_); @@ -66,21 +66,21 @@ TAO_Notify_Event_Map::shutdown (CORBA::Environment &ACE_TRY_ENV) iterator.next (entry) != 0; iterator.advance ()) { - entry->int_id_->shutdown (ACE_TRY_ENV); + entry->int_id_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - default_subscription_list_->shutdown (ACE_TRY_ENV); + default_subscription_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - subscription_change_listeners_->shutdown (ACE_TRY_ENV); + subscription_change_listeners_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - publication_change_listeners_->shutdown (ACE_TRY_ENV); + publication_change_listeners_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added TAO_ENV_ARG_DECL) { TAO_Notify_EventListener_List* event_listener_list; TAO_Notify_EventType event_type; @@ -101,7 +101,7 @@ TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_list { // create the list. TAO_Notify_EventListener_List* new_list = - this->collection_factory_->create_event_listener_list (ACE_TRY_ENV); + this->collection_factory_->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // add the list to the recipient map. @@ -109,7 +109,7 @@ TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_list event_listener_list = new_list; } - event_listener_list->connected (event_listener, ACE_TRY_ENV); + event_listener_list->connected (event_listener TAO_ENV_ARG_PARAMETER); ACE_CHECK; // mirror changes in the subscription list @@ -119,7 +119,7 @@ TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_list } void -TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) { TAO_Notify_EventListener_List* event_listener_list; TAO_Notify_EventType event_type; @@ -137,7 +137,7 @@ TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_l // remove <event_listener> from the list. - event_listener_list->disconnected (event_listener, ACE_TRY_ENV); + event_listener_list->disconnected (event_listener TAO_ENV_ARG_PARAMETER); ACE_CHECK; // If this was the last entry in the list then we should remove @@ -157,27 +157,27 @@ TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_l } void -TAO_Notify_Event_Map::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Event_Map::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) { - this->publication_change_listeners_->connected (update_listener, ACE_TRY_ENV); + this->publication_change_listeners_->connected (update_listener TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Map::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Event_Map::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) { - this->subscription_change_listeners_->connected (update_listener, ACE_TRY_ENV); + this->subscription_change_listeners_->connected (update_listener TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Map:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Event_Map:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) { - this->subscription_change_listeners_->disconnected (update_listener, ACE_TRY_ENV); + this->subscription_change_listeners_->disconnected (update_listener TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Map::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Event_Map::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) { - this->publication_change_listeners_->disconnected (update_listener, ACE_TRY_ENV); + this->publication_change_listeners_->disconnected (update_listener TAO_ENV_ARG_PARAMETER); } CosNotification::EventTypeSeq* @@ -209,7 +209,7 @@ TAO_Notify_Event_Map::obtain_subscription_types (void) } void -TAO_Notify_Event_Map::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list, CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_Event_Map::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list TAO_ENV_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) { TAO_Notify_EventType event_type; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h index fefd8ac52bf..ef139ca3353 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h @@ -57,35 +57,35 @@ public: virtual ~TAO_Notify_Event_Map (); // Destructor. - void init (CORBA::Environment &ACE_TRY_ENV); + void init (TAO_ENV_SINGLE_ARG_DECL); // Init - void shutdown (CORBA::Environment &ACE_TRY_ENV); + void shutdown (TAO_ENV_SINGLE_ARG_DECL); // Shutdown releases all listeners. // = Subscribe and Unsubscribe methods. - void subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added, CORBA::Environment &ACE_TRY_ENV); + void subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added TAO_ENV_ARG_DECL); - void unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV); + void unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL); // = Publish and Unpublish methods // Later: - void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list, CORBA::Environment &ACE_TRY_ENV); + void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list TAO_ENV_ARG_DECL); // Suppliers can send anonymous requests to the Event Manager to indicate // what kind of events they expect to produce. // = Subscription Updates - void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); + void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); // Registers the subscription update listener with the Event Manager. - void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); + void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); // Unregister from subscription updates. // = Publication Updates - void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); + void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); // Registers the publication update listener with the Event Manager. - void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV); + void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); // Unregister from publication updates. // = Subscription list lookup diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp index 616daab0ece..e7e4e08042b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp @@ -27,9 +27,9 @@ TAO_Notify_Event_Processor::~TAO_Notify_Event_Processor () } void -TAO_Notify_Event_Processor::init (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Event_Processor::init (TAO_ENV_SINGLE_ARG_DECL) { - this->lookup_task_ = this->emo_factory_->create_lookup_task (ACE_TRY_ENV); + this->lookup_task_ = this->emo_factory_->create_lookup_task (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -40,15 +40,15 @@ TAO_Notify_Event_Processor::init (CORBA::Environment& ACE_TRY_ENV) } void -TAO_Notify_Event_Processor::shutdown (CORBA::Environment & ACE_TRY_ENV) +TAO_Notify_Event_Processor::shutdown (TAO_ENV_SINGLE_ARG_DECL) { - this->lookup_task_->shutdown (ACE_TRY_ENV); + this->lookup_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } void TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event, - TAO_Notify_EventSource* event_source, - CORBA::Environment& ACE_TRY_ENV) + TAO_Notify_EventSource* event_source + TAO_ENV_ARG_DECL) { // TODO: use cache allocator here. // @@ Pradeep: you shouldn't be allocating at all! If this must go @@ -57,22 +57,22 @@ TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event, TAO_Notify_Source_Filter_Eval_Command* mb = new TAO_Notify_Source_Filter_Eval_Command (this, event, event_source); - event_source->filter_eval_task ()->process_event (mb, ACE_TRY_ENV); + event_source->filter_eval_task ()->process_event (mb TAO_ENV_ARG_PARAMETER); } void TAO_Notify_Event_Processor::lookup_subscriptions (TAO_Notify_Event* event, - TAO_Notify_EventSource* /*event_source*/, - CORBA::Environment &ACE_TRY_ENV) + TAO_Notify_EventSource* /*event_source*/ + TAO_ENV_ARG_DECL) { TAO_Notify_Lookup_Command* lookup = new TAO_Notify_Lookup_Command (this, event, this->event_manager_->event_map ()); - this->lookup_task_->process_event (lookup, ACE_TRY_ENV); + this->lookup_task_->process_event (lookup TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Processor::evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Processor::evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL) { // @@ Pradeep: you should use ACE_NEW here.... // @@ Pradeep: do you really need to allocate this guy from the @@ -83,14 +83,14 @@ TAO_Notify_Event_Processor::evaluate_listener_filter (TAO_Notify_Event* event, T TAO_Notify_Listener_Filter_Eval_Command* mb = new TAO_Notify_Listener_Filter_Eval_Command (this, event, event_listener, eval_parent); - event_listener->filter_eval_task ()->process_event (mb, ACE_TRY_ENV); + event_listener->filter_eval_task ()->process_event (mb TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Processor::dispatch_event (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Event_Processor::dispatch_event (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener TAO_ENV_ARG_DECL) { TAO_Notify_Event_Dispatch_Command* dispatch = new TAO_Notify_Event_Dispatch_Command (this, event, event_listener); - event_listener->event_dispatch_task ()->process_event (dispatch, ACE_TRY_ENV); + event_listener->event_dispatch_task ()->process_event (dispatch TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h index d42fa98db99..4cba31f6026 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h @@ -56,36 +56,36 @@ class TAO_Notify_Export TAO_Notify_Event_Processor TAO_Notify_Event_Processor (TAO_Notify_Event_Manager* event_manager); virtual ~TAO_Notify_Event_Processor (); - void init (CORBA::Environment& ACE_TRY_ENV); + void init (TAO_ENV_SINGLE_ARG_DECL); // Init - void shutdown (CORBA::Environment &ACE_TRY_ENV); + void shutdown (TAO_ENV_SINGLE_ARG_DECL); // Shutdown operations. void evaluate_source_filter (TAO_Notify_Event* event, - TAO_Notify_EventSource* event_source, - CORBA::Environment& ACE_TRY_ENV); + TAO_Notify_EventSource* event_source + TAO_ENV_ARG_DECL); // Event processing entry point. // = Callbacks for Source/Event Listeners. void lookup_subscriptions (TAO_Notify_Event* event, - TAO_Notify_EventSource* event_source, - CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_EventSource* event_source + TAO_ENV_ARG_DECL); // This method is called by an Event_Source after it has - // successfully evaluated its filter. + // successfully evaluated its filter. void evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, - CORBA::Boolean eval_parent, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Boolean eval_parent + TAO_ENV_ARG_DECL); // This method is called by the subscription lookup command asking // that <event> be delivered to <event_listener>. void dispatch_event (TAO_Notify_Event* event, - TAO_Notify_EventListener* event_listener, - CORBA::Environment &ACE_TRY_ENV); + TAO_Notify_EventListener* event_listener + TAO_ENV_ARG_DECL); // This method is called by an Event_Listener after it has - // successfully evaluated its filter. + // successfully evaluated its filter. protected: // = Data Members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp index 575f62c7fec..7b9859e70f4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp @@ -16,7 +16,7 @@ TAO_Notify_Collection_Factory* TAO_Notify_Factory::collection_factory_ = 0; TAO_Notify_EMO_Factory* TAO_Notify_Factory::emo_factory_ = 0; void -TAO_Notify_Factory::init (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Factory::init (TAO_ENV_SINGLE_ARG_DECL) { co_factory_ = ACE_Dynamic_Service <TAO_Notify_CO_Factory>::instance (TAO_NOTIFY_DEF_CO_FACTORY_NAME); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h index bc430df663d..e5476598473 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h @@ -62,7 +62,7 @@ class TAO_Notify_Export TAO_Notify_Factory protected: friend class TAO_Notify_EventChannelFactory_i; - static void init (CORBA::Environment &ACE_TRY_ENV); + static void init (TAO_ENV_SINGLE_ARG_DECL); // Initalize the services. static void shutdown (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp index 55084b3aeb3..3f6e3be9953 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp @@ -14,7 +14,7 @@ TAO_Notify_FilterAdmin_i::~TAO_Notify_FilterAdmin_i (void) } CORBA::Boolean -TAO_Notify_FilterAdmin_i::match (const TAO_Notify_Event &event, CORBA::Environment & ACE_TRY_ENV) +TAO_Notify_FilterAdmin_i::match (const TAO_Notify_Event &event TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData @@ -32,7 +32,7 @@ TAO_Notify_FilterAdmin_i::match (const TAO_Notify_Event &event, CORBA::Environme for (; iter.next (entry); iter.advance ()) { - ret_val = event.do_match (entry->int_id_.in (), ACE_TRY_ENV); + ret_val = event.do_match (entry->int_id_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (ret_val == 1) @@ -44,8 +44,8 @@ TAO_Notify_FilterAdmin_i::match (const TAO_Notify_Event &event, CORBA::Environme CosNotifyFilter::FilterID TAO_Notify_FilterAdmin_i::add_filter ( - CosNotifyFilter::Filter_ptr new_filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::Filter_ptr new_filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -69,7 +69,7 @@ TAO_Notify_FilterAdmin_i::add_filter ( } } -void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_id, CORBA::Environment &ACE_TRY_ENV) +void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound @@ -83,8 +83,8 @@ void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_i CosNotifyFilter::Filter_ptr TAO_Notify_FilterAdmin_i::get_filter ( - CosNotifyFilter::FilterID filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::FilterID filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -102,28 +102,28 @@ TAO_Notify_FilterAdmin_i::get_filter ( } CosNotifyFilter::FilterIDSeq* -TAO_Notify_FilterAdmin_i::get_all_filters (CORBA::Environment & ACE_TRY_ENV) +TAO_Notify_FilterAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_ids_.get_sequence(ACE_TRY_ENV); + return this->filter_ids_.get_sequence(TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_FilterAdmin_i::remove_all_filters (CORBA::Environment & ACE_TRY_ENV) +TAO_Notify_FilterAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { CosNotifyFilter::FilterIDSeq* id_list = - this->get_all_filters (ACE_TRY_ENV); + this->get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; i < id_list->length (); ++i) { CosNotifyFilter::FilterID id = (*id_list)[i]; - this->remove_filter (id, ACE_TRY_ENV); + this->remove_filter (id TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h index 9f4977b7d04..6e0d892e30f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h @@ -42,7 +42,7 @@ public: // Destructor // = match operation on all the filters - CORBA::Boolean match (const TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean match (const TAO_Notify_Event &event TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData @@ -50,16 +50,16 @@ public: // see if any of the filters match. virtual CosNotifyFilter::FilterID add_filter ( - CosNotifyFilter::Filter_ptr new_filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::Filter_ptr new_filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_filter ( - CosNotifyFilter::FilterID filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::FilterID filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -67,8 +67,8 @@ public: )); virtual CosNotifyFilter::Filter_ptr get_filter ( - CosNotifyFilter::FilterID filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::FilterID filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -76,14 +76,14 @@ public: )); virtual CosNotifyFilter::FilterIDSeq * get_all_filters ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_filters ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp index fd0975de45d..44c2fb19ce9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp @@ -16,11 +16,11 @@ TAO_Notify_FilterFactory_i::~TAO_Notify_FilterFactory_i (void) } CosNotifyFilter::FilterFactory_ptr -TAO_Notify_FilterFactory_i::get_ref (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_FilterFactory_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyFilter::FilterFactory_var filterfactory; - filterfactory = _this (ACE_TRY_ENV); + filterfactory = _this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ()); return filterfactory._retn (); @@ -28,8 +28,8 @@ TAO_Notify_FilterFactory_i::get_ref (CORBA::Environment &ACE_TRY_ENV) CosNotifyFilter::Filter_ptr TAO_Notify_FilterFactory_i::create_filter ( - const char *constraint_grammar, - CORBA::Environment &ACE_TRY_ENV + const char *constraint_grammar + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -46,14 +46,14 @@ TAO_Notify_FilterFactory_i::create_filter ( TAO_Notify_Filter_i, CORBA::NO_MEMORY ()); - return filter->get_ref (ACE_TRY_ENV); + return filter->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); } CosNotifyFilter::MappingFilter_ptr TAO_Notify_FilterFactory_i::create_mapping_filter ( const char * /*constraint_grammar*/, - const CORBA::Any & /*default_value*/, - CORBA::Environment & //ACE_TRY_ENV + const CORBA::Any & /*default_value*/ + TAO_ENV_ARG_DECL_NOT_USED //TAO_ENV_SINGLE_ARG_PARAMETER ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h index c0f411a7b2d..d6b57eb7794 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h @@ -46,12 +46,12 @@ public: // Destructor CosNotifyFilter::FilterFactory_ptr - get_ref (CORBA::Environment &ACE_TRY_ENV); + get_ref (TAO_ENV_SINGLE_ARG_DECL); // Activate with the default POA virtual CosNotifyFilter::Filter_ptr create_filter ( - const char * constraint_grammar, - CORBA::Environment &ACE_TRY_ENV + const char * constraint_grammar + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -60,8 +60,8 @@ public: virtual CosNotifyFilter::MappingFilter_ptr create_mapping_filter ( const char * constraint_grammar, - const CORBA::Any & default_value, - CORBA::Environment &ACE_TRY_ENV + const CORBA::Any & default_value + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp index 2b2baf9738b..d91924e58ad 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp @@ -17,8 +17,8 @@ TAO_Notify_Filter_i::TAO_Notify_Filter_i (void) // Implementation skeleton destructor TAO_Notify_Filter_i::~TAO_Notify_Filter_i (void) { - ACE_DECLARE_NEW_CORBA_ENV; - this->remove_all_constraints (ACE_TRY_ENV); + TAO_ENV_DECLARE_NEW_ENV; + this->remove_all_constraints (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (TAO_debug_level > 0) @@ -26,26 +26,26 @@ TAO_Notify_Filter_i::~TAO_Notify_Filter_i (void) } CosNotifyFilter::Filter_ptr -TAO_Notify_Filter_i::get_ref (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Filter_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) { PortableServer::POA_var my_POA = _default_POA (); PortableServer::ServantBase_var filter_var (this); PortableServer::ObjectId_var oid = - my_POA->activate_object (this, ACE_TRY_ENV); + my_POA->activate_object (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ()); CORBA::Object_var obj = - my_POA->id_to_reference (oid.in (), ACE_TRY_ENV); + my_POA->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ()); - return CosNotifyFilter::Filter::_narrow (obj.in (), ACE_TRY_ENV); + return CosNotifyFilter::Filter::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); } char* TAO_Notify_Filter_i::constraint_grammar ( - CORBA::Environment & /* ACE_TRY_ENV */ + TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException @@ -57,8 +57,8 @@ TAO_Notify_Filter_i::constraint_grammar ( void TAO_Notify_Filter_i::add_constraints_i ( - const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq, - CORBA::Environment &ACE_TRY_ENV + const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -81,8 +81,8 @@ TAO_Notify_Filter_i::add_constraints_i ( constraint_info_seq[index].constraint_expression; notify_constr_expr->interpreter. - build_tree (expr.constraint_expr.in (), - ACE_TRY_ENV); + build_tree (expr.constraint_expr.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; notify_constr_expr->constr_expr = expr; @@ -108,8 +108,8 @@ TAO_Notify_Filter_i::add_constraints_i ( CosNotifyFilter::ConstraintInfoSeq* TAO_Notify_Filter_i::add_constraints ( - const CosNotifyFilter::ConstraintExpSeq& constraint_list, - CORBA::Environment &ACE_TRY_ENV + const CosNotifyFilter::ConstraintExpSeq& constraint_list + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -144,8 +144,8 @@ TAO_Notify_Filter_i::add_constraints ( constraint_expr.in ())); } - this->add_constraints_i (*infoseq, - ACE_TRY_ENV); + this->add_constraints_i (*infoseq + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_infoseq.release (); @@ -156,8 +156,8 @@ TAO_Notify_Filter_i::add_constraints ( void TAO_Notify_Filter_i::modify_constraints ( const CosNotifyFilter::ConstraintIDSeq & del_list, - const CosNotifyFilter::ConstraintInfoSeq & modify_list, - CORBA::Environment &ACE_TRY_ENV + const CosNotifyFilter::ConstraintInfoSeq & modify_list + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -199,8 +199,8 @@ TAO_Notify_Filter_i::modify_constraints ( ACE_TRY { - this->add_constraints_i (modify_list, - ACE_TRY_ENV); + this->add_constraints_i (modify_list + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -239,8 +239,8 @@ TAO_Notify_Filter_i::modify_constraints ( } CosNotifyFilter::ConstraintInfoSeq* -TAO_Notify_Filter_i::get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list, - CORBA::Environment &ACE_TRY_ENV +TAO_Notify_Filter_i::get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -276,7 +276,7 @@ TAO_Notify_Filter_i::get_constraints (const CosNotifyFilter::ConstraintIDSeq & i } CosNotifyFilter::ConstraintInfoSeq* -TAO_Notify_Filter_i::get_all_constraints (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Filter_i::get_all_constraints (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -315,7 +315,7 @@ TAO_Notify_Filter_i::get_all_constraints (CORBA::Environment &ACE_TRY_ENV) } void -TAO_Notify_Filter_i::remove_all_constraints (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_Filter_i::remove_all_constraints (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -336,12 +336,12 @@ TAO_Notify_Filter_i::remove_all_constraints (CORBA::Environment &/*ACE_TRY_ENV*/ } void -TAO_Notify_Filter_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Filter_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->remove_all_constraints (ACE_TRY_ENV); + this->remove_all_constraints (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var my_POA = _default_POA (); @@ -353,8 +353,8 @@ TAO_Notify_Filter_i::destroy (CORBA::Environment &ACE_TRY_ENV) } CORBA::Boolean -TAO_Notify_Filter_i::match (const CORBA::Any & /*filterable_data */, - CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Filter_i::match (const CORBA::Any & /*filterable_data */ + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData @@ -364,8 +364,9 @@ TAO_Notify_Filter_i::match (const CORBA::Any & /*filterable_data */, } CORBA::Boolean -TAO_Notify_Filter_i::match_structured (const CosNotification::StructuredEvent & filterable_data, CORBA::Environment & //ACE_TRY_ENV - ) +TAO_Notify_Filter_i::match_structured + (const CosNotification::StructuredEvent & filterable_data + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData @@ -390,7 +391,9 @@ TAO_Notify_Filter_i::match_structured (const CosNotification::StructuredEvent & } CORBA::Boolean -TAO_Notify_Filter_i::match_typed (const CosNotification::PropertySeq & /*filterable_data */,CORBA::Environment & ACE_TRY_ENV) +TAO_Notify_Filter_i::match_typed + (const CosNotification::PropertySeq & /*filterable_data */ + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData @@ -400,8 +403,9 @@ TAO_Notify_Filter_i::match_typed (const CosNotification::PropertySeq & /*filtera } CosNotifyFilter::CallbackID -TAO_Notify_Filter_i::attach_callback (CosNotifyComm::NotifySubscribe_ptr /*callback */, CORBA::Environment & ACE_TRY_ENV - ) +TAO_Notify_Filter_i::attach_callback + (CosNotifyComm::NotifySubscribe_ptr /*callback */ + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -410,8 +414,8 @@ TAO_Notify_Filter_i::attach_callback (CosNotifyComm::NotifySubscribe_ptr /*callb } void -TAO_Notify_Filter_i::detach_callback (CosNotifyFilter::CallbackID /*callback*/, - CORBA::Environment & ACE_TRY_ENV) +TAO_Notify_Filter_i::detach_callback (CosNotifyFilter::CallbackID /*callback*/ + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::CallbackNotFound @@ -421,7 +425,7 @@ TAO_Notify_Filter_i::detach_callback (CosNotifyFilter::CallbackID /*callback*/, } CosNotifyFilter::CallbackIDSeq* -TAO_Notify_Filter_i::get_callbacks (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Filter_i::get_callbacks (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h index 5656ccf8617..4a6fe16808c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h @@ -53,19 +53,19 @@ public: virtual ~TAO_Notify_Filter_i (void); CosNotifyFilter::Filter_ptr - get_ref (CORBA::Environment &ACE_TRY_ENV); + get_ref (TAO_ENV_SINGLE_ARG_DECL); // Activate with the default POA virtual char * constraint_grammar ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints ( - const CosNotifyFilter::ConstraintExpSeq & constraint_list, - CORBA::Environment &ACE_TRY_ENV + const CosNotifyFilter::ConstraintExpSeq & constraint_list + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -74,8 +74,8 @@ virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints ( virtual void modify_constraints ( const CosNotifyFilter::ConstraintIDSeq & del_list, - const CosNotifyFilter::ConstraintInfoSeq & modify_list, - CORBA::Environment &ACE_TRY_ENV + const CosNotifyFilter::ConstraintInfoSeq & modify_list + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -84,8 +84,8 @@ virtual void modify_constraints ( )); virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints ( - const CosNotifyFilter::ConstraintIDSeq & id_list, - CORBA::Environment &ACE_TRY_ENV + const CosNotifyFilter::ConstraintIDSeq & id_list + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -93,29 +93,29 @@ virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints ( )); virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_constraints ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Boolean match ( - const CORBA::Any & filterable_data, - CORBA::Environment &ACE_TRY_ENV + const CORBA::Any & filterable_data + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -123,8 +123,8 @@ virtual CORBA::Boolean match ( )); virtual CORBA::Boolean match_structured ( - const CosNotification::StructuredEvent & filterable_data, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::StructuredEvent & filterable_data + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -132,8 +132,8 @@ virtual CORBA::Boolean match_structured ( )); virtual CORBA::Boolean match_typed ( - const CosNotification::PropertySeq & filterable_data, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::PropertySeq & filterable_data + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -141,16 +141,16 @@ virtual CORBA::Boolean match_typed ( )); virtual CosNotifyFilter::CallbackID attach_callback ( - CosNotifyComm::NotifySubscribe_ptr callback, - CORBA::Environment &ACE_TRY_ENV + CosNotifyComm::NotifySubscribe_ptr callback + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void detach_callback ( - CosNotifyFilter::CallbackID callback, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::CallbackID callback + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -158,7 +158,7 @@ virtual void detach_callback ( )); virtual CosNotifyFilter::CallbackIDSeq * get_callbacks ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -167,8 +167,8 @@ virtual CosNotifyFilter::CallbackIDSeq * get_callbacks ( private: void add_constraints_i ( - const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq, - CORBA::Environment &ACE_TRY_ENV + const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp index 988ce522565..3e917878450 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp @@ -51,7 +51,7 @@ TAO_Notify_ID_Pool_Ex<ID_TYPE, ID_TYPE_SEQ>::~TAO_Notify_ID_Pool_Ex () } template <class ID_TYPE, class ID_TYPE_SEQ> ID_TYPE_SEQ* -TAO_Notify_ID_Pool_Ex<ID_TYPE, ID_TYPE_SEQ>::get_sequence (CORBA::Environment & ACE_TRY_ENV) +TAO_Notify_ID_Pool_Ex<ID_TYPE, ID_TYPE_SEQ>::get_sequence (TAO_ENV_SINGLE_ARG_DECL) { // Figure out the length of the list. size_t len = this->active_list_.size (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h index 658ed8045fc..33471fc7b10 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h @@ -78,7 +78,7 @@ class TAO_Notify_ID_Pool_Ex : public TAO_Notify_ID_Pool <ID_TYPE> TAO_Notify_ID_Pool_Ex (void); ~TAO_Notify_ID_Pool_Ex (); - ID_TYPE_SEQ* get_sequence (CORBA::Environment &ACE_TRY_ENV); + ID_TYPE_SEQ* get_sequence (TAO_ENV_SINGLE_ARG_DECL); // Get a list of all ids in use. // Essentially converts the <active_list_> to a Sequence. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp index e05ab096455..1e75f974275 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp @@ -26,15 +26,15 @@ TAO_Notify_Listener_Filter_Eval_Command::~TAO_Notify_Listener_Filter_Eval_Comman } int -TAO_Notify_Listener_Filter_Eval_Command::execute (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Listener_Filter_Eval_Command::execute (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Boolean result = - this->event_listener_->evaluate_filter (*this->event_, this->eval_parent_, ACE_TRY_ENV); + this->event_listener_->evaluate_filter (*this->event_, this->eval_parent_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result == 1) { - this->event_processor_->dispatch_event (this->event_, this->event_listener_, ACE_TRY_ENV); + this->event_processor_->dispatch_event (this->event_, this->event_listener_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h index 394339bac7c..daaf4567e9b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h @@ -45,7 +45,7 @@ class TAO_Notify_Export TAO_Notify_Listener_Filter_Eval_Command : public TAO_Not ~TAO_Notify_Listener_Filter_Eval_Command(); - virtual int execute (CORBA::Environment& ACE_TRY_ENV); + virtual int execute (TAO_ENV_SINGLE_ARG_DECL); // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h index 2424c8db0af..bb15333aaff 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h @@ -70,19 +70,19 @@ class TAO_Notify_Export TAO_Notify_EventListener : virtual public TAO_Notify_Re // public: - virtual void dispatch_event (TAO_Notify_Event &event, - CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void dispatch_event (TAO_Notify_Event &event + TAO_ENV_ARG_DECL) = 0; // Callback methods to supply the event to the listener. virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, - CORBA::Boolean eval_parent, - CORBA::Environment &ACE_TRY_ENV) = 0; + CORBA::Boolean eval_parent + TAO_ENV_ARG_DECL) = 0; // Evaluates true if this event is acceptable by the listener. // The <eval_parent> is a hint to the listener to help it determine // if its wise to evaluate the parents filter too. This helps in // implementing the "interfilter group operator" logic. - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0; // Ask the listener to relinquish any bindings and prepare to be // disposed. @@ -106,8 +106,8 @@ class TAO_Notify_Export TAO_Notify_EventSource : virtual public TAO_Notify_RefCo public: // TODO: add a shutdown method to this interface!! - virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, - CORBA::Environment &ACE_TRY_ENV) = 0; + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event + TAO_ENV_ARG_DECL) = 0; // Evaluates true if this event is acceptable by the Source. virtual TAO_Notify_Worker_Task* filter_eval_task (void) = 0; @@ -129,8 +129,8 @@ class TAO_Notify_Export TAO_Notify_UpdateListener : virtual public TAO_Notify_Re public: virtual void dispatch_update (TAO_Notify_EventType_List& added, - TAO_Notify_EventType_List& removed, - CORBA::Environment &ACE_TRY_ENV) = 0; + TAO_Notify_EventType_List& removed + TAO_ENV_ARG_DECL) = 0; // Callback method to supply updates. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp index 275be23fff7..b2f1b14b23d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp @@ -23,7 +23,7 @@ TAO_Notify_Lookup_Command::~TAO_Notify_Lookup_Command () } int -TAO_Notify_Lookup_Command::execute (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Lookup_Command::execute (TAO_ENV_SINGLE_ARG_DECL) { // If the event is *not* the special event // send it to the list that matches it. @@ -42,7 +42,7 @@ TAO_Notify_Lookup_Command::execute (CORBA::Environment& ACE_TRY_ENV) if (event_map_->find (this->event_->event_type (), listener_list) == 0) { - listener_list->for_each (this, ACE_TRY_ENV); + listener_list->for_each (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } } @@ -50,7 +50,7 @@ TAO_Notify_Lookup_Command::execute (CORBA::Environment& ACE_TRY_ENV) // if (this->default_subscription_list_->is_empty () == 0) // @@ can't do this test - is_empty is not impl. { - event_map_->default_subscription_list ()->for_each (this, ACE_TRY_ENV); + event_map_->default_subscription_list ()->for_each (this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -58,9 +58,9 @@ TAO_Notify_Lookup_Command::execute (CORBA::Environment& ACE_TRY_ENV) } void -TAO_Notify_Lookup_Command::work (TAO_Notify_EventListener* event_listener, - CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Lookup_Command::work (TAO_Notify_EventListener* event_listener + TAO_ENV_ARG_DECL) { - this->event_processor_->evaluate_listener_filter (this->event_, event_listener, 1, ACE_TRY_ENV); + this->event_processor_->evaluate_listener_filter (this->event_, event_listener, 1 TAO_ENV_ARG_PARAMETER); // Note the last parameter, we want the parent filter to be evaluated. } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h index 6c01563fda3..07a769906e5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h @@ -46,11 +46,11 @@ class TAO_Notify_Export TAO_Notify_Lookup_Command : public TAO_Notify_Command, p ~TAO_Notify_Lookup_Command (); - virtual int execute (CORBA::Environment&); + virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Command callback // = TAO_ESF_Worker method - void work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV); + void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL); protected: // = Data member TAO_Notify_Event_Map* event_map_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp index 8598e656c6f..4307663f309 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp @@ -49,7 +49,7 @@ TAO_Notify_MT_Worker_Task::init_task (TAO_Notify_AdminProperties* const admin_pr } void -TAO_Notify_MT_Worker_Task::shutdown (CORBA::Environment& /*ACE_TRY_ENV*/) +TAO_Notify_MT_Worker_Task::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) { // Put a shutdown message in the task queue and wait here till all // threads exit. @@ -64,8 +64,8 @@ TAO_Notify_MT_Worker_Task::close (u_long) TAO_Notify_Shutdown_Command * mb = new TAO_Notify_Shutdown_Command (); - ACE_DECLARE_NEW_CORBA_ENV; - this->process_event (mb, ACE_TRY_ENV); + TAO_ENV_DECLARE_NEW_ENV; + this->process_event (mb TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // We can not wait for ourselves to quit @@ -83,10 +83,10 @@ TAO_Notify_MT_Worker_Task::close (u_long) } int -TAO_Notify_MT_Worker_Task::process_event (TAO_Notify_Command *mb, CORBA::Environment& ACE_TRY_ENV, ACE_Time_Value *tv) +TAO_Notify_MT_Worker_Task::process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv) { // Execute the buffering strategy. - this->buffering_strategy_->execute (this->msg_queue (), mb, ACE_TRY_ENV, tv); + this->buffering_strategy_->execute (this->msg_queue (), mb TAO_ENV_ARG_PARAMETER, tv); ACE_CHECK_RETURN (-1); return 0; @@ -122,7 +122,7 @@ TAO_Notify_MT_Worker_Task::svc (void) continue; } - int result = command->execute (ACE_TRY_ENV); + int result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Message_Block::release (mb); @@ -148,7 +148,7 @@ TAO_Notify_Shutdown_Command::TAO_Notify_Shutdown_Command (void) } int -TAO_Notify_Shutdown_Command::execute (CORBA::Environment& /*ACE_TRY_ENV*/) +TAO_Notify_Shutdown_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) { return -1; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h index b7927d5acd0..1c5e790e59f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h @@ -56,10 +56,10 @@ public: virtual int init_task (TAO_Notify_AdminProperties* const admin_properties); // Init the task - virtual void shutdown (CORBA::Environment& ACE_TRY_ENV); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); // shutdown this task. - virtual int process_event (TAO_Notify_Command *mb, CORBA::Environment& ACE_TRY_ENV, ACE_Time_Value *tv = 0); + virtual int process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv = 0); // Process the command. protected: @@ -97,7 +97,7 @@ class TAO_Notify_Export TAO_Notify_Shutdown_Command : public TAO_Notify_Command TAO_Notify_Shutdown_Command (void); - virtual int execute (CORBA::Environment& ACE_TRY_ENV); + virtual int execute (TAO_ENV_SINGLE_ARG_DECL); // Returns -1. This signals worker threads to finish servicing requests. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h index f74a05bd8a0..6160260a456 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h @@ -42,41 +42,41 @@ class TAO_Notify_Export TAO_Notify_POA_Factory : public ACE_Service_Object // public: // = POA creation methods. - virtual PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV) = 0; + virtual PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL) = 0; // Create the POA to activate Event Channels in. - virtual PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) = 0; + virtual PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0; // Create the POA to activate SA's in. - virtual PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) = 0; + virtual PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0; // Create the POA to activate CA's in. - virtual PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) = 0; + virtual PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0; // Create the POA to activate proxy push consumers in. - virtual PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) = 0; + virtual PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0; // Create the POA to activate proxy push suppliers in. // = Object activation and POA methods - virtual CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) = 0; + virtual CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL) = 0; // Converts <id> to an ObjectId and registers with the POA <poa>. - virtual CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) = 0; + virtual CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL) = 0; // Registers with the POA <poa>. - virtual CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) = 0; + virtual CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL) = 0; // Registers with the POA <poa>. - virtual CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) = 0; + virtual CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0; // Look for the Object with id <id> in <poa>. - virtual void destroy_POA (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0; // Destroy the <poa> - virtual void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0; // Deactivate the object. - virtual void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr, CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr TAO_ENV_ARG_DECL) = 0; // Deactivate the object. }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp index 8e392fa0c53..9a6297559b5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp @@ -23,14 +23,14 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::TAO_Notify_ProxyConsumer (TAO_Notify_Sup } template <class SERVANT_TYPE> void -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) { this->proxy_id_ = proxy_id; TAO_Notify_CO_Factory* cof = TAO_Notify_Factory::get_channel_objects_factory (); - this->lock_ = cof->create_proxy_consumer_lock (ACE_TRY_ENV); + this->lock_ = cof->create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the task to forward filtering commands to: @@ -39,7 +39,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID pro this->event_manager_->resource_factory (); this->filter_eval_task_ = - event_manager_objects_factory->create_source_eval_task (ACE_TRY_ENV); + event_manager_objects_factory->create_source_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -56,8 +56,8 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer (void) { ACE_DECLARE_NEW_CORBA_ENV; - this->event_manager_->unregister_from_subscription_updates (this, - ACE_TRY_ENV); + this->event_manager_->unregister_from_subscription_updates (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; delete this->lock_; @@ -66,7 +66,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer (void) supplier_admin_->_remove_ref (); // @@: Move this to on_disconnected - this->filter_eval_task_->shutdown (ACE_TRY_ENV); + this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_Notify_EMO_Factory* event_manager_objects_factory = @@ -76,27 +76,27 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer (void) } template <class SERVANT_TYPE> CORBA::Boolean -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event TAO_ENV_ARG_DECL) { // check if it passes the parent filter. CORBA::Boolean bval = - this->supplier_admin_->get_filter_admin ().match (event, - ACE_TRY_ENV); + this->supplier_admin_->get_filter_admin ().match (event + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean ret_val; - ret_val = this->supplier_admin_->MyOperator (ACE_TRY_ENV); + ret_val = this->supplier_admin_->MyOperator (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (ret_val == CosNotifyChannelAdmin::AND_OP) { - ret_val = bval && this->filter_admin_.match (event, ACE_TRY_ENV); + ret_val = bval && this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } else { - ret_val = bval || this->filter_admin_.match (event, ACE_TRY_ENV); + ret_val = bval || this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -110,7 +110,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::filter_eval_task (void) } template <class SERVANT_TYPE> void -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL) { // Get hold of the admin properties. TAO_Notify_AdminProperties* const admin_properties = @@ -123,14 +123,14 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TR supplier_count->value () >= admin_properties->max_suppliers ()) ACE_THROW (CORBA::IMP_LIMIT ()); // we've reached the limit of suppliers connected. - this->event_manager_->register_for_subscription_updates (this, ACE_TRY_ENV); + this->event_manager_->register_for_subscription_updates (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; (*supplier_count)++; } template <class SERVANT_TYPE> void -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_disconnected (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) { // Get hold of the admin properties. TAO_Notify_AdminProperties* const admin_properties = @@ -140,17 +140,17 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_disconnected (CORBA::Environment &/*A } template <class SERVANT_TYPE> void -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType )) { - this->event_manager_->update_publication_list (added, removed, ACE_TRY_ENV); + this->event_manager_->update_publication_list (added, removed TAO_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> CosNotification::EventTypeSeq* -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -168,27 +168,27 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChan { // if updates are currently off, switch them on. if (this->updates_on_ == 0) - this->event_manager_->register_for_subscription_updates (this, - ACE_TRY_ENV); + this->event_manager_->register_for_subscription_updates (this + TAO_ENV_ARG_PARAMETER); } else { // if updates are currently on, switch them off. if (this->updates_on_ == 1) - this->event_manager_->unregister_from_subscription_updates (this, - ACE_TRY_ENV); + this->event_manager_->unregister_from_subscription_updates (this + TAO_ENV_ARG_PARAMETER); } return event_type_seq; } template <class SERVANT_TYPE> CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::MyAdmin (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::MyAdmin (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->supplier_admin_->get_ref (ACE_TRY_ENV); + return this->supplier_admin_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); } #endif /* TAO_NOTIFY_PROXYCONSUMER_T_C */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h index 6cdafeaf614..fec0b60e2f2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h @@ -52,24 +52,24 @@ public: virtual ~TAO_Notify_ProxyConsumer (void); // Destructor - void init (CosNotifyChannelAdmin::ProxyID myID, CORBA::Environment &ACE_TRY_ENV); + void init (CosNotifyChannelAdmin::ProxyID myID TAO_ENV_ARG_DECL); // Init the Proxy. // = TAO_Notify_EventSource methods. - virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV); + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event TAO_ENV_ARG_DECL); // Evaluates true if this event is acceptable by the Source. TAO_Notify_Worker_Task* filter_eval_task (void); // The Worker task associated with the event listener for filter evaluation. - virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (CORBA::Environment &ACE_TRY_ENV) + virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotification::EventTypeSeq * obtain_subscription_types ( - CosNotifyChannelAdmin::ObtainInfoMode mode, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::ObtainInfoMode mode + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -77,8 +77,8 @@ public: virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -87,10 +87,10 @@ virtual void offer_change ( protected: // = Helper methods - void on_connected (CORBA::Environment &ACE_TRY_ENV); + void on_connected (TAO_ENV_SINGLE_ARG_DECL); // Derived classes should call this when their suppliers connect. - void on_disconnected (CORBA::Environment &ACE_TRY_ENV); + void on_disconnected (TAO_ENV_SINGLE_ARG_DECL); // Derived classes should call this when their suppliers disconnect. // = Data members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp index f8a77362d7c..009798f4939 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp @@ -21,7 +21,7 @@ TAO_Notify_ProxyPushConsumer_i::~TAO_Notify_ProxyPushConsumer_i (void) } void -TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected @@ -39,7 +39,7 @@ TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSup CosEventComm::PushSupplier::_duplicate (push_supplier); this->notify_push_supplier_ = - CosNotifyComm::PushSupplier::_narrow (push_supplier, ACE_TRY_ENV); + CosNotifyComm::PushSupplier::_narrow (push_supplier TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (this->notify_push_supplier_.in ())) @@ -60,7 +60,7 @@ TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSup CORBA::INTERNAL ()); ACE_TRY_CHECK; - this->on_connected (ACE_TRY_ENV); + this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -80,7 +80,7 @@ TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSup } void -TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) { { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, @@ -93,8 +93,8 @@ TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq ACE_TRY { - this->notify_push_supplier_->subscription_change (added, removed, - ACE_TRY_ENV); + this->notify_push_supplier_->subscription_change (added, removed + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -105,7 +105,7 @@ TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq } void -TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -125,7 +125,7 @@ TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data, CORBA::Environmen TAO_Notify_Any* notify_event = new TAO_Notify_Any(data_copy); - this->event_manager_->process_event (notify_event, this, ACE_TRY_ENV); + this->event_manager_->process_event (notify_event, this TAO_ENV_ARG_PARAMETER); ACE_CHECK; notify_event->_decr_refcnt (); @@ -133,7 +133,7 @@ TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data, CORBA::Environmen void TAO_Notify_ProxyPushConsumer_i::disconnect_push_consumer ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -141,10 +141,10 @@ TAO_Notify_ProxyPushConsumer_i::disconnect_push_consumer ( { // ask our parent to deactivate us. this->supplier_admin_-> - deactivate_proxy_pushconsumer (this, ACE_TRY_ENV); + deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->on_disconnected (ACE_TRY_ENV); + this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); } // = TAO_Notify_CosEC_ProxyPushConsumer_i @@ -161,32 +161,32 @@ TAO_Notify_CosEC_ProxyPushConsumer_i::~TAO_Notify_CosEC_ProxyPushConsumer_i (voi } void -TAO_Notify_CosEC_ProxyPushConsumer_i::init (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_CosEC_ProxyPushConsumer_i::init (TAO_ENV_SINGLE_ARG_DECL) { // Pass the default id. - this->notify_proxy_.init (0, ACE_TRY_ENV); + this->notify_proxy_.init (0 TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->notify_proxy_.push (data, ACE_TRY_ENV); + this->notify_proxy_.push (data TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->notify_proxy_.disconnect_push_consumer (ACE_TRY_ENV); + this->notify_proxy_.disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushConsumer_i::connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_CosEC_ProxyPushConsumer_i::connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)) { - this->notify_proxy_.connect_any_push_supplier (push_supplier, ACE_TRY_ENV); + this->notify_proxy_.connect_any_push_supplier (push_supplier TAO_ENV_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h index dda47b67941..81c2a6a3d64 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h @@ -55,15 +55,15 @@ public: // Destructor // = Interface methods - void push (const CORBA::Any & data, CORBA::Environment &ACE_TRY_ENV) + void push (const CORBA::Any & data TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected )); virtual void connect_any_push_supplier ( - CosEventComm::PushSupplier_ptr push_supplier, - CORBA::Environment &ACE_TRY_ENV + CosEventComm::PushSupplier_ptr push_supplier + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -71,7 +71,7 @@ public: )); virtual void disconnect_push_consumer ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -79,7 +79,7 @@ virtual void disconnect_push_consumer ( protected: // = Helper methods - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); // = Data members CORBA::Boolean notify_style_supplier_; @@ -113,20 +113,20 @@ public: virtual ~TAO_Notify_CosEC_ProxyPushConsumer_i (void); // Destructor. - void init (CORBA::Environment &ACE_TRY_ENV); + void init (TAO_ENV_SINGLE_ARG_DECL); // init. - virtual void push (const CORBA::Any &data, - CORBA::Environment &ACE_TRY_ENV) + virtual void push (const CORBA::Any &data + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Suppliers call this method to pass data to connected consumers. - virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnects the supplier from the event communication. - virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier, - CORBA::Environment &ACE_TRY_ENV) + virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); // Connects a push supplier. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp index 77dc6a501a0..7c45f284d4c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp @@ -20,24 +20,24 @@ TAO_Notify_ProxyPushSupplier_i::~TAO_Notify_ProxyPushSupplier_i (void) } void -TAO_Notify_ProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL) { ACE_TRY { - event.do_push (this->cosec_push_consumer_.in (), ACE_TRY_ENV); + event.do_push (this->cosec_push_consumer_.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL { ACE_DEBUG ((LM_DEBUG, "Exception dispatching any event\n")); // misbehaving client, - this->shutdown (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check + this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } ACE_ENDTRY; } void -TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) { { ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); @@ -47,7 +47,7 @@ TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq ACE_TRY { - this->notify_push_consumer_->offer_change (added, removed, ACE_TRY_ENV); + this->notify_push_consumer_->offer_change (added, removed TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -58,7 +58,7 @@ TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq } void -TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, @@ -79,7 +79,7 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon CosEventComm::PushConsumer::_duplicate (push_consumer); this->notify_push_consumer_ = - CosNotifyComm::PushConsumer::_narrow (push_consumer, ACE_TRY_ENV); + CosNotifyComm::PushConsumer::_narrow (push_consumer TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (this->notify_push_consumer_.in ())) @@ -101,7 +101,7 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon CORBA::INTERNAL ()); ACE_CHECK; - this->on_connected (ACE_TRY_ENV); + this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -117,31 +117,31 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon } void -TAO_Notify_ProxyPushSupplier_i::shutdown_i (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxyPushSupplier_i::shutdown_i (TAO_ENV_SINGLE_ARG_DECL) { - this->on_disconnected (ACE_TRY_ENV); + this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ask our parent to deactivate us. this->consumer_admin_-> - deactivate_proxy_pushsupplier (this, ACE_TRY_ENV); + deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // unregister with CA - this->consumer_admin_->unregister_listener (this, ACE_TRY_ENV); + this->consumer_admin_->unregister_listener (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->shutdown_i (ACE_TRY_ENV); + this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_ProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) { // Tell the consumer that we're going away ... // @@ Later, lookup a "notify_on_disconnect" option. @@ -153,12 +153,12 @@ TAO_Notify_ProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_ENV) return; } - this->shutdown_i (ACE_TRY_ENV); + this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TRY { - this->cosec_push_consumer_->disconnect_push_consumer (ACE_TRY_ENV); + this->cosec_push_consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -181,25 +181,25 @@ TAO_Notify_CosEC_ProxyPushSupplier_i::~TAO_Notify_CosEC_ProxyPushSupplier_i (voi } void -TAO_Notify_CosEC_ProxyPushSupplier_i::init (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_CosEC_ProxyPushSupplier_i::init (TAO_ENV_SINGLE_ARG_DECL) { - this->notify_proxy_.init (0, ACE_TRY_ENV); + this->notify_proxy_.init (0 TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->notify_proxy_.disconnect_push_supplier (ACE_TRY_ENV); + this->notify_proxy_.disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushSupplier_i::connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_CosEC_ProxyPushSupplier_i::connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)) { - this->notify_proxy_.connect_any_push_consumer (push_consumer, ACE_TRY_ENV); + this->notify_proxy_.connect_any_push_consumer (push_consumer TAO_ENV_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h index c3c6252d93c..97f2fdde840 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h @@ -54,8 +54,8 @@ public: // = Interface methods virtual void connect_any_push_consumer ( - CosEventComm::PushConsumer_ptr push_consumer, - CORBA::Environment &ACE_TRY_ENV + CosEventComm::PushConsumer_ptr push_consumer + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -64,23 +64,23 @@ public: )); virtual void disconnect_push_supplier ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); // Shutdown. protected: - void shutdown_i (CORBA::Environment &ACE_TRY_ENV); + void shutdown_i (TAO_ENV_SINGLE_ARG_DECL); // Shutdown - virtual void dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV); + virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL); // Deliver the event to the consumer. - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); // Deliver the update to the consumer. // = Data Members. @@ -114,14 +114,14 @@ public: ~TAO_Notify_CosEC_ProxyPushSupplier_i (void); // Destructor. - void init (CORBA::Environment &ACE_TRY_ENV); + void init (TAO_ENV_SINGLE_ARG_DECL); // Init. - virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Ends the event communication and disposes this object. - virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer, CORBA::Environment &ACE_TRY_ENV) + virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp index 2fd49c7ce7b..6b0651d1f63 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp @@ -25,9 +25,9 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::TAO_Notify_ProxySupplier (TAO_Notify_Con } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) { - consumer_admin_->_add_ref (ACE_TRY_ENV); + consumer_admin_->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_id_ = proxy_id; @@ -35,7 +35,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID pro TAO_Notify_CO_Factory* cof = TAO_Notify_Factory::get_channel_objects_factory (); - this->lock_ = cof->create_proxy_supplier_lock (ACE_TRY_ENV); + this->lock_ = cof->create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_Notify_EMO_Factory* event_manager_objects_factory = @@ -43,11 +43,11 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID pro // Create the task to forward filtering/dispatching commands to: this->dispatching_task_ = - event_manager_objects_factory->create_dispatching_task (ACE_TRY_ENV); + event_manager_objects_factory->create_dispatching_task (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->filter_eval_task_ = - event_manager_objects_factory->create_listener_eval_task (ACE_TRY_ENV); + event_manager_objects_factory->create_listener_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -64,8 +64,8 @@ template <class SERVANT_TYPE> TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void) { ACE_DECLARE_NEW_CORBA_ENV; - this->event_manager_->unregister_from_publication_updates (this, - ACE_TRY_ENV); + this->event_manager_->unregister_from_publication_updates (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // unsubscribe it to our current subscriptions. @@ -76,13 +76,13 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void) added.length (0); this->event_manager_->subscribe_for_events (this, - added, removed, ACE_TRY_ENV); + added, removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; delete this->lock_; this->consumer_admin_->proxy_pushsupplier_destroyed (this->proxy_id_); - consumer_admin_->_remove_ref (ACE_TRY_ENV); + consumer_admin_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_Notify_EMO_Factory* event_manager_objects_factory = @@ -93,23 +93,23 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void) } template <class SERVANT_TYPE> CORBA::Boolean -TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL) { if (eval_parent == 1) { CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator = - consumer_admin_->MyOperator (ACE_TRY_ENV); + consumer_admin_->MyOperator (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Inter-filter group operator. CORBA::Boolean bval = - this->consumer_admin_->get_filter_admin ().match (event, ACE_TRY_ENV); + this->consumer_admin_->get_filter_admin ().match (event TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ((bval == 1 && filter_operator == CosNotifyChannelAdmin::AND_OP) || (bval == 0 && filter_operator == CosNotifyChannelAdmin::OR_OP)) { - bval = this->filter_admin_.match (event, ACE_TRY_ENV); + bval = this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return bval; } @@ -119,11 +119,11 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event return 0; } else - return this->filter_admin_.match (event, ACE_TRY_ENV); + return this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL) { if (this->is_connected_ == 0) { @@ -141,7 +141,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event, this->event_list_.enqueue_tail (event.clone ()); } else - this->dispatch_event_i (event, ACE_TRY_ENV); + this->dispatch_event_i (event TAO_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> TAO_Notify_Worker_Task* @@ -157,7 +157,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::filter_eval_task (void) } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -166,7 +166,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotificati if (this->is_connected_ == 1) { this->event_manager_->subscribe_for_events (this, - added, removed, ACE_TRY_ENV); + added, removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -182,7 +182,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotificati } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL) { // Get hold of the admin properties. TAO_Notify_AdminProperties* const admin_properties = @@ -196,7 +196,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TR ACE_THROW (CORBA::IMP_LIMIT ()); // we've reached the limit of consumers connected. // register with CA - this->consumer_admin_->register_listener (this, ACE_TRY_ENV); + this->consumer_admin_->register_listener (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; CosNotification::EventTypeSeq added; @@ -210,17 +210,17 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TR this->subscription_list_.populate (added); this->event_manager_->subscribe_for_events (this, - added, removed, ACE_TRY_ENV); + added, removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->event_manager_->register_for_publication_updates (this, ACE_TRY_ENV); + this->event_manager_->register_for_publication_updates (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; (*consumer_count)++; } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL) { { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, @@ -244,18 +244,18 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (CORBA::Environment &ACE this->subscription_list_.populate (removed); this->event_manager_->subscribe_for_events (this, - added, removed, ACE_TRY_ENV); + added, removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->event_manager_->unregister_from_publication_updates (this, ACE_TRY_ENV); + this->event_manager_->unregister_from_publication_updates (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; // shutdown the tasks. - this->dispatching_task_->shutdown (ACE_TRY_ENV); + this->dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->filter_eval_task_->shutdown (ACE_TRY_ENV); + this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -266,7 +266,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (CORBA::Environment &ACE } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ConnectionAlreadyInactive, @@ -277,7 +277,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (CORBA::Environment & } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ConnectionAlreadyActive, @@ -295,7 +295,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (CORBA::Environment &A while (this->event_list_.dequeue_head (event) == 0) { - this->dispatch_event_i (*event, ACE_TRY_ENV); + this->dispatch_event_i (*event TAO_ENV_ARG_PARAMETER); ACE_CHECK; delete event; @@ -304,16 +304,16 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (CORBA::Environment &A } template <class SERVANT_TYPE> CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_ProxySupplier<SERVANT_TYPE>::MyAdmin (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::MyAdmin (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->consumer_admin_->get_ref (ACE_TRY_ENV); + return this->consumer_admin_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); } template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -323,7 +323,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CORBA::Environment &ACE } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -332,7 +332,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::Mappin } template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -342,7 +342,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CORBA::Environment &ACE } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -351,7 +351,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::Mappin } template <class SERVANT_TYPE> CosNotification::EventTypeSeq* -TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -369,15 +369,15 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAd { // if updates are currently off, switch them on. if (this->updates_on_ == 0) - this->event_manager_->register_for_publication_updates (this, - ACE_TRY_ENV); + this->event_manager_->register_for_publication_updates (this + TAO_ENV_ARG_PARAMETER); } else { // if updates are currently on, switch them off. if (this->updates_on_ == 1) - this->event_manager_->unregister_from_publication_updates (this, - ACE_TRY_ENV); + this->event_manager_->unregister_from_publication_updates (this + TAO_ENV_ARG_PARAMETER); } return event_type_seq; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h index a44601f32d6..63c79c3fe72 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h @@ -47,13 +47,13 @@ public: virtual ~TAO_Notify_ProxySupplier (void); // Destructor - void init (CosNotifyChannelAdmin::ProxyID myID, CORBA::Environment &ACE_TRY_ENV); + void init (CosNotifyChannelAdmin::ProxyID myID TAO_ENV_ARG_DECL); // Init the Proxy. // = Notify_Event_Listener methods - virtual void dispatch_event (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV); + virtual void dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL); - virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV); + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL); virtual TAO_Notify_Worker_Task* event_dispatch_task (void); // The Worker task associated with the event listener for event dispatching @@ -63,14 +63,14 @@ public: // = Interface methods virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr MyAdmin ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void suspend_connection ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -79,7 +79,7 @@ public: )); virtual void resume_connection ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -88,38 +88,38 @@ public: )); virtual CosNotifyFilter::MappingFilter_ptr priority_filter ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void priority_filter ( - CosNotifyFilter::MappingFilter_ptr priority_filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::MappingFilter_ptr priority_filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void lifetime_filter ( - CosNotifyFilter::MappingFilter_ptr lifetime_filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::MappingFilter_ptr lifetime_filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotification::EventTypeSeq * obtain_offered_types ( - CosNotifyChannelAdmin::ObtainInfoMode mode, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::ObtainInfoMode mode + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -127,8 +127,8 @@ public: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -137,13 +137,13 @@ public: protected: // = Helper methods - virtual void dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL) = 0; // Derived classes should implement this. - void on_connected (CORBA::Environment &ACE_TRY_ENV); + void on_connected (TAO_ENV_SINGLE_ARG_DECL); // Derived classes should call this when their consumers connect. - void on_disconnected (CORBA::Environment &ACE_TRY_ENV); + void on_disconnected (TAO_ENV_SINGLE_ARG_DECL); // Derived classes should call this when their consumers disconnect. // = Data members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp index a5fdf0e9b87..8baaa806b5b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp @@ -50,19 +50,19 @@ TAO_Notify_Proxy<SERVANT_TYPE>::_decr_refcnt (void) } template <class SERVANT_TYPE> void -TAO_Notify_Proxy<SERVANT_TYPE>::_add_ref (CORBA_Environment &/*ACE_TRY_ENV*/) +TAO_Notify_Proxy<SERVANT_TYPE>::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) { this->_incr_refcnt (); } template <class SERVANT_TYPE> void -TAO_Notify_Proxy<SERVANT_TYPE>::_remove_ref (CORBA_Environment &/*ACE_TRY_ENV*/) +TAO_Notify_Proxy<SERVANT_TYPE>::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) { this->_decr_refcnt (); } template <class SERVANT_TYPE> void -TAO_Notify_Proxy<SERVANT_TYPE>::dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Proxy<SERVANT_TYPE>::dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list TAO_ENV_ARG_DECL) { CosNotification::EventTypeSeq added (added_list.size ()); CosNotification::EventTypeSeq removed (removed_list.size ()); @@ -70,11 +70,11 @@ TAO_Notify_Proxy<SERVANT_TYPE>::dispatch_update (TAO_Notify_EventType_List& adde added_list.populate (added); removed_list.populate (removed); - this->dispatch_update_i (added, removed, ACE_TRY_ENV); + this->dispatch_update_i (added, removed TAO_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> CosNotifyChannelAdmin::ProxyType -TAO_Notify_Proxy<SERVANT_TYPE>::MyType (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_Proxy<SERVANT_TYPE>::MyType (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -83,7 +83,7 @@ TAO_Notify_Proxy<SERVANT_TYPE>::MyType (CORBA::Environment &/*ACE_TRY_ENV*/) } template <class SERVANT_TYPE> void -TAO_Notify_Proxy<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Proxy<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS @@ -93,86 +93,86 @@ TAO_Notify_Proxy<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSPr } template <class SERVANT_TYPE> CosNotification::QoSProperties* -TAO_Notify_Proxy<SERVANT_TYPE>::get_qos (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Proxy<SERVANT_TYPE>::get_qos (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->qos_admin_.get_qos (ACE_TRY_ENV); + return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); } template <class SERVANT_TYPE> void -TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.set_qos (qos, ACE_TRY_ENV); + this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> void TAO_Notify_Proxy<SERVANT_TYPE>::validate_qos ( const CosNotification::QoSProperties & required_qos, - CosNotification::NamedPropertyRangeSeq_out available_qos, - CORBA::Environment &ACE_TRY_ENV + CosNotification::NamedPropertyRangeSeq_out available_qos + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.validate_qos (required_qos, available_qos, ACE_TRY_ENV); + this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> CosNotifyFilter::FilterID -TAO_Notify_Proxy<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Proxy<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.add_filter (new_filter, ACE_TRY_ENV); + return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> void TAO_Notify_Proxy<SERVANT_TYPE>::remove_filter ( - CosNotifyFilter::FilterID filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::FilterID filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - this->filter_admin_.remove_filter (filter, ACE_TRY_ENV); + this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> CosNotifyFilter::Filter_ptr -TAO_Notify_Proxy<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Proxy<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - return this->filter_admin_.get_filter (filter, ACE_TRY_ENV); + return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> CosNotifyFilter::FilterIDSeq* -TAO_Notify_Proxy<SERVANT_TYPE>::get_all_filters (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Proxy<SERVANT_TYPE>::get_all_filters (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.get_all_filters (ACE_TRY_ENV); + return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); } template <class SERVANT_TYPE> void -TAO_Notify_Proxy<SERVANT_TYPE>::remove_all_filters (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_Proxy<SERVANT_TYPE>::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->filter_admin_.remove_all_filters (ACE_TRY_ENV); + this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); } #endif /* TAO_NOTIFY_PROXY_T_C */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h index fe980a752aa..0a968b0eefa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h @@ -68,14 +68,14 @@ public: // Increment and decrement the reference count. // = The Servant methods - virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV); - virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV); + virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); // = Notify_Update_Listener methods - virtual void dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list, CORBA::Environment &ACE_TRY_ENV); + virtual void dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list TAO_ENV_ARG_DECL); virtual CosNotifyChannelAdmin::ProxyType MyType ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -83,8 +83,8 @@ public: virtual void validate_event_qos ( const CosNotification::QoSProperties & required_qos, - CosNotification::NamedPropertyRangeSeq_out available_qos, - CORBA::Environment &ACE_TRY_ENV + CosNotification::NamedPropertyRangeSeq_out available_qos + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -92,15 +92,15 @@ virtual void validate_event_qos ( )); virtual CosNotification::QoSProperties * get_qos ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void set_qos ( - const CosNotification::QoSProperties & qos, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::QoSProperties & qos + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -109,8 +109,8 @@ virtual void set_qos ( virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, - CosNotification::NamedPropertyRangeSeq_out available_qos, - CORBA::Environment &ACE_TRY_ENV + CosNotification::NamedPropertyRangeSeq_out available_qos + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -118,16 +118,16 @@ virtual void validate_qos ( )); virtual CosNotifyFilter::FilterID add_filter ( - CosNotifyFilter::Filter_ptr new_filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::Filter_ptr new_filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_filter ( - CosNotifyFilter::FilterID filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::FilterID filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -135,8 +135,8 @@ virtual void remove_filter ( )); virtual CosNotifyFilter::Filter_ptr get_filter ( - CosNotifyFilter::FilterID filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::FilterID filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -144,21 +144,21 @@ virtual CosNotifyFilter::Filter_ptr get_filter ( )); virtual CosNotifyFilter::FilterIDSeq * get_all_filters ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_filters ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); protected: - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV) = 0; + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) = 0; // Derived types should implement this to deliver the update. // = Data members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp index 01d329da0ba..555f4bee2e7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp @@ -26,7 +26,7 @@ TAO_Notify_QoSAdmin_i::~TAO_Notify_QoSAdmin_i (void) } CosNotification::QoSProperties * TAO_Notify_QoSAdmin_i::get_qos ( - CORBA::Environment & ///ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException @@ -37,8 +37,8 @@ CosNotification::QoSProperties * TAO_Notify_QoSAdmin_i::get_qos ( } void -TAO_Notify_QoSAdmin_i::set_qos (const CosNotification::QoSProperties & qos, - CORBA::Environment & ACE_TRY_ENV +TAO_Notify_QoSAdmin_i::set_qos (const CosNotification::QoSProperties & qos + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -112,8 +112,8 @@ TAO_Notify_QoSAdmin_i::set_qos (const CosNotification::QoSProperties & qos, void TAO_Notify_QoSAdmin_i::validate_qos ( const CosNotification::QoSProperties & /*required_qos*/, - CosNotification::NamedPropertyRangeSeq_out /*available_qos*/, - CORBA::Environment & //ACE_TRY_ENV + CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ + TAO_ENV_ARG_DECL_NOT_USED //TAO_ENV_SINGLE_ARG_PARAMETER ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h index ba4c6b30f2d..fcd0adb9084 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h @@ -44,15 +44,15 @@ public: // Destructor virtual CosNotification::QoSProperties * get_qos ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void set_qos ( - const CosNotification::QoSProperties & qos, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::QoSProperties & qos + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -61,8 +61,8 @@ public: virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, - CosNotification::NamedPropertyRangeSeq_out available_qos, - CORBA::Environment &ACE_TRY_ENV + CosNotification::NamedPropertyRangeSeq_out available_qos + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp index 4d006a94b60..391cd38a631 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp @@ -19,7 +19,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::~TAO_Notify_SequenceProxyPushConsumer_i } void -TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected @@ -50,7 +50,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotif CORBA::INTERNAL ()); ACE_TRY_CHECK; - this->on_connected (ACE_TRY_ENV); + this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -65,12 +65,12 @@ TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotif } void -TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) { ACE_TRY { - this->push_supplier_->subscription_change (added, removed, - ACE_TRY_ENV); + this->push_supplier_->subscription_change (added, removed + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -81,7 +81,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::Even } void -TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotification::EventBatch & notifications, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotification::EventBatch & notifications TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -106,7 +106,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotific TAO_Notify_StructuredEvent* notify_event = new TAO_Notify_StructuredEvent(notification_copy); - this->event_manager_->process_event (notify_event, this, ACE_TRY_ENV); + this->event_manager_->process_event (notify_event, this TAO_ENV_ARG_PARAMETER); ACE_CHECK; notify_event->_decr_refcnt (); @@ -114,17 +114,17 @@ TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotific } void -TAO_Notify_SequenceProxyPushConsumer_i::disconnect_sequence_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequenceProxyPushConsumer_i::disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // ask our parent to deaactivate us. this->supplier_admin_-> - deactivate_proxy_pushconsumer (this, ACE_TRY_ENV); + deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->on_disconnected (ACE_TRY_ENV); + this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h index 0ae006072e4..c89f90c755f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h @@ -51,8 +51,8 @@ public: // = interface methods virtual void connect_sequence_push_supplier ( - CosNotifyComm::SequencePushSupplier_ptr push_supplier, - CORBA::Environment &ACE_TRY_ENV + CosNotifyComm::SequencePushSupplier_ptr push_supplier + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -60,8 +60,8 @@ public: )); virtual void push_structured_events ( - const CosNotification::EventBatch & notifications, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventBatch & notifications + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -69,7 +69,7 @@ public: )); virtual void disconnect_sequence_push_consumer ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -77,7 +77,7 @@ public: protected: // = Helper methods - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); // Sends updates to the supplier. // = Data members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp index 450ac08e61d..90e58bbc9a0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp @@ -18,7 +18,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::~TAO_Notify_SequenceProxyPushSupplier_i } void -TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, @@ -50,7 +50,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotif CORBA::INTERNAL ()); ACE_CHECK; - this->on_connected (ACE_TRY_ENV); + this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -64,7 +64,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotif } void -TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &/*event*/, CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &/*event*/ TAO_ENV_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) { // Later: // Collect events into a sequence till the QoS property @@ -73,11 +73,11 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &/*ev } void -TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) { ACE_TRY { - this->push_consumer_->offer_change (added, removed, ACE_TRY_ENV); + this->push_consumer_->offer_change (added, removed TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -88,22 +88,22 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::Even } void -TAO_Notify_SequenceProxyPushSupplier_i::disconnect_sequence_push_supplier(CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequenceProxyPushSupplier_i::disconnect_sequence_push_supplier(TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->on_disconnected (ACE_TRY_ENV); + this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ask our parent to deactivate us. this->consumer_admin_-> - deactivate_proxy_pushsupplier (this, ACE_TRY_ENV); + deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_SequenceProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequenceProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) { // Tell the consumer that we're going away ... // @@ Later, lookup a "notify_on_disconnect" option. @@ -115,12 +115,12 @@ TAO_Notify_SequenceProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_EN return; } - this->disconnect_sequence_push_supplier (ACE_TRY_ENV); + this->disconnect_sequence_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TRY { - this->push_consumer_->disconnect_sequence_push_consumer (ACE_TRY_ENV); + this->push_consumer_->disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h index 2bdc1d164e0..7784b2acaed 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h @@ -48,8 +48,8 @@ class TAO_Notify_Export TAO_Notify_SequenceProxyPushSupplier_i : public TAO_Noti // Destructor virtual void connect_sequence_push_consumer ( - CosNotifyComm::SequencePushConsumer_ptr push_consumer, - CORBA::Environment &ACE_TRY_ENV + CosNotifyComm::SequencePushConsumer_ptr push_consumer + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -59,24 +59,24 @@ class TAO_Notify_Export TAO_Notify_SequenceProxyPushSupplier_i : public TAO_Noti // @@ Pradeep: more indentation problems.... virtual void disconnect_sequence_push_supplier ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); // Shutdown. // @@ Pradeep: please setup your editor to start 'protected', // 'public' and 'private' on the first column protected: - virtual void dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV); + virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL); // Deliver the event to the consumer. - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); // Deliver the update to the consumer. CosNotifyComm::SequencePushConsumer_var push_consumer_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp index ee701550b85..48619250ed9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp @@ -24,16 +24,16 @@ TAO_Notify_Source_Filter_Eval_Command::~TAO_Notify_Source_Filter_Eval_Command () } int -TAO_Notify_Source_Filter_Eval_Command::execute (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Source_Filter_Eval_Command::execute (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Boolean result = - this->event_source_->evaluate_filter (*this->event_, ACE_TRY_ENV); + this->event_source_->evaluate_filter (*this->event_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result == 1) { this->event_processor_-> - lookup_subscriptions (this->event_, this->event_source_, ACE_TRY_ENV); + lookup_subscriptions (this->event_, this->event_source_ TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h index 4ec6829e654..50fd2182489 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h @@ -48,7 +48,7 @@ public: ~TAO_Notify_Source_Filter_Eval_Command (); // Destructor. - virtual int execute (CORBA::Environment& ACE_TRY_ENV); + virtual int execute (TAO_ENV_SINGLE_ARG_DECL); // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp index 9d3029e90a6..c5a6f80b12f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp @@ -19,7 +19,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::~TAO_Notify_StructuredProxyPushConsume } void -TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected @@ -46,7 +46,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosN CORBA::INTERNAL ()); ACE_TRY_CHECK; - this->on_connected (ACE_TRY_ENV); + this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -61,12 +61,12 @@ TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosN } void -TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) { ACE_TRY { - this->push_supplier_->subscription_change (added, removed, - ACE_TRY_ENV); + this->push_supplier_->subscription_change (added, removed + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -77,7 +77,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::Ev } void -TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotification::StructuredEvent & notification, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotification::StructuredEvent & notification TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -100,24 +100,24 @@ TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotifi TAO_Notify_StructuredEvent* notify_event = new TAO_Notify_StructuredEvent (notification_copy); - this->event_manager_->process_event (notify_event, this, ACE_TRY_ENV); + this->event_manager_->process_event (notify_event, this TAO_ENV_ARG_PARAMETER); ACE_CHECK; notify_event->_decr_refcnt (); } void -TAO_Notify_StructuredProxyPushConsumer_i::disconnect_structured_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushConsumer_i::disconnect_structured_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // ask our parent to deactivate us. this->supplier_admin_-> - deactivate_proxy_pushconsumer (this, ACE_TRY_ENV); + deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->on_disconnected (ACE_TRY_ENV); + this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h index 9f0a12e3cad..6f166c499e8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h @@ -57,8 +57,8 @@ public: // = interface methods virtual void connect_structured_push_supplier ( - CosNotifyComm::StructuredPushSupplier_ptr push_supplier, - CORBA::Environment &ACE_TRY_ENV + CosNotifyComm::StructuredPushSupplier_ptr push_supplier + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -66,8 +66,8 @@ public: )); virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -75,7 +75,7 @@ virtual void push_structured_event ( )); virtual void disconnect_structured_push_consumer ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -83,7 +83,7 @@ virtual void push_structured_event ( protected: // = Helper methods - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); // dispatch updates to the supplier. // = Data members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp index 5f09e0ec93d..ab811b694d9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp @@ -18,7 +18,7 @@ TAO_Notify_StructuredProxyPushSupplier_i::~TAO_Notify_StructuredProxyPushSupplie } void -TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, @@ -53,7 +53,7 @@ TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosN CORBA::INTERNAL ()); ACE_CHECK; - this->on_connected (ACE_TRY_ENV); + this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -70,28 +70,28 @@ TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosN } void -TAO_Notify_StructuredProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL) { ACE_TRY { - event.do_push (this->push_consumer_.in (), ACE_TRY_ENV); + event.do_push (this->push_consumer_.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL { ACE_DEBUG ((LM_DEBUG, "Exception dispatching structured event\n")); - // misbehaving client, - this->shutdown (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check + // misbehaving client, + this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check } ACE_ENDTRY; } void -TAO_Notify_StructuredProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) { ACE_TRY { - this->push_consumer_->offer_change (added, removed, ACE_TRY_ENV); + this->push_consumer_->offer_change (added, removed TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -104,31 +104,31 @@ TAO_Notify_StructuredProxyPushSupplier_i::dispatch_update_i (CosNotification::Ev } void -TAO_Notify_StructuredProxyPushSupplier_i::shutdown_i (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushSupplier_i::shutdown_i (TAO_ENV_SINGLE_ARG_DECL) { - this->on_disconnected (ACE_TRY_ENV); + this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ask our parent to deactivate us. this->consumer_admin_-> - deactivate_proxy_pushsupplier (this, ACE_TRY_ENV); + deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_StructuredProxyPushSupplier_i::disconnect_structured_push_supplier(CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushSupplier_i::disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // unregister with CA - this->consumer_admin_->unregister_listener (this, ACE_TRY_ENV); + this->consumer_admin_->unregister_listener (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->shutdown_i (ACE_TRY_ENV); + this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_StructuredProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) { // Tell the consumer that we're going away ... // @@ Later, lookup a "notify_on_disconnect" option. @@ -140,12 +140,12 @@ TAO_Notify_StructuredProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_ return; } - this->shutdown_i (ACE_TRY_ENV); + this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TRY { - this->push_consumer_->disconnect_structured_push_consumer (ACE_TRY_ENV); + this->push_consumer_->disconnect_structured_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h index f3d62fb03b0..0e578846a02 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h @@ -53,8 +53,8 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_No // Destructor virtual void connect_structured_push_consumer ( - CosNotifyComm::StructuredPushConsumer_ptr push_consumer, - CORBA::Environment &ACE_TRY_ENV + CosNotifyComm::StructuredPushConsumer_ptr push_consumer + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -63,24 +63,24 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_No )); virtual void disconnect_structured_push_supplier ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); // Shutdown. protected: // = Helper methods - void shutdown_i (CORBA::Environment &ACE_TRY_ENV); + void shutdown_i (TAO_ENV_SINGLE_ARG_DECL); // Shutdown - virtual void dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV); + virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL); // Deliver the event to the consumer. - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); // Deliver the update to the consumer. // = Data Members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp index 91a1cd6bca8..d3a54d94d95 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp @@ -34,8 +34,6 @@ TAO_Notify_SupplierAdmin_i::~TAO_Notify_SupplierAdmin_i () ACE_DEBUG ((LM_DEBUG,"in SA dtor\n")); // Cleanup all resources.. - ACE_DECLARE_NEW_CORBA_ENV; - delete this->lock_; this->event_channel_->supplier_admin_destroyed (this->my_id_); @@ -51,8 +49,8 @@ TAO_Notify_SupplierAdmin_i::proxy_pushconsumer_destroyed (CosNotifyChannelAdmin: void TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator, - PortableServer::POA_ptr my_POA, - CORBA::Environment &ACE_TRY_ENV) + PortableServer::POA_ptr my_POA + TAO_ENV_ARG_DECL) { this->my_POA_ = PortableServer::POA::_duplicate (my_POA); @@ -62,12 +60,12 @@ TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, this->poa_factory_ = TAO_Notify_Factory::get_poa_factory (); this->lock_ = this->channel_objects_factory_-> - create_supplier_admin_lock (ACE_TRY_ENV); + create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_pushconsumer_POA_ = this->poa_factory_-> - create_proxy_pushconsumer_POA (this->my_POA_.in (), my_id, - ACE_TRY_ENV); + create_proxy_pushconsumer_POA (this->my_POA_.in (), my_id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; my_id_ = my_id; @@ -75,14 +73,14 @@ TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_SupplierAdmin_i::get_ref (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) { // @@ Pradeep: if you get a chance to quantify this stuff you will // notice that this is a very expensive operation, you may want to // cache the result if it is invoked very often... CORBA::Object_var obj = this->poa_factory_-> - servant_to_reference (this->my_POA_.in (), this, ACE_TRY_ENV); + servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ()); @@ -104,15 +102,15 @@ TAO_Notify_SupplierAdmin_i::get_filter_admin (void) } void -TAO_Notify_SupplierAdmin_i::deactivate_proxy_pushconsumer (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::deactivate_proxy_pushconsumer (PortableServer::Servant servant TAO_ENV_ARG_DECL) { this->poa_factory_-> - deactivate_object (servant, this->proxy_pushconsumer_POA_.in (), - ACE_TRY_ENV); + deactivate_object (servant, this->proxy_pushconsumer_POA_.in () + TAO_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::AdminID -TAO_Notify_SupplierAdmin_i::MyID (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_SupplierAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -121,16 +119,16 @@ TAO_Notify_SupplierAdmin_i::MyID (CORBA::Environment &/*ACE_TRY_ENV*/) } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_SupplierAdmin_i::MyChannel (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::MyChannel (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return event_channel_->get_ref (ACE_TRY_ENV); + return event_channel_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_SupplierAdmin_i::MyOperator (CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_SupplierAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -139,7 +137,7 @@ TAO_Notify_SupplierAdmin_i::MyOperator (CORBA::Environment &/*ACE_TRY_ENV*/) } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_SupplierAdmin_i::push_consumers (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::push_consumers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -148,11 +146,11 @@ TAO_Notify_SupplierAdmin_i::push_consumers (CORBA::Environment &ACE_TRY_ENV) CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); - return this->proxy_pushconsumer_ids_.get_sequence (ACE_TRY_ENV); + return this->proxy_pushconsumer_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::ProxyConsumer_ptr -TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ProxyNotFound @@ -160,75 +158,75 @@ TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID p { CORBA::Object_var obj = this->poa_factory_->id_to_reference (proxy_id, - proxy_pushconsumer_POA_.in (), - ACE_TRY_ENV); + proxy_pushconsumer_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); return CosNotifyChannelAdmin::ProxyConsumer::_narrow (obj.in ()); } CORBA::Object_ptr -TAO_Notify_SupplierAdmin_i::obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) { TAO_Notify_SequenceProxyPushConsumer_i* seq_proxy_pushconsumer = - this->channel_objects_factory_->create_seq_proxy_pushconsumer (this, - ACE_TRY_ENV); + this->channel_objects_factory_->create_seq_proxy_pushconsumer (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushconsumer_var (seq_proxy_pushconsumer); - seq_proxy_pushconsumer->init (proxy_id, ACE_TRY_ENV); + seq_proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushconsumer_POA_.in (), - seq_proxy_pushconsumer, - ACE_TRY_ENV); + seq_proxy_pushconsumer + TAO_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_SupplierAdmin_i::obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) { TAO_Notify_StructuredProxyPushConsumer_i* struct_proxy_pushconsumer = - this->channel_objects_factory_->create_struct_proxy_pushconsumer (this, - ACE_TRY_ENV); + this->channel_objects_factory_->create_struct_proxy_pushconsumer (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushconsumer_var (struct_proxy_pushconsumer); - struct_proxy_pushconsumer->init (proxy_id, ACE_TRY_ENV); + struct_proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushconsumer_POA_.in (), - struct_proxy_pushconsumer, - ACE_TRY_ENV); + struct_proxy_pushconsumer + TAO_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_SupplierAdmin_i::obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) { TAO_Notify_ProxyPushConsumer_i* proxy_pushconsumer = - this->channel_objects_factory_->create_proxy_pushconsumer (this, - ACE_TRY_ENV); + this->channel_objects_factory_->create_proxy_pushconsumer (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushconsumer_var (proxy_pushconsumer); - proxy_pushconsumer->init (proxy_id, ACE_TRY_ENV); + proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return this->poa_factory_-> activate_object_with_id (proxy_id, this->proxy_pushconsumer_POA_.in (), - proxy_pushconsumer, - ACE_TRY_ENV); + proxy_pushconsumer + TAO_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::ProxyConsumer_ptr -TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminLimitExceeded @@ -248,23 +246,23 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA { case CosNotifyChannelAdmin::ANY_EVENT: { - obj = this->obtain_proxy_pushconsumer_i (proxy_id, ACE_TRY_ENV); + obj = this->obtain_proxy_pushconsumer_i (proxy_id TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); } break; case CosNotifyChannelAdmin::STRUCTURED_EVENT: { - obj = this->obtain_struct_proxy_pushconsumer_i (proxy_id, - ACE_TRY_ENV); + obj = this->obtain_struct_proxy_pushconsumer_i (proxy_id + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); } break; case CosNotifyChannelAdmin::SEQUENCE_EVENT: { - obj = this->obtain_sequence_proxy_pushconsumer_i (proxy_id, - ACE_TRY_ENV); + obj = this->obtain_sequence_proxy_pushconsumer_i (proxy_id + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); } break; @@ -275,114 +273,114 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA } this->proxy_pushconsumer_ids_.next (); // commit the current id. - return CosNotifyChannelAdmin::ProxyConsumer::_narrow (obj.in (), - ACE_TRY_ENV); + return CosNotifyChannelAdmin::ProxyConsumer::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->destory_child_POAs_ = 1; if (this->destory_child_POAs_ == 1) - this->poa_factory_->destroy_POA (this->proxy_pushconsumer_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->destroy_POA (this->proxy_pushconsumer_POA_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate ourselves - this->poa_factory_->deactivate_object (this, this->my_POA_.in (), - ACE_TRY_ENV); + this->poa_factory_->deactivate_object (this, this->my_POA_.in () + TAO_ENV_ARG_PARAMETER); } CosNotification::QoSProperties* -TAO_Notify_SupplierAdmin_i::get_qos (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->qos_admin_.get_qos (ACE_TRY_ENV); + return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::set_qos (const CosNotification::QoSProperties & qos, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.set_qos (qos, ACE_TRY_ENV); + this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.validate_qos (required_qos, available_qos, ACE_TRY_ENV); + this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType )) { this->get_event_manager ()->update_publication_list (added, - removed, ACE_TRY_ENV); + removed TAO_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterID -TAO_Notify_SupplierAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.add_filter (new_filter, ACE_TRY_ENV); + return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::remove_filter (CosNotifyFilter::FilterID filter, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::remove_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - this->filter_admin_.remove_filter (filter, ACE_TRY_ENV); + this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER); } CosNotifyFilter::Filter_ptr -TAO_Notify_SupplierAdmin_i::get_filter (CosNotifyFilter::FilterID filter, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - return this->filter_admin_.get_filter (filter, ACE_TRY_ENV); + return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterIDSeq* -TAO_Notify_SupplierAdmin_i::get_all_filters (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.get_all_filters (ACE_TRY_ENV); + return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::remove_all_filters (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->filter_admin_.remove_all_filters (ACE_TRY_ENV); + this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_Notify_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -395,14 +393,14 @@ TAO_Notify_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment& ACE_TRY_EN PortableServer::ServantBase_var proxy_var (cosec_proxy); - cosec_proxy->init (ACE_TRY_ENV); + cosec_proxy->init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushConsumer::_nil ()); PortableServer::POA_var def_poa = this->event_channel_->get_default_POA (); CORBA::Object_var obj = this->poa_factory_-> - activate_object (def_poa.in (), cosec_proxy, ACE_TRY_ENV); + activate_object (def_poa.in (), cosec_proxy TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushConsumer::_nil ()); return CosEventChannelAdmin::ProxyPushConsumer::_narrow (obj.in ()); @@ -410,7 +408,7 @@ TAO_Notify_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment& ACE_TRY_EN // = Pull Methods. CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_SupplierAdmin_i::pull_consumers (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::pull_consumers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -423,7 +421,7 @@ TAO_Notify_SupplierAdmin_i::pull_consumers (CORBA::Environment& ACE_TRY_ENV) } CosNotifyChannelAdmin::ProxyConsumer_ptr -TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminLimitExceeded @@ -434,7 +432,7 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelA } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_Notify_SupplierAdmin_i::obtain_pull_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SupplierAdmin_i::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h index 2d0adaf19d0..0bf4940fbb9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h @@ -63,8 +63,8 @@ public: void init (CosNotifyChannelAdmin::AdminID myID, CosNotifyChannelAdmin::InterFilterGroupOperator myOperator, - PortableServer::POA_ptr my_POA, - CORBA::Environment &ACE_TRY_ENV); + PortableServer::POA_ptr my_POA + TAO_ENV_ARG_DECL); //Initialize the Supplier Admin. // @@ Pradeep: could this method be const? Try to use const @@ -72,8 +72,8 @@ public: TAO_Notify_FilterAdmin_i& get_filter_admin (void); // Get our filter admin. - void deactivate_proxy_pushconsumer (PortableServer::Servant servant, - CORBA::Environment &ACE_TRY_ENV); + void deactivate_proxy_pushconsumer (PortableServer::Servant servant + TAO_ENV_ARG_DECL); // Deactivate servant from <proxy_pushconsumer_POA_>. void proxy_pushconsumer_destroyed (CosNotifyChannelAdmin::ProxyID proxyID); @@ -81,13 +81,13 @@ public: // = Interface methods virtual CosNotifyChannelAdmin::AdminID MyID ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - CosNotifyChannelAdmin::SupplierAdmin_ptr get_ref (CORBA::Environment &ACE_TRY_ENV); + CosNotifyChannelAdmin::SupplierAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL); // Return the CORBA object for this servant. TAO_Notify_Event_Manager* get_event_manager (void); @@ -96,36 +96,36 @@ public: // @@ Pradeep: Don't forget to indent this stuff, at the very least // it should not start in the first column! virtual CosNotifyChannelAdmin::EventChannel_ptr MyChannel ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ProxyIDSeq * push_consumers ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer ( - CosNotifyChannelAdmin::ProxyID proxy_id, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::ProxyID proxy_id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -134,8 +134,8 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer ( virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_pull_consumer ( CosNotifyChannelAdmin::ClientType ctype, - CosNotifyChannelAdmin::ProxyID_out proxy_id, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::ProxyID_out proxy_id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -144,8 +144,8 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_pull_consum virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_push_consumer ( CosNotifyChannelAdmin::ClientType ctype, - CosNotifyChannelAdmin::ProxyID_out proxy_id, - CORBA::Environment &ACE_TRY_ENV + CosNotifyChannelAdmin::ProxyID_out proxy_id + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -153,22 +153,22 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_push_consum )); virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotification::QoSProperties * get_qos ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void set_qos ( - const CosNotification::QoSProperties & qos, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::QoSProperties & qos + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -177,8 +177,8 @@ virtual void set_qos ( virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, - CosNotification::NamedPropertyRangeSeq_out available_qos, - CORBA::Environment &ACE_TRY_ENV + CosNotification::NamedPropertyRangeSeq_out available_qos + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -187,8 +187,8 @@ virtual void validate_qos ( virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -196,16 +196,16 @@ virtual void offer_change ( )); virtual CosNotifyFilter::FilterID add_filter ( - CosNotifyFilter::Filter_ptr new_filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::Filter_ptr new_filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_filter ( - CosNotifyFilter::FilterID filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::FilterID filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -213,8 +213,8 @@ virtual void remove_filter ( )); virtual CosNotifyFilter::Filter_ptr get_filter ( - CosNotifyFilter::FilterID filter, - CORBA::Environment &ACE_TRY_ENV + CosNotifyFilter::FilterID filter + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -222,28 +222,28 @@ virtual CosNotifyFilter::Filter_ptr get_filter ( )); virtual CosNotifyFilter::FilterIDSeq * get_all_filters ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_filters ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -251,13 +251,13 @@ virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer ( protected: // = Helper methods - CORBA::Object_ptr obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); // Obtain a proxy pushconsumer object - CORBA::Object_ptr obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); // Obtain a structured proxy pushconsumer object. - CORBA::Object_ptr obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); // Obtain a sequence pushconsumer object // = Data members diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp index 0a94673baa2..bd6586314b6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp @@ -22,10 +22,10 @@ TAO_Notify_Update_Dispatch_Command::~TAO_Notify_Update_Dispatch_Command () } int -TAO_Notify_Update_Dispatch_Command::execute (CORBA::Environment& ACE_TRY_ENV) +TAO_Notify_Update_Dispatch_Command::execute (TAO_ENV_SINGLE_ARG_DECL) { - this->update_listener_->dispatch_update (this->added_, this->removed_, - ACE_TRY_ENV); + this->update_listener_->dispatch_update (this->added_, this->removed_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h index c8ab14ad24f..e32a2c9ae3d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h @@ -46,7 +46,7 @@ class TAO_Notify_Export TAO_Notify_Update_Dispatch_Command : public TAO_Notify_C ~TAO_Notify_Update_Dispatch_Command (); - virtual int execute (CORBA::Environment& ACE_TRY_ENV); + virtual int execute (TAO_ENV_SINGLE_ARG_DECL); // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp index e973b1c2fc0..d17cd92c9ee 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp @@ -20,14 +20,14 @@ TAO_Notify_Worker_Task::init_task (TAO_Notify_AdminProperties* const) } void -TAO_Notify_Worker_Task::shutdown (CORBA::Environment&) +TAO_Notify_Worker_Task::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { } int -TAO_Notify_Worker_Task::process_event (TAO_Notify_Command *mb, CORBA::Environment& ACE_TRY_ENV, ACE_Time_Value * /*tv*/) +TAO_Notify_Worker_Task::process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value * /*tv*/) { - int result = mb->execute (ACE_TRY_ENV); + int result = mb->execute (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_Message_Block::release (mb); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h index bcc3c2aba92..9145232c6c5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h @@ -52,10 +52,10 @@ public: virtual int init_task (TAO_Notify_AdminProperties* const admin_properties); // Init the task - virtual void shutdown (CORBA::Environment& ACE_TRY_ENV); + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); // shutdown this task. - virtual int process_event (TAO_Notify_Command *mb, CORBA::Environment& ACE_TRY_ENV, ACE_Time_Value *tv = 0); + virtual int process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv = 0); // Process the command. }; diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 82f8d825146..8a2eee3b877 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -98,7 +98,7 @@ TAO_PropertySetFactory::~TAO_PropertySetFactory (void) // things. CosPropertyService::PropertySet_ptr -TAO_PropertySetFactory::create_propertyset (CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySetFactory::create_propertyset (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // New a TAO_PropertySet. @@ -109,7 +109,7 @@ TAO_PropertySetFactory::create_propertyset (CORBA::Environment &ACE_TRY_ENV) size_t cur_len = this->propertyset_products_.length (); this->propertyset_products_.length (cur_len + 1); this->propertyset_products_[cur_len] = new_set; - return new_set->_this (ACE_TRY_ENV); + return new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } // Allows a client to create a new TAO_PropertySet with specific @@ -117,8 +117,8 @@ TAO_PropertySetFactory::create_propertyset (CORBA::Environment &ACE_TRY_ENV) CosPropertyService::PropertySet_ptr TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types, - const CosPropertyService::Properties &allowed_properties, - CORBA::Environment &ACE_TRY_ENV) + const CosPropertyService::Properties &allowed_properties + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::ConstraintNotSupported)) { @@ -130,8 +130,8 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService // New a TAO_PropertySet using these constraints. ACE_NEW_RETURN (new_set, TAO_PropertySet (allowed_property_types, - allowed_properties, - ACE_TRY_ENV), + allowed_properties + TAO_ENV_ARG_PARAMETER), 0); ACE_TRY_CHECK; @@ -141,7 +141,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService this->propertyset_products_[products_len] = new_set; // All done. - propset_ptr = new_set->_this (ACE_TRY_ENV); + propset_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ex) @@ -170,8 +170,8 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService // constraints. "All the properties will have *fixed-normal* modes". CosPropertyService::PropertySet_ptr -TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties, - CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -182,8 +182,8 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr { // New a TAO_PropertySet. ACE_NEW_RETURN (new_set, - TAO_PropertySet (initial_properties, - ACE_TRY_ENV), + TAO_PropertySet (initial_properties + TAO_ENV_ARG_PARAMETER), 0); ACE_TRY_CHECK; @@ -193,7 +193,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr this->propertyset_products_[products_len] = new_set; // All done. - propset_ptr = new_set->_this (ACE_TRY_ENV); + propset_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosPropertyService::MultipleExceptions, ex) @@ -241,7 +241,7 @@ TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void) // delete all these New'ed things. CosPropertyService::PropertySetDef_ptr -TAO_PropertySetDefFactory::create_propertysetdef (CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySetDefFactory::create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // New a TAO_PropertySetDef. @@ -254,7 +254,7 @@ TAO_PropertySetDefFactory::create_propertysetdef (CORBA::Environment &ACE_TRY_EN this->propertysetdef_products_[cur_len] = new_set; CosPropertyService::PropertySetDef_ptr propsetdef_ptr = - new_set->_this (ACE_TRY_ENV); + new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return propsetdef_ptr; @@ -262,8 +262,8 @@ TAO_PropertySetDefFactory::create_propertysetdef (CORBA::Environment &ACE_TRY_EN CosPropertyService::PropertySetDef_ptr TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types, - const CosPropertyService::PropertyDefs &allowed_property_defs, - CORBA::Environment &ACE_TRY_ENV) + const CosPropertyService::PropertyDefs &allowed_property_defs + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::ConstraintNotSupported)) { @@ -275,8 +275,8 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS // New a TAO_PropertySetDef using these constraints. ACE_NEW_RETURN (new_set, TAO_PropertySetDef (allowed_property_types, - allowed_property_defs, - ACE_TRY_ENV), + allowed_property_defs + TAO_ENV_ARG_PARAMETER), 0); ACE_TRY_CHECK; @@ -286,7 +286,7 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS this->propertysetdef_products_[products_len] = new_set; // All done. Return the pointer. - propsetdef_ptr = new_set->_this (ACE_TRY_ENV); + propsetdef_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ex) @@ -315,8 +315,8 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS // initital constraints. CosPropertyService::PropertySetDef_ptr -TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs, - CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -327,8 +327,8 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi { // New a TAO_PropertySet using these lengths. ACE_NEW_RETURN (new_set, - TAO_PropertySetDef (initial_property_defs, - ACE_TRY_ENV), + TAO_PropertySetDef (initial_property_defs + TAO_ENV_ARG_PARAMETER), 0); ACE_TRY_CHECK; @@ -338,7 +338,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi this->propertysetdef_products_[products_len] = new_set; // All done. - propsetdef_ptr = new_set->_this (ACE_TRY_ENV); + propsetdef_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosPropertyService::MultipleExceptions, ex) @@ -378,8 +378,8 @@ TAO_PropertySet::TAO_PropertySet (void) TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types, - const CosPropertyService::Properties allowed_properties, - CORBA::Environment &ACE_TRY_ENV) + const CosPropertyService::Properties allowed_properties + TAO_ENV_ARG_DECL) : allowed_property_types_ (allowed_property_types), allowed_property_names_ (allowed_properties.length ()) { @@ -396,8 +396,8 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe // Define the allowed properties in the hash table. ACE_TRY { - this->define_properties (allowed_properties, - ACE_TRY_ENV); + this->define_properties (allowed_properties + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -413,8 +413,8 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe // allowed properties' sequence withe just the maximum length. TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types, - const CORBA::ULong number_of_allowed_properties, - CORBA::Environment &) + const CORBA::ULong number_of_allowed_properties + TAO_ENV_ARG_DECL_NOT_USED) : allowed_property_types_ (allowed_property_types), allowed_property_names_ (number_of_allowed_properties) { @@ -424,15 +424,15 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe // properies with *normal* modes. -TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_properties, - CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_properties + TAO_ENV_ARG_DECL) { // Define all the initial properties in the Property Set. All take // *normal* modes. ACE_TRY { - this->define_properties (initial_properties, - ACE_TRY_ENV); + this->define_properties (initial_properties + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -460,8 +460,8 @@ TAO_PropertySet::~TAO_PropertySet (void) void TAO_PropertySet::define_property (const char *property_name, - const CORBA::Any &property_value, - CORBA::Environment &ACE_TRY_ENV) + const CORBA::Any &property_value + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::ConflictingProperty, @@ -544,7 +544,7 @@ TAO_PropertySet::define_property (const char *property_name, CORBA::Boolean TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; // If the sequence is empty, no constraints. if (this->allowed_property_types_.length () == 0) @@ -558,8 +558,8 @@ TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type) { ACE_TRY { - ret_val = this->allowed_property_types_[ti]->equal (type, - ACE_TRY_ENV); + ret_val = this->allowed_property_types_[ti]->equal (type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret_val == 1) @@ -607,8 +607,8 @@ TAO_PropertySet::is_property_allowed (const char* property_name) void -TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties, - CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -624,8 +624,8 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope { // Define this property. this->define_property (nproperties [pi].property_name.in (), - nproperties [pi].property_value, - ACE_TRY_ENV); + nproperties [pi].property_value + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosPropertyService::InvalidPropertyName, ex) @@ -691,7 +691,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope CORBA::ULong -TAO_PropertySet::get_number_of_properties (CORBA::Environment &) +TAO_PropertySet::get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->hash_table_.current_size (); @@ -706,8 +706,8 @@ TAO_PropertySet::get_number_of_properties (CORBA::Environment &) void TAO_PropertySet::get_all_property_names (CORBA::ULong how_many, CosPropertyService::PropertyNames_out property_names, - CosPropertyService::PropertyNamesIterator_out rest, - CORBA::Environment &ACE_TRY_ENV) + CosPropertyService::PropertyNamesIterator_out rest + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocating storage is a must. @@ -715,7 +715,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many, CosPropertyService::PropertyNames); size_t num_of_properties = - this->get_number_of_properties (ACE_TRY_ENV); + this->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (num_of_properties == 0) @@ -773,13 +773,13 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many, // Get the Interface ptr. CosPropertyService::PropertyNamesIterator_ptr iterator_ptr = - names_iterator->_this (ACE_TRY_ENV); + names_iterator->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // POA stuff todo here, since we have <destroy> method in the // <NamesIterator> interface. // Give ownership of this servant to the POA. - names_iterator->_remove_ref (ACE_TRY_ENV); + names_iterator->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Init the out parameter. @@ -791,8 +791,8 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many, CORBA::Any * -TAO_PropertySet::get_property_value (const char *property_name, - CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySet::get_property_value (const char *property_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName)) @@ -828,8 +828,8 @@ TAO_PropertySet::get_property_value (const char *property_name, CORBA::Boolean TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &property_names, - CosPropertyService::Properties_out nproperties, - CORBA::Environment &ACE_TRY_ENV) + CosPropertyService::Properties_out nproperties + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. @@ -852,8 +852,8 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper for (size_t i = 0; i < n; i++) { - any_ptr = get_property_value (property_names [i], - ACE_TRY_ENV); + any_ptr = get_property_value (property_names [i] + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (any_ptr != 0) @@ -884,8 +884,8 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper void TAO_PropertySet::get_all_properties (CORBA::ULong how_many, CosPropertyService::Properties_out nproperties, - CosPropertyService::PropertiesIterator_out rest, - CORBA::Environment &ACE_TRY_ENV) + CosPropertyService::PropertiesIterator_out rest + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. @@ -960,13 +960,13 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many, // Get the interface ptr. CosPropertyService::PropertiesIterator_ptr iterator_ptr = - iterator->_this (ACE_TRY_ENV); + iterator->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // POA stuff todo here, since we have <destroy> method in the // <NamesIterator> interface. // Give ownership of this servant to the POA. - iterator->_remove_ref (ACE_TRY_ENV); + iterator->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Init the out parameter. @@ -978,8 +978,8 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many, void -TAO_PropertySet::delete_property (const char *property_name, - CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySet::delete_property (const char *property_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName, @@ -1018,8 +1018,8 @@ TAO_PropertySet::delete_property (const char *property_name, void -TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names, - CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -1036,8 +1036,8 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro ACE_TRY { // Delete this property. - this->delete_property (property_names[pi], - ACE_TRY_ENV); + this->delete_property (property_names[pi] + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosPropertyService::InvalidPropertyName, ex) @@ -1089,7 +1089,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro CORBA::Boolean -TAO_PropertySet::delete_all_properties (CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySet::delete_all_properties (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get all the property names in a names' sequence. @@ -1101,13 +1101,13 @@ TAO_PropertySet::delete_all_properties (CORBA::Environment &ACE_TRY_ENV) CosPropertyService::PropertyNamesIterator_out iter_out (iter_ptr); CosPropertyService::PropertyNamesIterator_var iter; - CORBA::ULong size = this->get_number_of_properties (ACE_TRY_ENV); + CORBA::ULong size = this->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); this->get_all_property_names (size, names_out, - iter_out, - ACE_TRY_ENV); + iter_out + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Get the out values on to the var varibles. @@ -1115,8 +1115,8 @@ TAO_PropertySet::delete_all_properties (CORBA::Environment &ACE_TRY_ENV) iter = iter_out.ptr (); // Delete all these properties. - this->delete_properties (names.in (), - ACE_TRY_ENV); + this->delete_properties (names.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // All properties deleted. @@ -1127,8 +1127,8 @@ TAO_PropertySet::delete_all_properties (CORBA::Environment &ACE_TRY_ENV) CORBA::Boolean -TAO_PropertySet::is_property_defined (const char *property_name, - CORBA::Environment &) +TAO_PropertySet::is_property_defined (const char *property_name + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName)) { @@ -1158,11 +1158,11 @@ TAO_PropertySetDef::TAO_PropertySetDef (void) // Constructor that the factory uses. TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types, - const CosPropertyService::PropertyDefs allowed_property_defs, - CORBA::Environment &ACE_TRY_ENV) + const CosPropertyService::PropertyDefs allowed_property_defs + TAO_ENV_ARG_DECL) : TAO_PropertySet(allowed_property_types, - allowed_property_defs.length (), - ACE_TRY_ENV) + allowed_property_defs.length () + TAO_ENV_ARG_PARAMETER) { // Set the length of the allowed property names. this->allowed_property_names_.length (allowed_property_defs.length ()); @@ -1175,8 +1175,8 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes // Define the allowed properties in the hash table. ACE_TRY { - this->define_properties_with_modes (allowed_property_defs, - ACE_TRY_ENV); + this->define_properties_with_modes (allowed_property_defs + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1189,11 +1189,11 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes // Constructor that the factory uses. -TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs, - CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs + TAO_ENV_ARG_DECL) { - this->define_properties_with_modes (initial_property_defs, - ACE_TRY_ENV); + this->define_properties_with_modes (initial_property_defs + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1205,8 +1205,8 @@ TAO_PropertySetDef::~TAO_PropertySetDef (void) // Return the sequence that is there in side. void -TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types, - CORBA::Environment &) +TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Copy contents of the sequence. @@ -1215,8 +1215,8 @@ TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyType } void -TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs, - CORBA::Environment &) +TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // We have all the names, get the values and the modes from the Hash @@ -1239,8 +1239,8 @@ TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out void TAO_PropertySetDef::define_property_with_mode (const char *property_name, const CORBA::Any &property_value, - CosPropertyService::PropertyModeType property_mode, - CORBA::Environment &ACE_TRY_ENV) + CosPropertyService::PropertyModeType property_mode + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::ConflictingProperty, @@ -1321,8 +1321,8 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name, // Define one by one. If any excceptions raised, build // MultipleExceptions sequence and raise that. void -TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs, - CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -1340,8 +1340,8 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop // Define the property. this->define_property_with_mode (property_defs[i].property_name, property_defs[i].property_value, - property_defs[i].property_mode, - ACE_TRY_ENV); + property_defs[i].property_mode + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosPropertyService::InvalidPropertyName, ex) @@ -1414,8 +1414,8 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop // Get the mode of a property. Raises InvalidpropertyName, // PropertyNotFound exceptions. CosPropertyService::PropertyModeType -TAO_PropertySetDef::get_property_mode (const char *property_name, - CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySetDef::get_property_mode (const char *property_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName)) @@ -1452,8 +1452,8 @@ TAO_PropertySetDef::get_property_mode (const char *property_name, // Nil or no, before doing something with it. CORBA::Boolean TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames &property_names, - CosPropertyService::PropertyModes_out property_modes, - CORBA::Environment &ACE_TRY_ENV) + CosPropertyService::PropertyModes_out property_modes + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. @@ -1480,8 +1480,8 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames ACE_TRY { // Invoke get_property_mode for this name. - mode = this->get_property_mode (property_names[i], - ACE_TRY_ENV); + mode = this->get_property_mode (property_names[i] + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Store the mode in the out sequence. @@ -1512,8 +1512,8 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames // "Fixed-Readonly" to anything is *not* possible. void TAO_PropertySetDef::set_property_mode (const char *property_name, - CosPropertyService::PropertyModeType property_mode, - CORBA::Environment &ACE_TRY_ENV) + CosPropertyService::PropertyModeType property_mode + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::PropertyNotFound, @@ -1606,8 +1606,8 @@ TAO_PropertySetDef::set_property_mode (const char *property_name, // sequence and return. void -TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes, - CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -1623,8 +1623,8 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes ACE_TRY { this->set_property_mode (property_modes[i].property_name, - property_modes[i].property_mode, - ACE_TRY_ENV); + property_modes[i].property_mode + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosPropertyService::PropertyNotFound, ex) @@ -1689,7 +1689,7 @@ TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void) // one exists. void -TAO_PropertyNamesIterator::reset (CORBA::Environment &) +TAO_PropertyNamesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->iterator_ = this->iterator_.map ().begin (); @@ -1701,8 +1701,8 @@ TAO_PropertyNamesIterator::reset (CORBA::Environment &) // iterator. CORBA::Boolean -TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name, - CORBA::Environment &) +TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { COSPROPERTY_HASH_ENTRY *entry_ptr; @@ -1720,8 +1720,8 @@ TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name, CORBA::Boolean TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many, - CosPropertyService::PropertyNames_out property_names, - CORBA::Environment &) + CosPropertyService::PropertyNames_out property_names + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. @@ -1754,22 +1754,22 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many, } void -TAO_PropertyNamesIterator::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_PropertyNamesIterator::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove self from POA. Because of reference counting, the POA // will automatically delete the servant when all pending requests // on this servant are complete. - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1785,15 +1785,15 @@ TAO_PropertiesIterator::~TAO_PropertiesIterator (void) } void -TAO_PropertiesIterator::reset (CORBA::Environment &) +TAO_PropertiesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->iterator_ = this->iterator_.map ().begin (); } CORBA::Boolean -TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty, - CORBA::Environment &) +TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { COSPROPERTY_HASH_ENTRY *entry_ptr; @@ -1815,8 +1815,8 @@ TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty, CORBA::Boolean TAO_PropertiesIterator::next_n (CORBA::ULong how_many, - CosPropertyService::Properties_out nproperties, - CORBA::Environment &) + CosPropertyService::Properties_out nproperties + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. @@ -1857,22 +1857,22 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many, } void -TAO_PropertiesIterator::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_PropertiesIterator::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove self from POA. Because of reference counting, the POA // will automatically delete the servant when all pending requests // on this servant are complete. - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index fcb5d0550f1..2e55d30489e 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -126,26 +126,23 @@ public: // Destructor. virtual CosPropertyService::PropertySet_ptr - create_propertyset (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + create_propertyset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new TAO_PropertySet object. "The property set returned // will *not* have any initial properties." virtual CosPropertyService::PropertySet_ptr create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types, - const CosPropertyService::Properties &allowed_properties, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment()) + const CosPropertyService::Properties &allowed_properties + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::ConstraintNotSupported)); // Allows a client to create a new TAO_PropertySet with specific // constraints. "All the properties will have *fixed-normal* modes". virtual CosPropertyService::PropertySet_ptr - create_initial_propertyset (const CosPropertyService::Properties &initial_properties, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment() ) + create_initial_propertyset (const CosPropertyService::Properties &initial_properties + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // Allows a client to create a new TAO_PropertySet with specific @@ -182,24 +179,22 @@ public: // Destructor. virtual CosPropertyService::PropertySetDef_ptr - create_propertysetdef (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a new TAO_PropertySetDef object. virtual CosPropertyService::PropertySetDef_ptr create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types, - const CosPropertyService::PropertyDefs &allowed_property_defs, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment()) + const CosPropertyService::PropertyDefs &allowed_property_defs + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::ConstraintNotSupported)); // Allows a client to create a new TAO_PropertySetDef with specific // constraints. virtual CosPropertyService::PropertySetDef_ptr - create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment() ) + create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // Allows a client to create a new TAO_PropertySetDef with specific @@ -231,29 +226,25 @@ public: // Default constructor. TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types, - const CosPropertyService::Properties allowed_properties, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment() ); + const CosPropertyService::Properties allowed_properties + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Init values that the PropertySetFactory will want to specify. - TAO_PropertySet (const CosPropertyService::Properties initial_properties, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment() ); + TAO_PropertySet (const CosPropertyService::Properties initial_properties + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // PropertySetFactory needs this constructor. TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types, - const CORBA::ULong number_of_allowed_propertydefs, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment() ); + const CORBA::ULong number_of_allowed_propertydefs + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // PropertySetDef's construction needs this. virtual ~TAO_PropertySet (void); // Destructor function. virtual void define_property (const char *property_name, - const CORBA::Any &property_value, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment() ) + const CORBA::Any &property_value + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::ConflictingProperty, @@ -264,75 +255,67 @@ public: // Store the property in the hash after checking for validity of the // property name, duplicate name, type code over writing etc. - virtual void define_properties (const CosPropertyService::Properties &nproperties, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment() ) + virtual void define_properties (const CosPropertyService::Properties &nproperties + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // Define a sequence of properties at a time. - virtual CORBA::ULong get_number_of_properties (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment() ) + virtual CORBA::ULong get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the number of properties that are currently defined in the // PropertySet. virtual void get_all_property_names (CORBA::ULong how_many, CosPropertyService::PropertyNames_out property_names, - CosPropertyService::PropertyNamesIterator_out rest, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment() ) + CosPropertyService::PropertyNamesIterator_out rest + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the names of all the properties that are currently defined in // the property set. - virtual CORBA::Any *get_property_value (const char *property_name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment() ) + virtual CORBA::Any *get_property_value (const char *property_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName)); // Get the value of the property, given the name. virtual CORBA::Boolean get_properties (const CosPropertyService::PropertyNames &property_names, - CosPropertyService::Properties_out nproperties, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment() ) + CosPropertyService::Properties_out nproperties + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Get all names and their property values. virtual void get_all_properties (CORBA::ULong how_many, CosPropertyService::Properties_out nproperties, - CosPropertyService::PropertiesIterator_out rest, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment() ) + CosPropertyService::PropertiesIterator_out rest + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns all of the property names currently defined in the // PropertySet. If the PropertySet contains more than how_many // property names, then the remaining property names are put into the PropertyNamesIterator. - virtual void delete_property (const char *property_name, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment() ) + virtual void delete_property (const char *property_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName, CosPropertyService::FixedProperty)); // Delete a property given a name. - virtual void delete_properties (const CosPropertyService::PropertyNames &property_names, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment()) + virtual void delete_properties (const CosPropertyService::PropertyNames &property_names + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // Delete all the these properties from this property set. - virtual CORBA::Boolean delete_all_properties (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + virtual CORBA::Boolean delete_all_properties (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Delete everything from this property set. - virtual CORBA::Boolean is_property_defined (const char *property_name, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + virtual CORBA::Boolean is_property_defined (const char *property_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName)); // Tell whether this property is defined or no. Forget about the @@ -398,19 +381,19 @@ public: // Constructor. TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types, - const CosPropertyService::PropertyDefs allowed_property, - CORBA::Environment &_env); + const CosPropertyService::PropertyDefs allowed_property + TAO_ENV_ARG_DECL); // The factory uses this constructor. - TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs, - CORBA::Environment &_env); + TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs + TAO_ENV_ARG_DECL); // This is also for the factory. virtual ~TAO_PropertySetDef (void); // Destructor. - virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Indicates which types of properties are supported by this // PropertySet. If the output sequence is empty, then there is no @@ -418,8 +401,8 @@ public: // field of a Property in this PropertySet, unless the // get_allowed_properties output sequence is not empty. - virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Indicates which properties are supported by this PropertySet. If @@ -429,8 +412,8 @@ public: virtual void define_property_with_mode (const char *property_name, const CORBA::Any &property_value, - CosPropertyService::PropertyModeType property_mode, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + CosPropertyService::PropertyModeType property_mode + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::ConflictingProperty, @@ -446,15 +429,15 @@ public: // PropertySet. If type or mode is violated, ConflictingProperty // exception is thrown. - virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // This operation will modify or add each of the properties in the // Properties parameter to the PropertySet. - virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName)); @@ -462,8 +445,8 @@ public: // PropertyNotFound exceptions. virtual CORBA::Boolean get_property_modes (const CosPropertyService::PropertyNames &property_names, - CosPropertyService::PropertyModes_out property_modes, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + CosPropertyService::PropertyModes_out property_modes + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Batch operation for getting the property. Invoke // get_property_mode for each name. Return value False indicates @@ -474,8 +457,8 @@ public: // doing something with it. virtual void set_property_mode (const char *property_name, - CosPropertyService::PropertyModeType property_mode, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + CosPropertyService::PropertyModeType property_mode + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::PropertyNotFound, @@ -491,8 +474,8 @@ public: // all illegal set_mode attempts, UnsupportedMode exception is // raised. - virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // Batch operation for setting the property. Raises @@ -522,13 +505,13 @@ public: virtual ~TAO_PropertyNamesIterator (void); // Destructor. - virtual void reset (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + virtual void reset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // The reset operation resets the position in an iterator to the // first property name, if one exists. - virtual CORBA::Boolean next_one (CORBA::String_out property_name, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + virtual CORBA::Boolean next_one (CORBA::String_out property_name + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // The next_one operation returns true if an item exists at the // current position in the iterator with an output parameter of a @@ -536,8 +519,8 @@ public: virtual CORBA::Boolean next_n (CORBA::ULong how_many, - CosPropertyService::PropertyNames_out property_names, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + CosPropertyService::PropertyNames_out property_names + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // The next_n operation returns true if an item exists at the // current position in the iterator and the how_many parameter was @@ -545,7 +528,7 @@ public: // with at most the how_many number of names. A return of false // signifies no more items in the iterator. - virtual void destroy (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroys the iterator. private: @@ -585,12 +568,12 @@ public: virtual ~TAO_PropertiesIterator (void); // Destructor. - virtual void reset (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + virtual void reset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Resets the position in an iterator to the first property, if one exists. - virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // The next_one operation returns true if an item exists at the // current position in the iterator with an output parameter of a @@ -598,8 +581,8 @@ public: // iterator. virtual CORBA::Boolean next_n (CORBA::ULong how_many, - CosPropertyService::Properties_out nproperties, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + CosPropertyService::Properties_out nproperties + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // The next_n operation returns true if an item exists at the // current position in the iterator and the how_many parameter was @@ -607,7 +590,7 @@ public: // at most the how_many number of properties. A return of false // signifies no more items in the iterator. - virtual void destroy (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment()) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroys the iterator. diff --git a/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp b/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp index 03686e655bc..66a03582d03 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp +++ b/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp @@ -23,13 +23,11 @@ TAO_LB_ReplicaLocator::preinvoke ( ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - if (this->load_balancer_ == 0) ACE_THROW_RETURN (CORBA::INTERNAL (), 0); CORBA::Object_var replica = - this->load_balancer_->replica (ACE_TRY_ENV); + this->load_balancer_->replica (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Throw a forward exception to force the client to redirect its diff --git a/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp index 8dc15cbde74..bfc9d025ba7 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp +++ b/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp @@ -22,8 +22,8 @@ TAO_LB_ReplicaProxy::TAO_LB_ReplicaProxy (void) } void -TAO_LB_ReplicaProxy::current_load (CORBA::Float load, - CORBA::Environment &ACE_TRY_ENV) +TAO_LB_ReplicaProxy::current_load (CORBA::Float load + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Ossama: this is the point were the load dampening should @@ -35,11 +35,11 @@ TAO_LB_ReplicaProxy::current_load (CORBA::Float load, this->current_load_ = load; // ACE_DEBUG ((LM_DEBUG, "Load[%x] = %f\n", long(this), load)); - this->balancer_->load_changed (this, ACE_TRY_ENV); + this->balancer_->load_changed (this TAO_ENV_ARG_PARAMETER); } void -TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV) +TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected, CORBA::SystemException)) { @@ -49,7 +49,7 @@ TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV) if (this->connected_) { - this->balancer_->disconnect (this, ACE_TRY_ENV); + this->balancer_->disconnect (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->connected_ = 0; @@ -63,8 +63,8 @@ TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV) void TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer, LoadBalancing::ReplicaControl_ptr control, - CORBA::Object_ptr replica, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr replica + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)) diff --git a/TAO/orbsvcs/orbsvcs/ReplicaProxy.h b/TAO/orbsvcs/orbsvcs/ReplicaProxy.h index a4f60a41a06..9eb629ea29f 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaProxy.h +++ b/TAO/orbsvcs/orbsvcs/ReplicaProxy.h @@ -54,8 +54,8 @@ public: CORBA::Object_ptr replica (void); // Return a reference to the Replica. - virtual void current_load (CORBA::Float load, - CORBA::Environment &ACE_TRY_ENV) + virtual void current_load (CORBA::Float load + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Send the value of the current load on the Object being load // balanced, where the definition of "load" is load balancing @@ -69,7 +69,7 @@ public: // without affecting the client, or detect rapid raises in load and // react proactively to those... - virtual void disconnect (CORBA::Environment &ACE_TRY_ENV) + virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected, CORBA::SystemException)); // Send a request to disconnect from the LoadBalancer. @@ -92,8 +92,8 @@ private: void connect (TAO_LB_LoadBalancer *balancer, LoadBalancing::ReplicaControl_ptr control, - CORBA::Object_ptr replica, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr replica + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)); diff --git a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp index 9c0c198c5d0..4da47b060d7 100644 --- a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp @@ -39,7 +39,7 @@ TAO_LB_Round_Robin_Strategy::~TAO_LB_Round_Robin_Strategy (void) } CORBA::Object_ptr -TAO_LB_Round_Robin_Strategy::replica (CORBA::Environment &ACE_TRY_ENV) +TAO_LB_Round_Robin_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, diff --git a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h index 523ff488d9e..93887fc6ac0 100644 --- a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h @@ -60,7 +60,7 @@ public: // Destructor // = The Load_Balancing_Strategy methods - virtual CORBA::Object_ptr replica (CORBA_Environment &ACE_TRY_ENV) + virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int insert (TAO_LB_ReplicaProxy *); virtual int remove (TAO_LB_ReplicaProxy *); diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index 5fd8f5a9e17..1faa1a245f8 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -28,8 +28,8 @@ ACE_Runtime_Scheduler (int config_count, // it's not present. RtecScheduler::handle_t -ACE_Runtime_Scheduler::create (const char *entry_point, - CORBA::Environment &) +ACE_Runtime_Scheduler::create (const char *entry_point + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)) { @@ -47,19 +47,19 @@ ACE_Runtime_Scheduler::create (const char *entry_point, // value if it's not present. RtecScheduler::handle_t -ACE_Runtime_Scheduler::lookup (const char * entry_point, - CORBA::Environment &ACE_TRY_ENV) +ACE_Runtime_Scheduler::lookup (const char * entry_point + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return create (entry_point, ACE_TRY_ENV); + return create (entry_point TAO_ENV_ARG_PARAMETER); } // Return a pointer to the RT_Info corresponding to the passed handle. RtecScheduler::RT_Info * -ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle, - CORBA::Environment &ACE_TRY_ENV) +ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -109,8 +109,8 @@ ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle, RtecScheduler::Importance_t importance, RtecScheduler::Quantum_t quantum, CORBA::Long threads, - RtecScheduler::Info_Type_t info_type, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Info_Type_t info_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -146,8 +146,8 @@ void ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) @@ -169,23 +169,23 @@ void ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) { - RtecScheduler::handle_t handle = lookup (entry_point, ACE_TRY_ENV); + RtecScheduler::handle_t handle = lookup (entry_point TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (handle < -1) - // The exception was thrown or is in ACE_TRY_ENV already. + // The exception was thrown or is in TAO_ENV_SINGLE_ARG_PARAMETER already. return; this->priority (handle, priority, subpriority, - p_priority, - ACE_TRY_ENV); + p_priority + TAO_ENV_ARG_PARAMETER); } @@ -196,8 +196,8 @@ void ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t /* dependency */, CORBA::Long /* number_of_calls */, - RtecScheduler::Dependency_Type_t /* dependency_type */, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Dependency_Type_t /* dependency_type */ + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -231,8 +231,8 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */, CORBA::Long /* maximum_priority */, RtecScheduler::RT_Info_Set_out /* infos */, RtecScheduler::Config_Info_Set_out /* configs */, - RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */, - CORBA::Environment &) + RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, @@ -250,8 +250,8 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */, void ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& priority, - RtecScheduler::Dispatching_Type_t & d_type, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Dispatching_Type_t & d_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::UNKNOWN_PRIORITY_LEVEL)) @@ -284,7 +284,7 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit // to the number returned, inclusive. RtecScheduler::Preemption_Priority_t -ACE_Runtime_Scheduler::last_scheduled_priority (CORBA::Environment &ACE_TRY_ENV) +ACE_Runtime_Scheduler::last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED)) { diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h index 411f6064363..61c7f6de038 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h @@ -39,22 +39,22 @@ public: ACE_Scheduler_Factory::POD_RT_Info rt_info[]); // Constructor. Initialize the data from the POD_RT_Info array. - virtual RtecScheduler::handle_t create (const char * entry_point, - CORBA::Environment &_env) + virtual RtecScheduler::handle_t create (const char * entry_point + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)); // Create an RT_Info. In the config run scheduler this actually constructs // a new RT_Info. Here, we just return its handle, or an error value if // it's not present. - virtual RtecScheduler::handle_t lookup (const char * entry_point, - CORBA::Environment &_env) + virtual RtecScheduler::handle_t lookup (const char * entry_point + TAO_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException)); // Lookup a handle for an RT_Info, and return its handle, or an error // value if it's not present. - virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle, - CORBA::Environment &_env) + virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); // Return a pointer to the RT_Info corresponding to the passed handle. @@ -68,8 +68,8 @@ public: RtecScheduler::Importance_t importance, RtecScheduler::Quantum_t quantum, CORBA::Long threads, - RtecScheduler::Info_Type_t info_type, - CORBA::Environment &_env) + RtecScheduler::Info_Type_t info_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); // Set characteristics of the RT_Info corresponding to the passed handle. @@ -77,8 +77,8 @@ public: virtual void priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &_env) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -88,8 +88,8 @@ public: virtual void entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &_env) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -99,8 +99,8 @@ public: virtual void add_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type, - CORBA::Environment &_env) + RtecScheduler::Dependency_Type_t dependency_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); // In the config run scheduler, this method registers a dependency between @@ -110,8 +110,8 @@ public: CORBA::Long maximum_priority, RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, - RtecScheduler::Scheduling_Anomaly_Set_out anomalies, - CORBA::Environment &_env) + RtecScheduler::Scheduling_Anomaly_Set_out anomalies + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, @@ -122,14 +122,14 @@ public: virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& o_priority, - RtecScheduler::Dispatching_Type_t & d_type, - CORBA::Environment &_env) + RtecScheduler::Dispatching_Type_t & d_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::UNKNOWN_PRIORITY_LEVEL)); // Provides the thread priority and queue type for the given priority level. - virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (CORBA::Environment &_env) + virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED)); // Returns the last priority number assigned to an operation in the diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index 6f7eb803a6b..5742ba7d84f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -118,8 +118,8 @@ TAO_IIOP_SSL_Connector::close (void) int TAO_IIOP_SSL_Connector::connect ( TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc, - CORBA::Environment &) + TAO_Transport_Descriptor_Interface *desc + TAO_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h index 29cdb1686a6..e4e999675f5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -52,8 +52,8 @@ public: int open (TAO_ORB_Core *orb_core); int close (void); int connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc, - CORBA::Environment &ACE_TRY_ENV); + TAO_Transport_Descriptor_Interface *desc + TAO_ENV_ARG_DECL); public: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index e9bd1ace510..8957c05b9d7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -123,8 +123,8 @@ TAO_SSLIOP_Connector::close (void) int TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc, - CORBA::Environment &ACE_TRY_ENV) + TAO_Transport_Descriptor_Interface *desc + TAO_ENV_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -150,13 +150,13 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, // Check if the user overrode the default establishment of trust // policy for the current object. CORBA::Policy_var policy = - invocation->stub ()->get_policy (Security::SecEstablishTrustPolicy, - ACE_TRY_ENV); + invocation->stub ()->get_policy (Security::SecEstablishTrustPolicy + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); SecurityLevel2::EstablishTrustPolicy_var trust_policy = - SecurityLevel2::EstablishTrustPolicy::_narrow (policy.in (), - ACE_TRY_ENV); + SecurityLevel2::EstablishTrustPolicy::_narrow (policy.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // We use a pointer and temporary to make it obvious to determine @@ -167,7 +167,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, Security::EstablishTrust tmp_trust = { 0 , 0 }; if (!CORBA::is_nil (trust_policy.in ())) { - tmp_trust = trust_policy->trust (ACE_TRY_ENV); + tmp_trust = trust_policy->trust (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); trust = &tmp_trust; @@ -196,13 +196,13 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, // Check if the user overrode the default Quality-of-Protection for // the current object. - policy = invocation->stub ()->get_policy (Security::SecQOPPolicy, - ACE_TRY_ENV); + policy = invocation->stub ()->get_policy (Security::SecQOPPolicy + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); SecurityLevel2::QOPPolicy_var qop_policy = - SecurityLevel2::QOPPolicy::_narrow (policy.in (), - ACE_TRY_ENV); + SecurityLevel2::QOPPolicy::_narrow (policy.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Temporary variable used to avoid overwriting the default value @@ -211,7 +211,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, if (!CORBA::is_nil (qop_policy.in ())) { - Security::QOP qop = qop_policy->qop (ACE_TRY_ENV); + Security::QOP qop = qop_policy->qop (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (qop == Security::SecQOPNoProtection) @@ -253,8 +253,8 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, int result = this->ssliop_connect (ssl_endpoint, trust, invocation, - desc, - ACE_TRY_ENV); + desc + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result != 0) @@ -262,15 +262,15 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, } return this->iiop_connect (ssl_endpoint, - invocation, - ACE_TRY_ENV); + invocation + TAO_ENV_ARG_PARAMETER); } return this->ssliop_connect (ssl_endpoint, trust, invocation, - desc, - ACE_TRY_ENV); + desc + TAO_ENV_ARG_PARAMETER); } @@ -293,7 +293,7 @@ TAO_SSLIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_SSLIOP_Connector::make_profile (CORBA::Environment &ACE_TRY_ENV) +TAO_SSLIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL) { // The endpoint should be of the form: // N.n@host:port/object_key @@ -316,8 +316,8 @@ TAO_SSLIOP_Connector::make_profile (CORBA::Environment &ACE_TRY_ENV) int TAO_SSLIOP_Connector::iiop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, - TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV) + TAO_GIOP_Invocation *invocation + TAO_ENV_ARG_DECL) { const SSLIOP::SSL &ssl_component = ssl_endpoint->ssl_component (); @@ -351,16 +351,16 @@ TAO_SSLIOP_Connector::iiop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, // Note that the IIOP-only transport descriptor is used! return this->TAO_IIOP_SSL_Connector::connect (invocation, - &iiop_desc, - ACE_TRY_ENV); + &iiop_desc + TAO_ENV_ARG_PARAMETER); } int TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, Security::EstablishTrust *trust, TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc, - CORBA::Environment &ACE_TRY_ENV) + TAO_Transport_Descriptor_Interface *desc + TAO_ENV_ARG_DECL) { TAO_Transport *&transport = invocation->transport (); ACE_Time_Value *max_wait_time = invocation->max_wait_time (); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h index 9b3d1e64315..5c11930cfc4 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h @@ -58,8 +58,8 @@ public: virtual int open (TAO_ORB_Core *orb_core); virtual int close (void); virtual int connect (TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc, - CORBA::Environment &ACE_TRY_ENV); + TAO_Transport_Descriptor_Interface *desc + TAO_ENV_ARG_DECL); virtual TAO_Profile *create_profile (TAO_InputCDR& cdr); //@} @@ -70,22 +70,22 @@ protected: * * Please check the documentation in Pluggable.h. */ - virtual TAO_Profile * make_profile (CORBA::Environment &ACE_TRY_ENV); + virtual TAO_Profile * make_profile (TAO_ENV_SINGLE_ARG_DECL); /// IIOP-specific connection establishment. /** * @note The IIOP endpoint is extracted from the SSLIOP endpoint. */ int iiop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint, - TAO_GIOP_Invocation *invocation, - CORBA::Environment &ACE_TRY_ENV); + TAO_GIOP_Invocation *invocation + TAO_ENV_ARG_DECL); /// SSLIOP-specific connection establishment. int ssliop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint, Security::EstablishTrust *trust, TAO_GIOP_Invocation *invocation, - TAO_Transport_Descriptor_Interface *desc, - CORBA::Environment &ACE_TRY_ENV); + TAO_Transport_Descriptor_Interface *desc + TAO_ENV_ARG_DECL); public: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp index 2a27a9d3476..896c4041c50 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp @@ -29,7 +29,7 @@ TAO_SSLIOP_Current::~TAO_SSLIOP_Current (void) SSLIOP::ASN_1_Cert * TAO_SSLIOP_Current::get_peer_certificate ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, SSLIOP::Current::NoContext)) { @@ -63,7 +63,7 @@ TAO_SSLIOP_Current::get_peer_certificate ( SSLIOP::SSL_Cert * TAO_SSLIOP_Current::get_peer_certificate_chain ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, SSLIOP::Current::NoContext)) { @@ -96,7 +96,7 @@ TAO_SSLIOP_Current::get_peer_certificate_chain ( } CORBA::Boolean -TAO_SSLIOP_Current::no_context (CORBA::Environment &) +TAO_SSLIOP_Current::no_context (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return (this->implementation () == 0 ? 1 : 0); @@ -131,16 +131,16 @@ TAO_SSLIOP_Current::teardown (TAO_SSLIOP_Current_Impl *prev_impl, TAO_SSLIOP_Current_ptr TAO_SSLIOP_Current::_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL) { - return TAO_SSLIOP_Current::_unchecked_narrow (obj, ACE_TRY_ENV); + return TAO_SSLIOP_Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); } TAO_SSLIOP_Current_ptr TAO_SSLIOP_Current::_unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &) + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return TAO_SSLIOP_Current::_nil (); @@ -246,11 +246,11 @@ tao_TAO_SSLIOP_Current_nil ( TAO_SSLIOP_Current_ptr tao_TAO_SSLIOP_Current_narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object *p + TAO_ENV_ARG_DECL ) { - return TAO_SSLIOP_Current::_narrow (p, ACE_TRY_ENV); + return TAO_SSLIOP_Current::_narrow (p TAO_ENV_ARG_PARAMETER); } CORBA::Object * @@ -374,11 +374,11 @@ TAO_SSLIOP_Current_var::tao_nil (void) ::TAO_SSLIOP_Current_ptr TAO_SSLIOP_Current_var::tao_narrow ( - CORBA::Object *p, - CORBA::Environment &ACE_TRY_ENV + CORBA::Object *p + TAO_ENV_ARG_DECL ) { - return ::TAO_SSLIOP_Current::_narrow (p, ACE_TRY_ENV); + return ::TAO_SSLIOP_Current::_narrow (p TAO_ENV_ARG_PARAMETER); } CORBA::Object * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index afdedfac893..7c27bf20d1d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -63,7 +63,7 @@ public: /// Return the peer certificate associated with the current /// request. virtual SSLIOP::ASN_1_Cert * get_peer_certificate ( - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, SSLIOP::Current::NoContext)); @@ -75,7 +75,7 @@ public: /// certficate. However, the certificate chain on the server side /// does NOT contain the peer (client) certificate. virtual SSLIOP::SSL_Cert * get_peer_certificate_chain ( - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, SSLIOP::Current::NoContext)); @@ -84,7 +84,7 @@ public: /// means of determining whether or not SSL session state is /// available. virtual CORBA::Boolean no_context ( - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the TSS slot ID assigned to this object. @@ -117,16 +117,14 @@ public: static TAO_SSLIOP_Current_ptr _duplicate (TAO_SSLIOP_Current_ptr obj); static TAO_SSLIOP_Current_ptr _narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + static TAO_SSLIOP_Current_ptr _unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + static TAO_SSLIOP_Current_ptr _nil (void) { @@ -198,8 +196,8 @@ public: static void tao_release (TAO_SSLIOP_Current_ptr); static TAO_SSLIOP_Current_ptr tao_nil (void); static TAO_SSLIOP_Current_ptr tao_narrow ( - CORBA::Object *, - CORBA::Environment & + CORBA::Object * + TAO_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp index 81912bd200e..cfcb9edebab 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp @@ -21,8 +21,8 @@ TAO_SSLIOP_Current_Impl::~TAO_SSLIOP_Current_Impl (void) Security::AttributeList * TAO_SSLIOP_Current_Impl::get_attributes ( - const Security::AttributeTypeList &attributes, - CORBA::Environment &ACE_TRY_ENV) + const Security::AttributeTypeList &attributes + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong len = attributes.length (); @@ -129,7 +129,7 @@ TAO_SSLIOP_Current_Impl::get_attributes ( SecurityLevel2::ReceivedCredentials_ptr TAO_SSLIOP_Current_Impl::received_credentials ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h index 1db58a68033..db6de036f3d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h @@ -49,14 +49,14 @@ public: /// SSLIOP-specific version of the /// SecurityLevel1::Current::get_attributes() method. virtual Security::AttributeList * get_attributes ( - const Security::AttributeTypeList &attributes, - CORBA::Environment &ACE_TRY_ENV) + const Security::AttributeTypeList &attributes + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// SSLIOP-specific version of the /// SecurityLevel2::Current::received_credentials() method. virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the SSL peer certificate associated with the diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index be2dac6c7fb..ddba949a6b3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -165,7 +165,7 @@ TAO_SSLIOP_Protocol_Factory::init (int argc, int TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // @todo: This hard-coding should be fixed once SECIOP is @@ -183,8 +183,8 @@ TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void) PortableInterceptor::ORBInitializer_var initializer = tmp; - PortableInterceptor::register_orb_initializer (initializer.in (), - ACE_TRY_ENV); + PortableInterceptor::register_orb_initializer (initializer.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register the SSLIOP ORB initializer. @@ -201,8 +201,8 @@ TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void) //PortableInterceptor::ORBInitializer_var initializer = tmp; initializer = tmp; - PortableInterceptor::register_orb_initializer (initializer.in (), - ACE_TRY_ENV); + PortableInterceptor::register_orb_initializer (initializer.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp index 7959cc18bfd..56ced5f918f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp @@ -46,8 +46,6 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - // The current upcall is not being performed through an SSL // connection. If server is configured to disallow insecure // invocations then throw a CORBA::NO_PERMISSION exception. @@ -58,7 +56,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts ( // accept or reject requests on a per-object basis // instead on a per-endpoint basis. CORBA::Boolean no_ssl = - this->ssliop_current_->no_context (ACE_TRY_ENV); + this->ssliop_current_->no_context (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (no_ssl && this->no_protection_ == 0) @@ -72,7 +70,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts ( // exception. Otherwise, it will return a DER encoded X509 // certificate. SSLIOP::ASN_1_Cert_var cert = - this->ssliop_current_->get_peer_certificate (ACE_TRY_ENV); + this->ssliop_current_->get_peer_certificate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // @@ The following debugging code works but I don't think that diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index 121b72f975f..e570784bbad 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -30,11 +30,9 @@ TAO_SSLIOP_ORBInitializer::pre_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - TAO_ORBInitInfo_var tao_info = - TAO_ORBInitInfo::_narrow (info, - ACE_TRY_ENV); + TAO_ORBInitInfo::_narrow (info + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (tao_info.in ())) @@ -64,8 +62,8 @@ TAO_SSLIOP_ORBInitializer::pre_init ( // Register the SSLIOP::Current object reference with the ORB. info->register_initial_reference ("SSLIOPCurrent", - ssliop_current.in (), - ACE_TRY_ENV); + ssliop_current.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -75,8 +73,6 @@ TAO_SSLIOP_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - // Note we do not store the SSLIOP::Current as a class member since // we need to avoid potential problems where the same // SSLIOP::Current object is shared between ORBs. Each ORB should @@ -88,11 +84,11 @@ TAO_SSLIOP_ORBInitializer::post_init ( // pre_init() method. CORBA::Object_var obj = - info->resolve_initial_references ("SSLIOPCurrent", ACE_TRY_ENV); + info->resolve_initial_references ("SSLIOPCurrent" TAO_ENV_ARG_PARAMETER); ACE_CHECK; SSLIOP::Current_var ssliop_current = - SSLIOP::Current::_narrow (obj.in (), ACE_TRY_ENV); + SSLIOP::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (ssliop_current.in ())) @@ -103,7 +99,7 @@ TAO_SSLIOP_ORBInitializer::post_init ( if (tao_current != 0) { - size_t slot = this->get_tss_slot_id (info, ACE_TRY_ENV); + size_t slot = this->get_tss_slot_id (info TAO_ENV_ARG_PARAMETER); ACE_CHECK; tao_current->tss_slot (slot); @@ -131,26 +127,26 @@ TAO_SSLIOP_ORBInitializer::post_init ( // Register the SSLIOP secure invocation server request interceptor // with the ORB. - info->add_server_request_interceptor (si_interceptor.in (), - ACE_TRY_ENV); + info->add_server_request_interceptor (si_interceptor.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } size_t TAO_SSLIOP_ORBInitializer::get_tss_slot_id ( - PortableInterceptor::ORBInitInfo_ptr info, - CORBA::Environment &ACE_TRY_ENV) + PortableInterceptor::ORBInitInfo_ptr info + TAO_ENV_ARG_DECL) { // Obtain the Security Service TSS slot ID from the SecurityCurrent // object. CORBA::Object_var obj = - info->resolve_initial_references ("SecurityCurrent", - ACE_TRY_ENV); + info->resolve_initial_references ("SecurityCurrent" + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); SecurityLevel2::Current_var current = - SecurityLevel2::Current::_narrow (obj.in (), - ACE_TRY_ENV); + SecurityLevel2::Current::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); TAO_Security_Current *security_current = diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h index 9820576dc41..85df8334ac2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h @@ -62,8 +62,8 @@ private: // Obtain the TSS slot ID assigned to the "SSLIOPCurrent" object. size_t get_tss_slot_id ( - PortableInterceptor::ORBInitInfo_ptr info, - CORBA::Environment &ACE_TRY_ENV); + PortableInterceptor::ORBInitInfo_ptr info + TAO_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp index 5da641d7c2f..17f3c2aa201 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp @@ -19,7 +19,7 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core, TAO_IIOP_Properties *tcp_properties, TAO_SSLIOP_Connection_Handler_State &s) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Go straight to the object_ref_table in the ORB Core to avoid @@ -28,21 +28,21 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core, // (happens on the client side). CORBA::Object_var obj = orb_core->object_ref_table ().resolve_initial_references ( - "SSLIOPCurrent", - ACE_TRY_ENV); + "SSLIOPCurrent" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; SSLIOP::Current_var current = - SSLIOP::Current::_narrow (obj.in (), - ACE_TRY_ENV); + SSLIOP::Current::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (current.in ())) ACE_TRY_THROW (CORBA::INV_OBJREF ()); TAO_SSLIOP_Current_var tao_current = - TAO_SSLIOP_Current::_narrow (current.in (), - ACE_TRY_ENV); + TAO_SSLIOP_Current::_narrow (current.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (tao_current.in ())) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index bafa3df4aaa..8fdf9cde9ee 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -33,8 +33,8 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void) } RtecScheduler::handle_t -ACE_Config_Scheduler::create (const char * entry_point, - CORBA::Environment &) +ACE_Config_Scheduler::create (const char * entry_point + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)) { @@ -85,8 +85,8 @@ ACE_Config_Scheduler::create (const char * entry_point, } RtecScheduler::handle_t -ACE_Config_Scheduler::lookup (const char * entry_point, - CORBA::Environment &) +ACE_Config_Scheduler::lookup (const char * entry_point + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecScheduler::RT_Info* rt_info = 0; @@ -107,8 +107,8 @@ ACE_Config_Scheduler::lookup (const char * entry_point, } RtecScheduler::RT_Info* -ACE_Config_Scheduler::get (RtecScheduler::handle_t handle, - CORBA::Environment &) +ACE_Config_Scheduler::get (RtecScheduler::handle_t handle + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -143,8 +143,8 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle, RtecScheduler::Importance_t importance, RtecScheduler::Quantum_t quantum, CORBA::Long threads, - RtecScheduler::Info_Type_t info_type, - CORBA::Environment &) + RtecScheduler::Info_Type_t info_type + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -175,14 +175,12 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle, void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &TAO_IN_ENV) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) { - ACE_UNUSED_ARG (TAO_IN_ENV); - if (impl->priority (handle, priority, p_subpriority, p_priority) == -1) { ACE_ERROR ((LM_ERROR, @@ -194,28 +192,26 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle, void ACE_Config_Scheduler::entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &TAO_IN_ENV) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) { - this->priority (lookup (entry_point, TAO_IN_ENV), - priority, p_subpriority, p_priority, - TAO_IN_ENV); + this->priority (lookup (entry_point TAO_ENV_ARG_PARAMETER), + priority, p_subpriority, p_priority + TAO_ENV_ARG_PARAMETER); } void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t - dependency_type, - CORBA::Environment &TAO_IN_ENV) + dependency_type + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { - ACE_UNUSED_ARG (TAO_IN_ENV); - RtecScheduler::RT_Info* rt_info = 0; switch (impl->lookup_rt_info (handle, rt_info)) { @@ -247,15 +243,13 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, - RtecScheduler::Scheduling_Anomaly_Set_out anomalies, - CORBA::Environment &TAO_IN_ENV) + RtecScheduler::Scheduling_Anomaly_Set_out anomalies + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, RtecScheduler::TASK_COUNT_MISMATCH)) { - ACE_UNUSED_ARG (TAO_IN_ENV); - // Initialize the scheduler implementation. impl->init (minimum_priority, maximum_priority); @@ -450,14 +444,12 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& priority, - RtecScheduler::Dispatching_Type_t & d_type, - CORBA::Environment &TAO_IN_ENV) + RtecScheduler::Dispatching_Type_t & d_type + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::UNKNOWN_PRIORITY_LEVEL)) { - ACE_UNUSED_ARG (TAO_IN_ENV); - if (impl->dispatch_configuration (p_priority, priority, d_type) == -1) { ACE_ERROR ((LM_ERROR, @@ -470,12 +462,10 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri RtecScheduler::Preemption_Priority_t -ACE_Config_Scheduler::last_scheduled_priority (CORBA::Environment &TAO_IN_ENV) +ACE_Config_Scheduler::last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED)) { - ACE_UNUSED_ARG (TAO_IN_ENV); - RtecScheduler::Preemption_Priority_t priority = impl->minimum_priority_queue (); if (priority < 0) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index aca68a7f3e5..ab2efe18810 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -36,16 +36,16 @@ public: ACE_Config_Scheduler (void); virtual ~ACE_Config_Scheduler (void); - virtual RtecScheduler::handle_t create (const char * entry_point, - CORBA::Environment &_env) + virtual RtecScheduler::handle_t create (const char * entry_point + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)); - virtual RtecScheduler::handle_t lookup (const char * entry_point, - CORBA::Environment &_env) + virtual RtecScheduler::handle_t lookup (const char * entry_point + TAO_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException)); - virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle, - CORBA::Environment &_env) + virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); virtual void set (RtecScheduler::handle_t handle, @@ -57,15 +57,15 @@ public: RtecScheduler::Importance_t importance, RtecScheduler::Quantum_t quantum, CORBA::Long threads, - RtecScheduler::Info_Type_t info_type, - CORBA::Environment &_env) + RtecScheduler::Info_Type_t info_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); virtual void priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &_env) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -73,8 +73,8 @@ public: virtual void entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &_env) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -82,8 +82,8 @@ public: virtual void add_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type, - CORBA::Environment &_env) + RtecScheduler::Dependency_Type_t dependency_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); @@ -91,8 +91,8 @@ public: CORBA::Long maximum_priority, RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, - RtecScheduler::Scheduling_Anomaly_Set_out anomalies, - CORBA::Environment &_env) + RtecScheduler::Scheduling_Anomaly_Set_out anomalies + TAO_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, @@ -100,15 +100,15 @@ public: virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& priority, - RtecScheduler::Dispatching_Type_t & d_type, - CORBA::Environment &_env) + RtecScheduler::Dispatching_Type_t & d_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::UNKNOWN_PRIORITY_LEVEL)); // provide the thread priority and queue type for the given priority level virtual RtecScheduler::Preemption_Priority_t - last_scheduled_priority (CORBA::Environment &_env) + last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED)); // Returns the last priority number assigned to an operation in the diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index c9b727cc3e3..22449341278 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -88,7 +88,7 @@ TAO_Reconfig_Scheduler (int config_count, this->init (config_count, config_infos, rt_info_count, rt_infos, dependency_count, dependency_infos, - stability_flags, ACE_TRY_ENV); + stability_flags TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, corba_sysex) @@ -109,8 +109,8 @@ init (int config_count, ACE_Scheduler_Factory::POD_RT_Info rt_info[], int dependency_count, ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[], - u_long stability_flags, - CORBA::Environment &ACE_TRY_ENV) + u_long stability_flags + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::UNKNOWN_TASK, @@ -124,7 +124,7 @@ init (int config_count, int result = 0; // Clear out the previous entries, if any. - this->close (ACE_TRY_ENV); + this->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // (Re)initialize using the new settings. @@ -184,8 +184,8 @@ init (int config_count, for (int num_rt_infos = 0; num_rt_infos < rt_info_count; ++num_rt_infos) { new_rt_info = create_i (rt_info [num_rt_infos].entry_point, - rt_info [num_rt_infos].handle, - ACE_TRY_ENV); + rt_info [num_rt_infos].handle + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Fill in the portions to which the user has access. @@ -217,8 +217,8 @@ init (int config_count, add_dependency_i (dependency_info [dependency_count_].info_that_depends, dependency_info [dependency_count_].info_depended_on, dependency_info [dependency_count_].number_of_calls, - dependency_info [dependency_count_].dependency_type, - ACE_TRY_ENV); + dependency_info [dependency_count_].dependency_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -233,7 +233,7 @@ init (int config_count, // Closes the scheduler, releasing all current resources. template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void -TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (CORBA::Environment &ACE_TRY_ENV) +TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)) @@ -305,8 +305,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (CORBA::Environ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::handle_t TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -create (const char *entry_point, - CORBA::Environment &ACE_TRY_ENV) +create (const char *entry_point + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::INTERNAL, @@ -317,7 +317,7 @@ create (const char *entry_point, ACE_CHECK_RETURN (0); RtecScheduler::handle_t handle = next_handle_; - create_i (entry_point, handle, ACE_TRY_ENV); + create_i (entry_point, handle TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (handle); // Set affected stability flags. @@ -334,8 +334,8 @@ create (const char *entry_point, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::handle_t TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -lookup (const char * entry_point, - CORBA::Environment &ACE_TRY_ENV) +lookup (const char * entry_point + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)) @@ -345,7 +345,7 @@ lookup (const char * entry_point, ACE_CHECK_RETURN (0); RtecScheduler::handle_t handle; - handle = this->lookup_i (entry_point, ACE_TRY_ENV); + handle = this->lookup_i (entry_point TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (handle); return handle; @@ -357,8 +357,8 @@ lookup (const char * entry_point, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::RT_Info * TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -get (RtecScheduler::handle_t handle, - CORBA::Environment &ACE_TRY_ENV) +get (RtecScheduler::handle_t handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)) @@ -401,8 +401,8 @@ set (RtecScheduler::handle_t handle, RtecScheduler::Importance_t importance, RtecScheduler::Quantum_t quantum, CORBA::Long threads, - RtecScheduler::Info_Type_t info_type, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Info_Type_t info_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::INTERNAL, @@ -505,8 +505,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -544,8 +544,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -556,14 +556,14 @@ entry_point_priority (const char * entry_point, ACE_CHECK; RtecScheduler::handle_t handle = - this->lookup_i (entry_point, ACE_TRY_ENV); + this->lookup_i (entry_point TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->priority_i (handle, priority, subpriority, - p_priority, - ACE_TRY_ENV); + p_priority + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -576,8 +576,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependency */, RtecScheduler::handle_t dependency /* RT_Info on which it depends */, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Dependency_Type_t dependency_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::UNKNOWN_TASK)) @@ -588,7 +588,7 @@ add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependenc // Delegate to the internal method. add_dependency_i (handle, dependency, number_of_calls, - dependency_type, ACE_TRY_ENV); + dependency_type TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Since the call graph topology has changed, set *all* @@ -610,8 +610,8 @@ compute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, - RtecScheduler::Scheduling_Anomaly_Set_out anomalies, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Scheduling_Anomaly_Set_out anomalies + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -640,16 +640,16 @@ compute_scheduling (CORBA::Long minimum_priority, if (this->stability_flags_ & SCHED_PROPAGATION_NOT_STABLE) { // Traverse dependency graph, assigning a topological ordering and identifying threads. - dfs_traverse_i (ACE_TRY_ENV); + dfs_traverse_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Sort an array of RT_info handles in topological order, check // for loops using the strongly connected components algorithm. - detect_cycles_i (ACE_TRY_ENV); + detect_cycles_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Propagate effective execution time and period, set total frame size. - propagate_characteristics_i (ACE_TRY_ENV); + propagate_characteristics_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -658,14 +658,14 @@ compute_scheduling (CORBA::Long minimum_priority, // Sort operations by urgency (done by strategy), then // assign priorities and subpriorities in one pass. // Sets last scheduled priority. - assign_priorities_i (ACE_TRY_ENV); + assign_priorities_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (this->stability_flags_ & SCHED_UTILIZATION_NOT_STABLE) { // Compute utilization, set last feasible priority. - compute_utilization_i (ACE_TRY_ENV); + compute_utilization_i (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -736,8 +736,8 @@ void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& t_priority, - RtecScheduler::Dispatching_Type_t & d_type, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Dispatching_Type_t & d_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -773,7 +773,7 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::Preemption_Priority_t TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -last_scheduled_priority (CORBA::Environment &ACE_TRY_ENV) +last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::NOT_SCHEDULED)) @@ -802,8 +802,8 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::RT_Info * TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: create_i (const char *entry_point, - RtecScheduler::handle_t handle, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::handle_t handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::INTERNAL)) @@ -985,8 +985,8 @@ set_i (RtecScheduler::RT_Info *rt_info, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::handle_t TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -lookup_i (const char * entry_point, - CORBA::Environment &ACE_TRY_ENV) +lookup_i (const char * entry_point + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -1008,8 +1008,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: priority_i (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) @@ -1040,8 +1040,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the dependency */, RtecScheduler::handle_t dependency /* RT_Info on which it depends */, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Dependency_Type_t dependency_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::UNKNOWN_TASK)) @@ -1064,8 +1064,8 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende dependency, // called handle calling_dependency_set_map_, // calling map number_of_calls, - dependency_type, - ACE_TRY_ENV); + dependency_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Add the called dependency map entry @@ -1073,8 +1073,8 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende handle, // calling handle called_dependency_set_map_, // called map number_of_calls, - dependency_type, - ACE_TRY_ENV); + dependency_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; break; @@ -1088,8 +1088,8 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende handle, // called handle calling_dependency_set_map_, // calling map number_of_calls, - dependency_type, - ACE_TRY_ENV); + dependency_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Add the called dependency map entry @@ -1097,8 +1097,8 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende dependency, // calling handle called_dependency_set_map_, // called map number_of_calls, - dependency_type, - ACE_TRY_ENV); + dependency_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; break; @@ -1123,8 +1123,8 @@ map_dependency_i (RtecScheduler::handle_t key, ACE_Equal_To<RtecScheduler::handle_t>, ACE_LOCK> & map, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Dependency_Type_t dependency_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -1162,7 +1162,7 @@ map_dependency_i (RtecScheduler::handle_t key, // has_unresolved_remote_dependencies_, has_unresolved_local_dependencies_, template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -dfs_traverse_i (CORBA::Environment &ACE_TRY_ENV) +dfs_traverse_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL)) { @@ -1197,7 +1197,7 @@ dfs_traverse_i (CORBA::Environment &ACE_TRY_ENV) // checks for loops, marks unresolved remote dependencies. template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -detect_cycles_i (CORBA::Environment &ACE_TRY_ENV) +detect_cycles_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::CYCLIC_DEPENDENCIES)) @@ -1237,7 +1237,7 @@ detect_cycles_i (CORBA::Environment &ACE_TRY_ENV) // Propagates effective execution time and period, sets total frame size. template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -propagate_characteristics_i (CORBA::Environment &ACE_TRY_ENV) +propagate_characteristics_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES, @@ -1275,7 +1275,7 @@ propagate_characteristics_i (CORBA::Environment &ACE_TRY_ENV) // Sets last scheduled priority. template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -assign_priorities_i (CORBA::Environment &ACE_TRY_ENV) +assign_priorities_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::DUPLICATE_NAME)) @@ -1383,7 +1383,7 @@ assign_priorities_i (CORBA::Environment &ACE_TRY_ENV) // Compute utilization, set last feasible priority. template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -compute_utilization_i (CORBA::Environment &ACE_TRY_ENV) +compute_utilization_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL)) { diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h index d7d93f12caa..3d5e7c090fd 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h @@ -93,8 +93,8 @@ public: ACE_Scheduler_Factory::POD_RT_Info rt_info[], int dependency_count, ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[], - u_long stability_flags, - CORBA::Environment &_env) + u_long stability_flags + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::UNKNOWN_TASK, @@ -102,14 +102,14 @@ public: RtecScheduler::INTERNAL)); // Initializes the scheduler with the passed information. - void close (CORBA::Environment &_env) + void close (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)); // Closes the scheduler, releasing all current resources. - virtual RtecScheduler::handle_t create (const char * entry_point, - CORBA::Environment &_env) + virtual RtecScheduler::handle_t create (const char * entry_point + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::INTERNAL, @@ -119,16 +119,16 @@ public: // RT_Info is returned. If the RT_Info already exists, an exception // is thrown. - virtual RtecScheduler::handle_t lookup (const char * entry_point, - CORBA::Environment &_env) + virtual RtecScheduler::handle_t lookup (const char * entry_point + TAO_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)); // Lookup a handle for an RT_Info, and return its handle, or an error // value if it's not present. - virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle, - CORBA::Environment &_env) + virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)); @@ -143,8 +143,8 @@ public: RtecScheduler::Importance_t importance, RtecScheduler::Quantum_t quantum, CORBA::Long threads, - RtecScheduler::Info_Type_t info_type, - CORBA::Environment &_env) + RtecScheduler::Info_Type_t info_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::INTERNAL, @@ -154,8 +154,8 @@ public: virtual void priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &_env) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -166,8 +166,8 @@ public: virtual void entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &_env) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -178,8 +178,8 @@ public: virtual void add_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type, - CORBA::Environment &_env) + RtecScheduler::Dependency_Type_t dependency_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::UNKNOWN_TASK)); @@ -189,8 +189,8 @@ public: CORBA::Long maximum_priority, RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, - RtecScheduler::Scheduling_Anomaly_Set_out anomalies, - CORBA::Environment &_env) + RtecScheduler::Scheduling_Anomaly_Set_out anomalies + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -205,15 +205,15 @@ public: virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& o_priority, - RtecScheduler::Dispatching_Type_t & d_type, - CORBA::Environment &_env) + RtecScheduler::Dispatching_Type_t & d_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::UNKNOWN_PRIORITY_LEVEL)); // Provides the thread priority and queue type for the given priority level. - virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (CORBA::Environment &_env) + virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::NOT_SCHEDULED)); @@ -287,8 +287,8 @@ protected: // Flags indicating stability conditions of schedule. virtual RtecScheduler::RT_Info * create_i (const char * entry_point, - RtecScheduler::handle_t handle, - CORBA::Environment &_env) + RtecScheduler::handle_t handle + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::INTERNAL)); @@ -309,8 +309,8 @@ protected: RtecScheduler::Info_Type_t info_type); // Internal method to set characteristics of the passed RT_Info. - virtual RtecScheduler::handle_t lookup_i (const char * entry_point, - CORBA::Environment &_env) + virtual RtecScheduler::handle_t lookup_i (const char * entry_point + TAO_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); // Internal method to look up a handle for an RT_Info, and return @@ -319,8 +319,8 @@ protected: virtual void priority_i (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, - RtecScheduler::Preemption_Priority_t& p_priority, - CORBA::Environment &_env) + RtecScheduler::Preemption_Priority_t& p_priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -330,8 +330,8 @@ protected: virtual void add_dependency_i (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type, - CORBA::Environment &_env) + RtecScheduler::Dependency_Type_t dependency_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::UNKNOWN_TASK)); @@ -348,34 +348,34 @@ protected: ACE_Equal_To<RtecScheduler::handle_t>, ACE_LOCK> &map, CORBA::Long number_of_calls, - RtecScheduler::Dependency_Type_t dependency_type, - CORBA::Environment &env) + RtecScheduler::Dependency_Type_t dependency_type + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); // This method installs a dependency in a dependency set map. - virtual void dfs_traverse_i (CORBA::Environment &_env) + virtual void dfs_traverse_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL)); // Traverses dependency graph, assigning a topological ordering. // Resets DFS map entries, do DFS traversal, constructs DFS map. - virtual void detect_cycles_i (CORBA::Environment &_env) + virtual void detect_cycles_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::CYCLIC_DEPENDENCIES)); // Sorts an array of RT_info handles in topological order, then // checks for loops, marks unresolved remote dependencies. - virtual void propagate_characteristics_i (CORBA::Environment &_env) + virtual void propagate_characteristics_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES, RtecScheduler::THREAD_SPECIFICATION)); // Propagates effective execution time and period, sets total frame size. - virtual void assign_priorities_i (CORBA::Environment &_env) + virtual void assign_priorities_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::DUPLICATE_NAME)); @@ -383,7 +383,7 @@ protected: // assign priorities and subpriorities in one pass. // Sets last scheduled priority. - virtual void compute_utilization_i (CORBA::Environment &_env) + virtual void compute_utilization_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL)); // Compute utilization, set last feasible priority. diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index e0fb7c9008b..7c83d45c13d 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -86,10 +86,10 @@ static_server (void) ACE_Null_Mutex>::instance ()) == 0) return 0; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - server_ = ace_scheduler_factory_data->scheduler_._this (ACE_TRY_ENV); + server_ = ace_scheduler_factory_data->scheduler_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -122,20 +122,20 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming, // config runs. return 0; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CosNaming::Name schedule_name (1); schedule_name.length (1); schedule_name[0].id = CORBA::string_dup (name); CORBA::Object_var objref = - naming->resolve (schedule_name, - ACE_TRY_ENV); + naming->resolve (schedule_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; server_ = - RtecScheduler::Scheduler::_narrow(objref.in (), - ACE_TRY_ENV); + RtecScheduler::Scheduler::_narrow(objref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp index d03376c5459..a0cec544909 100644 --- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp @@ -17,14 +17,14 @@ TAO_EstablishTrustPolicy::~TAO_EstablishTrustPolicy (void) } CORBA::PolicyType -TAO_EstablishTrustPolicy::policy_type (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_EstablishTrustPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecEstablishTrustPolicy; } CORBA::Policy_ptr -TAO_EstablishTrustPolicy::copy (CORBA::Environment &ACE_TRY_ENV) +TAO_EstablishTrustPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_EstablishTrustPolicy *policy = 0; @@ -41,13 +41,13 @@ TAO_EstablishTrustPolicy::copy (CORBA::Environment &ACE_TRY_ENV) } void -TAO_EstablishTrustPolicy::destroy (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_EstablishTrustPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::EstablishTrust -TAO_EstablishTrustPolicy::trust (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_EstablishTrustPolicy::trust (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->trust_; diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h index ebedb814109..5fd059b6a07 100644 --- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h @@ -51,23 +51,20 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the "establish trust" value associated with this /// policy. virtual Security::EstablishTrust trust ( - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp index 495ec1e5bc7..3b306b5aaf8 100644 --- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp @@ -16,14 +16,14 @@ TAO_QOPPolicy::~TAO_QOPPolicy (void) } CORBA::PolicyType -TAO_QOPPolicy::policy_type (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_QOPPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecQOPPolicy; } CORBA::Policy_ptr -TAO_QOPPolicy::copy (CORBA::Environment &ACE_TRY_ENV) +TAO_QOPPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_QOPPolicy *policy = 0; @@ -40,13 +40,13 @@ TAO_QOPPolicy::copy (CORBA::Environment &ACE_TRY_ENV) } void -TAO_QOPPolicy::destroy (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_QOPPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::QOP -TAO_QOPPolicy::qop (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_QOPPolicy::qop (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->qop_; diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h index 1431ec768eb..0579628d355 100644 --- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h @@ -51,23 +51,19 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the Quality-of-Protection value associated with this /// policy. - virtual Security::QOP qop (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual Security::QOP qop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index 6e6335855d0..bccb5842a4d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -25,8 +25,8 @@ TAO_Security_Current::~TAO_Security_Current (void) Security::AttributeList * TAO_Security_Current::get_attributes ( - const Security::AttributeTypeList &attributes, - CORBA::Environment &ACE_TRY_ENV) + const Security::AttributeTypeList &attributes + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Security_Current_Impl *impl = this->implementation (); @@ -37,12 +37,12 @@ TAO_Security_Current::get_attributes ( if (impl == 0) ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); - return impl->get_attributes (attributes, ACE_TRY_ENV); + return impl->get_attributes (attributes TAO_ENV_ARG_PARAMETER); } SecurityLevel2::ReceivedCredentials_ptr TAO_Security_Current::received_credentials ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Security_Current_Impl *impl = this->implementation (); @@ -53,7 +53,7 @@ TAO_Security_Current::received_credentials ( if (impl == 0) ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); - return impl->received_credentials (ACE_TRY_ENV); + return impl->received_credentials (TAO_ENV_SINGLE_ARG_PARAMETER); } int @@ -61,15 +61,15 @@ TAO_Security_Current::init (void) { int result = 0; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { int argc = 0; char **argv = 0; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - this->orb_id_.in (), - ACE_TRY_ENV); + this->orb_id_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->orb_core_ = orb.in ()->orb_core (); diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index b0b0087fb9c..2dd683bf77c 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -62,8 +62,8 @@ public: /// Return the security attributes corresponding to the types in the /// given attribute type list associated with the current request. virtual Security::AttributeList * get_attributes ( - const Security::AttributeTypeList & attributes, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + const Security::AttributeTypeList & attributes + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -77,7 +77,7 @@ public: /// Return the Credentials received from the client associate with /// the current request. virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ( - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h index bbce76103c2..a911373a459 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -52,8 +52,8 @@ public: /// Return the security attributes corresponding to the types in the /// given attribute type list associated with the current request. virtual Security::AttributeList * get_attributes ( - const Security::AttributeTypeList & attributes, - CORBA::Environment &ACE_TRY_ENV) + const Security::AttributeTypeList & attributes + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; //@} @@ -67,7 +67,7 @@ public: /// Return the Credentials received from the client associate with /// the current request. virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; //@} diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index c63a5257c58..991c107ac90 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -19,14 +19,12 @@ TAO_Security_ORBInitializer::pre_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - // @@ This is busted. TAO_ORBInitInfo should do proper reference // counting. // Narrow to a TAO_ORBInitInfo object to get access to the // allocate_tss_slot_id() TAO extension. - TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info, - ACE_TRY_ENV); + TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (tao_info.in ())) @@ -43,11 +41,11 @@ TAO_Security_ORBInitializer::pre_init ( // Reserve a TSS slot in the ORB core internal TSS resources for the // thread-specific portion of Security::Current. - size_t tss_slot = tao_info->allocate_tss_slot_id (0, - ACE_TRY_ENV); + size_t tss_slot = tao_info->allocate_tss_slot_id (0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var orb_id = info->orb_id (ACE_TRY_ENV); + CORBA::String_var orb_id = info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the SecurityLevel2::Current object. @@ -66,8 +64,8 @@ TAO_Security_ORBInitializer::pre_init ( // Register the SecurityLevel2::Current object reference with the // ORB. info->register_initial_reference ("SecurityCurrent", - security_current.in (), - ACE_TRY_ENV); + security_current.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -77,17 +75,15 @@ TAO_Security_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - - this->register_policy_factories (info, - ACE_TRY_ENV); + this->register_policy_factories (info + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_Security_ORBInitializer::register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info, - CORBA::Environment &ACE_TRY_ENV) + PortableInterceptor::ORBInitInfo_ptr info + TAO_ENV_ARG_DECL) { // Register the security policy factories. @@ -101,41 +97,41 @@ TAO_Security_ORBInitializer::register_policy_factories ( // the different types of security policies. CORBA::PolicyType type; - + type = Security::SecQOPPolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecMechanismsPolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecInvocationCredentialsPolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecFeaturePolicy; // Deprecated info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecDelegationDirectivePolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecEstablishTrustPolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // ---------------------------------------------------------------- diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h index 0698058b90f..af1aecce473 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h @@ -59,8 +59,8 @@ private: /// Register Security policy factories. void register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info, - CORBA::Environment &ACE_TRY_ENV); + PortableInterceptor::ORBInitInfo_ptr info + TAO_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 9a0a617f61e..6d69fbbcd95 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -19,8 +19,6 @@ TAO_Security_PolicyFactory::create_policy ( ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { - TAO_ENV_ARG_DEFN; - // Not all security policies can be created using the // ORB::create_policy() mechanism. Only those that can be created // using that mechanism are supported by this factory. diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index 5a539fd79a1..f1e64ebe556 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp @@ -19,7 +19,7 @@ TAO_TIO::~TAO_TIO (void) // This is the get method for the attribute time interval. TimeBase::IntervalT -TAO_TIO::time_interval (CORBA::Environment &) +TAO_TIO::time_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_time_interval; @@ -33,8 +33,8 @@ TAO_TIO::time_interval (CORBA::Environment &) CosTime::OverlapType TAO_TIO::spans (CosTime::UTO_ptr uto, - CosTime::TIO_out overlap, - CORBA::Environment &ACE_TRY_ENV) + CosTime::TIO_out overlap + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; @@ -47,19 +47,19 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, TimeBase::TimeT up1 = this->time_interval ().upper_bound; - TimeBase::TimeT tmp1 = uto->time (ACE_TRY_ENV); + TimeBase::TimeT tmp1 = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - TimeBase::TimeT tmp2 = uto->inaccuracy (ACE_TRY_ENV); + TimeBase::TimeT tmp2 = uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::TimeT lb2 = tmp1 - tmp2; - tmp1 = uto->time (ACE_TRY_ENV); + tmp1 = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - tmp2 = uto->inaccuracy (ACE_TRY_ENV); + tmp2 = uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::TimeT up2 = tmp1 + tmp2; @@ -154,8 +154,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, CosTime::OverlapType TAO_TIO::overlaps (CosTime::TIO_ptr tio, - CosTime::TIO_out overlap, - CORBA::Environment & ACE_TRY_ENV) + CosTime::TIO_out overlap + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio_i = 0; @@ -254,7 +254,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, } CosTime::UTO_ptr -TAO_TIO::time (CORBA::Environment &ACE_TRY_ENV) +TAO_TIO::time (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h index 84dfa4be786..a9ed61cf860 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h @@ -46,13 +46,13 @@ public: // Destructor. virtual TimeBase::IntervalT time_interval ( - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // This is the get method for the attribute time interval. virtual CosTime::OverlapType spans (CosTime::UTO_ptr time, - CosTime::TIO_out overlap, - CORBA::Environment &env) + CosTime::TIO_out overlap + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation returns a value of type OverlapType depending on // how the interval in the object and the time range represented by @@ -62,8 +62,8 @@ public: // intervals. virtual CosTime::OverlapType overlaps (CosTime::TIO_ptr interval, - CosTime::TIO_out overlap, - CORBA::Environment &env) + CosTime::TIO_out overlap + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation returns a value of type OverlapType depending on // how the interval in the object and interval in the parameter TIO @@ -71,7 +71,7 @@ public: // parameter overlap contains the overlap interval, otherwise the // out parameter contains the gap between the two intervals. - virtual CosTime::UTO_ptr time (CORBA::Environment &env) + virtual CosTime::UTO_ptr time (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a UTO in which the inaccuracy interval is equal to the // time interval in the TIO and time value is the midpoint of the diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp index bc059965f72..2f9616ef174 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -37,7 +37,7 @@ TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void) // in a UTO. CosTime::UTO_ptr -TAO_Time_Service_Clerk::universal_time (CORBA::Environment &ACE_TRY_ENV) +TAO_Time_Service_Clerk::universal_time (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)) { @@ -59,7 +59,7 @@ TAO_Time_Service_Clerk::universal_time (CORBA::Environment &ACE_TRY_ENV) // implemented currently. CosTime::UTO_ptr -TAO_Time_Service_Clerk::secure_universal_time (CORBA::Environment &ACE_TRY_ENV) +TAO_Time_Service_Clerk::secure_universal_time (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)) { @@ -71,8 +71,8 @@ TAO_Time_Service_Clerk::secure_universal_time (CORBA::Environment &ACE_TRY_ENV) CosTime::UTO_ptr TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, - TimeBase::TdfT tdf, - CORBA::Environment &ACE_TRY_ENV) + TimeBase::TdfT tdf + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -89,8 +89,8 @@ TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time, // This creates a new UTO given a time in the UtcT form. CosTime::UTO_ptr -TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc, - CORBA::Environment &ACE_TRY_ENV) +TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -115,8 +115,8 @@ TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc, CosTime::TIO_ptr TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower, - TimeBase::TimeT upper, - CORBA::Environment &ACE_TRY_ENV) + TimeBase::TimeT upper + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h index 581ec0b2f7c..083f8a8c3b6 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h @@ -57,13 +57,13 @@ public: ~TAO_Time_Service_Clerk (void); // Destructor. - virtual CosTime::UTO_ptr universal_time (CORBA::Environment &env) + virtual CosTime::UTO_ptr universal_time (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)); // This operation returns the global time and an estimate of // inaccuracy in a UTO. - virtual CosTime::UTO_ptr secure_universal_time (CORBA::Environment &env) + virtual CosTime::UTO_ptr secure_universal_time (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)); // This operation returns the global time in a UTO only if the time @@ -73,19 +73,19 @@ public: virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, - TimeBase::TdfT tdf, - CORBA::Environment &env) + TimeBase::TdfT tdf + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This creates a new UTO based on the given parameters. - virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc, - CORBA::Environment &env) + virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This creates a new UTO given a time in the UtcT form. virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower, - TimeBase::TimeT upper, - CORBA::Environment &env) + TimeBase::TimeT upper + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This creates a new TIO with the given parameters. diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index a9004975a4d..5ba026e5798 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -19,7 +19,7 @@ TAO_Time_Service_Server::~TAO_Time_Service_Server (void) // inaccuracy in a UTO. CosTime::UTO_ptr -TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV) +TAO_Time_Service_Server::universal_time (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)) { @@ -31,7 +31,7 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV) // broadcast by the WWV radio station of the National Bureau of // Standards deliver time that is easier to handle in this // representation. UTC time is defined as : - // + // // Time Units : 100 nanosecs // Base Time : 15th October 1582 00:00:00 // Approximate range : AD 30,000 @@ -74,7 +74,7 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV) // implemented currently. CosTime::UTO_ptr -TAO_Time_Service_Server::secure_universal_time (CORBA::Environment &ACE_TRY_ENV) +TAO_Time_Service_Server::secure_universal_time (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)) { @@ -86,8 +86,8 @@ TAO_Time_Service_Server::secure_universal_time (CORBA::Environment &ACE_TRY_ENV) CosTime::UTO_ptr TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, - TimeBase::TdfT tdf, - CORBA::Environment &ACE_TRY_ENV) + TimeBase::TdfT tdf + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -106,8 +106,8 @@ TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time, // This creates a new UTO given a time in the UtcT form. CosTime::UTO_ptr -TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc, - CORBA::Environment &ACE_TRY_ENV) +TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -125,8 +125,8 @@ TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc, CosTime::TIO_ptr TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower, - TimeBase::TimeT upper, - CORBA::Environment &ACE_TRY_ENV) + TimeBase::TimeT upper + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h index 459a01e6315..62215491365 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h @@ -45,13 +45,13 @@ public: ~TAO_Time_Service_Server (void); // Destructor. - virtual CosTime::UTO_ptr universal_time (CORBA::Environment &env) + virtual CosTime::UTO_ptr universal_time (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)); // This operation returns the current system time and an estimate of // inaccuracy in a UTO. - virtual CosTime::UTO_ptr secure_universal_time (CORBA::Environment &env) + virtual CosTime::UTO_ptr secure_universal_time (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)); // This operation returns the current time in a UTO only if the time @@ -60,19 +60,19 @@ public: virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, - TimeBase::TdfT tdf, - CORBA::Environment &env) + TimeBase::TdfT tdf + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This creates a new UTO based on the given parameters. - virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc, - CORBA::Environment &env) + virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This creates a new UTO given a time in the UtcT form. virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower, - TimeBase::TimeT upper, - CORBA::Environment &env) + TimeBase::TimeT upper + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This creates a new TIO with the given parameters. diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index 642ad70baec..5b2595df2fd 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -42,7 +42,7 @@ TAO_UTO::~TAO_UTO (void) // Get Method for the readonly attribute time. TimeBase::TimeT -TAO_UTO::time (CORBA::Environment &) +TAO_UTO::time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_utc_time_.time; @@ -51,7 +51,7 @@ TAO_UTO::time (CORBA::Environment &) // Get method for the readonly attribute inaccuracy. TimeBase::InaccuracyT -TAO_UTO::inaccuracy (CORBA::Environment &) +TAO_UTO::inaccuracy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Construct the Inaccuracy from the @@ -66,7 +66,7 @@ TAO_UTO::inaccuracy (CORBA::Environment &) // Get method for the readonly attribute tdf. TimeBase::TdfT -TAO_UTO::tdf (CORBA::Environment &) +TAO_UTO::tdf (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_utc_time_.tdf; @@ -75,7 +75,7 @@ TAO_UTO::tdf (CORBA::Environment &) // Get method for the readonly attribute utc_time. TimeBase::UtcT -TAO_UTO::utc_time (CORBA::Environment &) +TAO_UTO::utc_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_utc_time_; @@ -85,7 +85,7 @@ TAO_UTO::utc_time (CORBA::Environment &) // the Base Time, UTC and Distributed Time Sync. Algos. [3]. CosTime::UTO_ptr -TAO_UTO::absolute_time (CORBA::Environment &) +TAO_UTO::absolute_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -96,21 +96,21 @@ TAO_UTO::absolute_time (CORBA::Environment &) CosTime::TimeComparison TAO_UTO::compare_time (CosTime::ComparisonType comparison_type, - CosTime::UTO_ptr uto, - CORBA::Environment &ACE_TRY_ENV) + CosTime::UTO_ptr uto + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - TimeBase::TimeT uto_time = uto->time (ACE_TRY_ENV); + TimeBase::TimeT uto_time = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::InaccuracyT this_inaccuracy = - this->inaccuracy (ACE_TRY_ENV); + this->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::InaccuracyT uto_inaccuracy = - uto->inaccuracy (ACE_TRY_ENV); + uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (comparison_type == CosTime::MidC) @@ -171,15 +171,15 @@ TAO_UTO::compare_time (CosTime::ComparisonType comparison_type, // is meaningless if the base times of UTOs are different. CosTime::TIO_ptr -TAO_UTO::time_to_interval (CosTime::UTO_ptr uto, - CORBA::Environment &ACE_TRY_ENV) +TAO_UTO::time_to_interval (CosTime::UTO_ptr uto + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; ACE_TRY { - TimeBase::TimeT uto_time = uto->time (ACE_TRY_ENV); + TimeBase::TimeT uto_time = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->time () > uto_time) @@ -216,7 +216,7 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto, // time value in the UTO. CosTime::TIO_ptr -TAO_UTO::interval (CORBA::Environment &ACE_TRY_ENV) +TAO_UTO::interval (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; @@ -224,7 +224,7 @@ TAO_UTO::interval (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { TimeBase::TimeT this_inaccuracy = - this->inaccuracy (ACE_TRY_ENV); + this->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::TimeT lower = diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h index e1191227c14..4c57b221c4c 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h @@ -56,38 +56,38 @@ public: // Destructor. virtual TimeBase::TimeT time ( - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // For the readonly attribute <time>. - virtual TimeBase::InaccuracyT inaccuracy (CORBA::Environment &env) + virtual TimeBase::InaccuracyT inaccuracy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // For the readonly attribute <inaccuracy>. - virtual TimeBase::TdfT tdf (CORBA::Environment &env) + virtual TimeBase::TdfT tdf (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // For the readonly attribute <tdf>, which is the "time displacement // factor". - virtual TimeBase::UtcT utc_time (CORBA::Environment &env) + virtual TimeBase::UtcT utc_time (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // For the readonly attribute <utc_time>. - CosTime::UTO_ptr absolute_time (CORBA::Environment &env) + CosTime::UTO_ptr absolute_time (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Absolute time = Relative time + Base time. // ?? Find out more about the Base Time, UTC and // Distributed Time Sync. Algos. [3 CosTime::TimeComparison compare_time (CosTime::ComparisonType comparison_type, - CosTime::UTO_ptr uto, - CORBA::Environment &env) + CosTime::UTO_ptr uto + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Compares the time contained in the object with the time in the // supplied uto according to the supplied comparison type. - CosTime::TIO_ptr time_to_interval (CosTime::UTO_ptr, - CORBA::Environment &env) + CosTime::TIO_ptr time_to_interval (CosTime::UTO_ptr + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a TIO representing the time interval between the time in // the object and the time in the UTO passed as a parameter. The @@ -95,7 +95,7 @@ public: // two UTOs. Inaccuracies are ignored. Note the result of this // operation is meaningless if the base times of UTOs are different. - CosTime::TIO_ptr interval (CORBA::Environment &env) + CosTime::TIO_ptr interval (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns a TIO object representing the error interval around the // time value in the UTO. diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 80ef6babdeb..7b7dac9aa22 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -52,7 +52,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, // This is a remote call. CosTime::UTO_var UTO_server = - (*value)->universal_time (ACE_TRY_ENV); + (*value)->universal_time (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -83,7 +83,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, (UTO_server->utc_time ()).tdf)); #endif - CORBA::ULongLong curr_server_time = UTO_server->time (ACE_TRY_ENV); + CORBA::ULongLong curr_server_time = UTO_server->time (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; sum += curr_server_time; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp index 3cf68ace9fd..85267dc9f6c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp @@ -7,8 +7,8 @@ ACE_RCSID(Trader, Constraint_Interpreter, "$Id$") TAO_Constraint_Interpreter:: TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, - const char* constraints, - CORBA::Environment& ACE_TRY_ENV) + const char* constraints + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalConstraint, CORBA::NO_MEMORY)) : TAO_Interpreter () @@ -37,8 +37,8 @@ TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeSt TAO_Constraint_Interpreter:: TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator, - const char* constraints, - CORBA::Environment& ACE_TRY_ENV) + const char* constraints + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalConstraint, CORBA::NO_MEMORY)) { @@ -78,8 +78,8 @@ TAO_Constraint_Interpreter::evaluate (TAO_Constraint_Evaluator& evaluator) TAO_Preference_Interpreter:: TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, - const char* preference, - CORBA::Environment& ACE_TRY_ENV) + const char* preference + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference, CORBA::NO_MEMORY)) : TAO_Interpreter () @@ -105,8 +105,8 @@ TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeSt TAO_Preference_Interpreter:: TAO_Preference_Interpreter (TAO_Constraint_Validator& validator, - const char* preference, - CORBA::Environment& ACE_TRY_ENV) + const char* preference + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference, CORBA::NO_MEMORY)) : TAO_Interpreter () diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index ce4318fd183..e34d1af6cf1 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -48,14 +48,14 @@ class TAO_Trading_Export TAO_Constraint_Interpreter : public TAO_Interpreter public: // = Initialization and termination methods. TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, - const char* constraints, - CORBA::Environment& ACE_TRY_ENV) + const char* constraints + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalConstraint, CORBA::NO_MEMORY)); TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator, - const char* constraints, - CORBA::Environment& ACE_TRY_ENV) + const char* constraints + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalConstraint, CORBA::NO_MEMORY)); // This constructor builds an expression tree representing the @@ -91,14 +91,14 @@ class TAO_Trading_Export TAO_Preference_Interpreter : public TAO_Interpreter public: // = Initialization and termination methods. TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, - const char* preference, - CORBA::Environment& ACE_TRY_ENV) + const char* preference + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference, CORBA::NO_MEMORY)); TAO_Preference_Interpreter (TAO_Constraint_Validator& validator, - const char* preference, - CORBA::Environment& ACE_TRY_ENV) + const char* preference + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference, CORBA::NO_MEMORY)); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp index e77d5d1671a..e7bc02db9c9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp @@ -294,7 +294,7 @@ TAO_Literal_Constraint (CORBA::Any* any) CORBA::TCKind corba_type = CORBA::tk_null; ACE_TRY { - corba_type = type->kind (ACE_TRY_ENV); + corba_type = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -487,7 +487,7 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type) CORBA::TCKind kind = CORBA::tk_null; ACE_TRY { - kind = type->kind (ACE_TRY_ENV); + kind = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -525,9 +525,9 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type) CORBA::TCKind kind = CORBA::tk_void; ACE_TRY_EX (label2) { - CORBA::TypeCode_var typecode = type->content_type (ACE_TRY_ENV); + CORBA::TypeCode_var typecode = type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (label2); - kind = typecode->kind (ACE_TRY_ENV); + kind = typecode->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (label2);; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp index a4cc7792cdf..2a2dddd6077 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp @@ -507,14 +507,14 @@ sequence_does_contain (CORBA::Any* sequence, // wrapper uses the [] operator to locate the target element in the // sequence. - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; CORBA::Boolean return_value = 0; CORBA::TypeCode_var type = sequence->type (); CORBA::TCKind sequence_type = CORBA::tk_void; ACE_TRY { sequence_type = - TAO_Sequence_Extracter_Base::sequence_type (type.in (), ACE_TRY_ENV); + TAO_Sequence_Extracter_Base::sequence_type (type.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -594,7 +594,7 @@ operator () (TAO_DynSequence_i& dyn_any, int return_value = 0; ACE_TRY_NEW_ENV { - CORBA::Short value = dyn_any.get_short (ACE_TRY_ENV); + CORBA::Short value = dyn_any.get_short (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return_value = (value == element); } @@ -613,7 +613,7 @@ operator () (TAO_DynSequence_i& dyn_any, int return_value = 0; ACE_TRY_NEW_ENV { - CORBA::UShort value = dyn_any.get_ushort (ACE_TRY_ENV); + CORBA::UShort value = dyn_any.get_ushort (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return_value = (value == element); } @@ -632,7 +632,7 @@ operator () (TAO_DynSequence_i& dyn_any, int return_value = 0; ACE_TRY_NEW_ENV { - CORBA::Long value = dyn_any.get_long (ACE_TRY_ENV); + CORBA::Long value = dyn_any.get_long (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return_value = (value == element); } @@ -651,7 +651,7 @@ operator () (TAO_DynSequence_i& dyn_any, int return_value = 0; ACE_TRY_NEW_ENV { - CORBA::ULong value = dyn_any.get_ulong (ACE_TRY_ENV); + CORBA::ULong value = dyn_any.get_ulong (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return_value = (value == element); } @@ -670,7 +670,7 @@ operator () (TAO_DynSequence_i& dyn_any, int return_value = 0; ACE_TRY_NEW_ENV { - CORBA::Float value = dyn_any.get_float (ACE_TRY_ENV); + CORBA::Float value = dyn_any.get_float (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return_value = (value == element); } @@ -686,7 +686,7 @@ operator () (TAO_DynSequence_i& dyn_any, int return_value = 0; ACE_TRY_NEW_ENV { - CORBA::Double value = dyn_any.get_short (ACE_TRY_ENV); + CORBA::Double value = dyn_any.get_short (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return_value = (value == element); } @@ -702,7 +702,7 @@ operator () (TAO_DynSequence_i& dyn_any, int return_value = 0; ACE_TRY_NEW_ENV { - CORBA::Boolean value = (CORBA::Boolean) dyn_any.get_short (ACE_TRY_ENV); + CORBA::Boolean value = (CORBA::Boolean) dyn_any.get_short (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return_value = (value == element); } @@ -718,7 +718,7 @@ operator () (TAO_DynSequence_i& dyn_any, int return_value = 0; ACE_TRY_NEW_ENV { - const char* value = dyn_any.get_string (ACE_TRY_ENV); + const char* value = dyn_any.get_string (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return_value = (ACE_OS::strcmp (value, element) == 0); } @@ -999,13 +999,13 @@ visit_in (TAO_Binary_Constraint* binary_in) if (right_type == TAO_SEQUENCE) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; CORBA::Boolean types_match = 0; CORBA::TCKind seq_type = CORBA::tk_void; ACE_TRY { seq_type = - TAO_Sequence_Extracter_Base::sequence_type (prop_type, ACE_TRY_ENV); + TAO_Sequence_Extracter_Base::sequence_type (prop_type TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp index 91f3f007af5..30781c68228 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp @@ -52,13 +52,13 @@ TAO_String_Hash_Key::~TAO_String_Hash_Key (void) CORBA::TCKind TAO_Sequence_Extracter_Base:: -sequence_type (CORBA::TypeCode* type_code, - CORBA::Environment& ACE_TRY_ENV) +sequence_type (CORBA::TypeCode* type_code + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Seth, why do you use a comma to separate the two statements? CORBA::TCKind return_value = CORBA::tk_void, - type_kind = type_code->kind (ACE_TRY_ENV); + type_kind = type_code->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); if (type_kind == CORBA::tk_alias @@ -68,27 +68,27 @@ sequence_type (CORBA::TypeCode* type_code, for (;;) { - CORBA::TCKind base_kind = base->kind (ACE_TRY_ENV); + CORBA::TCKind base_kind = base->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); if (base_kind == CORBA::tk_alias) { - base = base->content_type (ACE_TRY_ENV); + base = base->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); } else break; } - CORBA::TCKind base_kind = base->kind (ACE_TRY_ENV); + CORBA::TCKind base_kind = base->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); if (base_kind == CORBA::tk_sequence) { - base = base->content_type (ACE_TRY_ENV); + base = base->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); - base_kind = base->kind (ACE_TRY_ENV); + base_kind = base->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); return_value = base_kind; } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h index 7e4dce4b9ff..ed92c170db0 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h @@ -57,8 +57,8 @@ class TAO_Sequence_Extracter_Base { public: - static CORBA::TCKind sequence_type (CORBA::TypeCode* code, - CORBA::Environment& env) + static CORBA::TCKind sequence_type (CORBA::TypeCode* code + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the sequence element type for the sequence whose typecode // is <code>. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp index d192365207f..516f47b61a0 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp @@ -17,11 +17,11 @@ TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - dyn_seq.init (sequence, ACE_TRY_ENV); + dyn_seq.init (sequence TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong length = - dyn_seq.get_length (ACE_TRY_ENV); + dyn_seq.get_length (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i < length && ! return_value; i++) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp index 94b42e23a9a..a6935170056 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp @@ -148,8 +148,8 @@ remove_offer (const char* type, CORBA::ULong id) template <class LOCK_TYPE> int TAO_Offer_Database<LOCK_TYPE>:: -remove_offer (const CosTrading::OfferId offer_id, - CORBA::Environment& ACE_TRY_ENV) +remove_offer (const CosTrading::OfferId offer_id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)) { @@ -158,8 +158,8 @@ remove_offer (const CosTrading::OfferId offer_id, this->parse_offer_id (offer_id, stype, - index, - ACE_TRY_ENV); + index + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (this->remove_offer (stype, @@ -173,14 +173,14 @@ remove_offer (const CosTrading::OfferId offer_id, template <class LOCK_TYPE> CosTrading::Offer* TAO_Offer_Database<LOCK_TYPE>:: lookup_offer (const CosTrading::OfferId offer_id, - char*& type_name, - CORBA::Environment& ACE_TRY_ENV) + char*& type_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)) { CORBA::ULong index; CosTrading::Offer* offer = 0; - this->parse_offer_id (offer_id, type_name, index, ACE_TRY_ENV); + this->parse_offer_id (offer_id, type_name, index TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (offer); if ((offer = this->lookup_offer (type_name, index)) == 0) @@ -192,8 +192,8 @@ lookup_offer (const CosTrading::OfferId offer_id, template <class LOCK_TYPE> CosTrading::Offer* TAO_Offer_Database<LOCK_TYPE>:: -lookup_offer (const CosTrading::OfferId offer_id, - CORBA::Environment& ACE_TRY_ENV) +lookup_offer (const CosTrading::OfferId offer_id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)) { @@ -201,7 +201,7 @@ lookup_offer (const CosTrading::OfferId offer_id, CORBA::ULong index; CosTrading::Offer* offer = 0; - this->parse_offer_id (offer_id, type_name, index, ACE_TRY_ENV); + this->parse_offer_id (offer_id, type_name, index TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (offer); if ((offer = this->lookup_offer (type_name, index)) == 0) @@ -274,8 +274,8 @@ template <class LOCK_TYPE> void TAO_Offer_Database<LOCK_TYPE>:: parse_offer_id (const CosTrading::OfferId offer_id, char*&service_type, - CORBA::ULong& id, - CORBA::Environment& ACE_TRY_ENV) + CORBA::ULong& id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalOfferId)) { // Get service type: it is everything from 17th character to the end. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h index cd3f10808dc..92a163b37f9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h @@ -64,21 +64,21 @@ public: // Add an offer of type <type> and generate a CosTrading::OfferId // for it. Returns 0 on failure. - int remove_offer (const CosTrading::OfferId offer_id, - CORBA::Environment& _ACE_TRY_ENV) + int remove_offer (const CosTrading::OfferId offer_id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)); - CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)); // Lookup an offer whose offer_id is <offer_id>, and return // it. Otherwise, throw the appropriate exception. CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id, - char*& type_name, - CORBA::Environment& ACE_TRY_ENV) + char*& type_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)); // Lookup an offer whose OfferId is <offer_id> and return in @@ -130,8 +130,8 @@ private: static void parse_offer_id (const CosTrading::OfferId offer_id, char* &service_type, - CORBA::ULong& id, - CORBA::Environment& ACE_TRY_ENV) + CORBA::ULong& id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalOfferId)); // Take in a previously generated offer id and return the type // and id that were used to generate the offer id. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index 4be0bf71545..a6f0cf2d93e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -14,20 +14,20 @@ TAO_Offer_Iterator::~TAO_Offer_Iterator (void) } void -TAO_Offer_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_Offer_Iterator::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove self from POA PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -50,7 +50,7 @@ TAO_Query_Only_Offer_Iterator::add_offer (CosTrading::OfferId offer_id, } CORBA::ULong -TAO_Query_Only_Offer_Iterator::max_left (CORBA::Environment &) +TAO_Query_Only_Offer_Iterator::max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException, CosTrading::UnknownMaxLeft)) { @@ -59,8 +59,8 @@ TAO_Query_Only_Offer_Iterator::max_left (CORBA::Environment &) CORBA::Boolean TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n, - CosTrading::OfferSeq_out offers, - CORBA::Environment &) + CosTrading::OfferSeq_out offers + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { offers = new CosTrading::OfferSeq; @@ -94,7 +94,7 @@ TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection (void) ACE_TRY_NEW_ENV { - offer_iter->destroy (ACE_TRY_ENV); + offer_iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::release (offer_iter); @@ -118,8 +118,8 @@ add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter) CORBA::Boolean TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, - CosTrading::OfferSeq_out offers, - CORBA::Environment &ACE_TRY_ENV) + CosTrading::OfferSeq_out offers + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong offers_left = n; @@ -144,14 +144,14 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, // Retrieve the set of offers. any_left = iter->next_n (offers_left, - CosTrading::OfferSeq_out (out_offers.out ()), - ACE_TRY_ENV); + CosTrading::OfferSeq_out (out_offers.out ()) + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); // If we've exhausted this iterator, destroy it. if (any_left == 0) { - iter->destroy (ACE_TRY_ENV); + iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); CORBA::release (iter); } @@ -175,7 +175,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, } void -TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& ACE_TRY_ENV) +TAO_Offer_Iterator_Collection::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy all iterators in the collection. @@ -186,26 +186,26 @@ TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& ACE_TRY_ENV) CosTrading::OfferIterator** iter = 0; iters_iter.next (iter); - (*iter)->destroy (ACE_TRY_ENV); + (*iter)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } // Remove self from POA PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::ULong -TAO_Offer_Iterator_Collection::max_left (CORBA::Environment &ACE_TRY_ENV) +TAO_Offer_Iterator_Collection::max_left (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)) { @@ -233,7 +233,7 @@ TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void) } CORBA::ULong -TAO_Offer_Id_Iterator::max_left (CORBA::Environment &) +TAO_Offer_Id_Iterator::max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)) { @@ -241,28 +241,28 @@ TAO_Offer_Id_Iterator::max_left (CORBA::Environment &) } void -TAO_Offer_Id_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV) +TAO_Offer_Id_Iterator::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove self from POA PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::Boolean TAO_Offer_Id_Iterator::next_n (CORBA::ULong n, - CosTrading::OfferIdSeq_out _ids, - CORBA::Environment &) + CosTrading::OfferIdSeq_out _ids + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Calculate the number of Ids to be returned in this. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h index 611828503e2..d345fbcd38c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h @@ -32,7 +32,7 @@ // TAO_Offer_Iterator // ************************************************************* -class TAO_Offer_Iterator : +class TAO_Offer_Iterator : public virtual POA_CosTrading::OfferIterator, public virtual PortableServer::RefCountServantBase { @@ -56,7 +56,7 @@ public: virtual ~TAO_Offer_Iterator (void); - virtual void destroy (CORBA::Environment& ACE_TRY_ENV) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // BEGIN SPEC // The destroy operation destroys the iterator. No further @@ -69,7 +69,7 @@ public: // Add an offer to the collection of offers the iterator will // iterate over. - virtual CORBA::ULong max_left (CORBA::Environment &ACE_TRY_ENV) + virtual CORBA::ULong max_left (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)) = 0; @@ -82,8 +82,8 @@ public: // END SPEC virtual CORBA::Boolean next_n (CORBA::ULong n, - CosTrading::OfferSeq_out offers, - CORBA::Environment &ACE_TRY_ENV) + CosTrading::OfferSeq_out offers + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // BEGIN SPEC // The next_n operation returns a set of service offers in the @@ -134,13 +134,13 @@ public: virtual ~TAO_Query_Only_Offer_Iterator (void); virtual CORBA::Boolean next_n (CORBA::ULong n, - CosTrading::OfferSeq_out offers, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::OfferSeq_out offers + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Deposit at maximum n offers into the return sequence and return 1, // or return 0 if the iterator is done and no offers are returned. - virtual CORBA::ULong max_left (CORBA::Environment& ACE_TRY_ENV) + virtual CORBA::ULong max_left (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)); // Return the number of items left in the iterator. @@ -163,7 +163,7 @@ private: // TAO_Offer_Iterator_Collection // ************************************************************* -class TAO_Offer_Iterator_Collection : +class TAO_Offer_Iterator_Collection : public virtual POA_CosTrading::OfferIterator, public virtual PortableServer::RefCountServantBase // = TITLE @@ -190,16 +190,16 @@ public: virtual ~TAO_Offer_Iterator_Collection (void); virtual CORBA::Boolean next_n (CORBA::ULong n, - CosTrading::OfferSeq_out offers, - CORBA::Environment &ACE_TRY_ENV) + CosTrading::OfferSeq_out offers + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Retrieve n offers from the set of iterators. - virtual void destroy (CORBA::Environment& ACE_TRY_ENV) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroy the collection of iterators. - virtual CORBA::ULong max_left (CORBA::Environment &ACE_TRY_ENV) + virtual CORBA::ULong max_left (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)); // Determine how many offers are left in the collection. @@ -222,7 +222,7 @@ private: // TAO_Offer_Id_Iterator // ************************************************************* -class TAO_Offer_Id_Iterator : +class TAO_Offer_Id_Iterator : public virtual POA_CosTrading::OfferIdIterator, public virtual PortableServer::RefCountServantBase // = TITLE @@ -246,7 +246,7 @@ class TAO_Offer_Id_Iterator : ~TAO_Offer_Id_Iterator (void); - virtual CORBA::ULong max_left(CORBA::Environment& ACE_TRY_ENV) + virtual CORBA::ULong max_left(TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)); // The max_left operation returns the number of offer identifiers @@ -255,15 +255,15 @@ class TAO_Offer_Id_Iterator : // identifiers (e.g., if the iterator determines its set of offer // identifiers through lazy evaluation). - virtual void destroy(CORBA::Environment& ACE_TRY_ENV) + virtual void destroy(TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // The destroy operation destroys the iterator. No further // operations can be invoked on an iterator after it has been // destroyed. virtual CORBA::Boolean next_n(CORBA::ULong _n, - CosTrading::OfferIdSeq_out _ids, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::OfferIdSeq_out _ids + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // The next_n operation returns a set of offer identifiers in the // output parameter "ids." The operation returns n offer identifiers diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp index dc7688d1bb5..ee67777d024 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp @@ -39,7 +39,7 @@ add_offer (CosTrading::OfferId id, template <class MAP_LOCK_TYPE> CORBA::ULong TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>:: -max_left (CORBA::Environment&) +max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)) { @@ -49,8 +49,8 @@ max_left (CORBA::Environment&) template <class MAP_LOCK_TYPE> CORBA::Boolean TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>:: next_n (CORBA::ULong n, - CosTrading::OfferSeq_out offers, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::OfferSeq_out offers + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong ret_offers = 0; @@ -77,7 +77,7 @@ next_n (CORBA::ULong n, this->offer_ids_.dequeue_head (id); CosTrading::OfferId_var offerid_var (id); - CosTrading::Offer* offer = this->db_.lookup_offer (id, ACE_TRY_ENV); + CosTrading::Offer* offer = this->db_.lookup_offer (id TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (offer != 0) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h index 477737113f1..fb3948efa72 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h @@ -52,13 +52,13 @@ public: // destructor. virtual CORBA::Boolean next_n (CORBA::ULong n, - CosTrading::OfferSeq_out offers, - CORBA::Environment &) + CosTrading::OfferSeq_out offers + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Deposit at maximum n offers into the return sequence and return 1, // or return 0 if the iterator is done and no offers are returned. - virtual CORBA::ULong max_left (CORBA::Environment &) + virtual CORBA::ULong max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)); // Throws CosTrading::UnknownMaxLeft since with the presence of diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp index a0530aec8ac..5f0a3087c54 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp @@ -37,7 +37,7 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void) } CosTradingRepos::ServiceTypeRepository::IncarnationNumber -TAO_Service_Type_Repository::incarnation (CORBA::Environment &) +TAO_Service_Type_Repository::incarnation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num; @@ -62,8 +62,8 @@ TAO_Service_Type_Repository:: add_type (const char *name, const char *if_name, const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, - CORBA::Environment &ACE_TRY_ENV) + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, @@ -100,14 +100,14 @@ add_type (const char *name, // Make sure all property names are valid and appear only once. this->validate_properties (prop_map, - props, - ACE_TRY_ENV); + props + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (this->incarnation_); // Check that all super_types exist, and none are duplicated. this->validate_supertypes (super_map, - super_types, - ACE_TRY_ENV); + super_types + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (this->incarnation_); // NOTE: I don't really know a way to do this without an Interface @@ -115,7 +115,7 @@ add_type (const char *name, // information about supertypes. // // make sure interface name is legal. - // this->validate_interface (if_name, super_types, ACE_TRY_ENV); + // this->validate_interface (if_name, super_types TAO_ENV_ARG_PARAMETER); // ACE_CHECK_RETURN (this->incarnation); // // Instead, we do this: @@ -128,8 +128,8 @@ add_type (const char *name, // type are compatible. We can use prop_map and super_types_map for // the job. this->validate_inheritance (prop_map, - super_types, - ACE_TRY_ENV); + super_types + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (this->incarnation_); // We can now use prop_map to construct a sequence of all properties @@ -155,8 +155,8 @@ add_type (const char *name, } void -TAO_Service_Type_Repository::remove_type (const char *name, - CORBA::Environment &ACE_TRY_ENV) +TAO_Service_Type_Repository::remove_type (const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -186,8 +186,8 @@ TAO_Service_Type_Repository::remove_type (const char *name, CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq * TAO_Service_Type_Repository:: -list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types, - CORBA::Environment &ACE_TRY_ENV) +list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); @@ -232,8 +232,8 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes CosTradingRepos::ServiceTypeRepository::TypeStruct * TAO_Service_Type_Repository:: -describe_type (const char * name, - CORBA::Environment& ACE_TRY_ENV) +describe_type (const char * name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)) @@ -282,8 +282,8 @@ describe_type (const char * name, CosTradingRepos::ServiceTypeRepository::TypeStruct * TAO_Service_Type_Repository:: -fully_describe_type (const char *name, - CORBA::Environment &ACE_TRY_ENV) +fully_describe_type (const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)) @@ -328,8 +328,8 @@ fully_describe_type (const char *name, void TAO_Service_Type_Repository:: -mask_type (const char *name, - CORBA::Environment &ACE_TRY_ENV) +mask_type (const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -359,8 +359,8 @@ mask_type (const char *name, void TAO_Service_Type_Repository:: -unmask_type (const char *name, - CORBA::Environment &ACE_TRY_ENV) +unmask_type (const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -496,8 +496,8 @@ collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::Typ void TAO_Service_Type_Repository:: validate_properties (Prop_Map &prop_map, - const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, - CORBA::Environment &ACE_TRY_ENV) + const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)) { @@ -525,8 +525,8 @@ validate_properties (Prop_Map &prop_map, void TAO_Service_Type_Repository:: validate_supertypes (Service_Type_Map &super_map, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, - CORBA::Environment &ACE_TRY_ENV) + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)) @@ -561,8 +561,8 @@ validate_supertypes (Service_Type_Map &super_map, void TAO_Service_Type_Repository:: validate_inheritance (Prop_Map &prop_map, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, - CORBA::Environment &ACE_TRY_ENV) + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition)) { CORBA::ULong num_super_types = super_types.length (); @@ -610,8 +610,8 @@ validate_inheritance (Prop_Map &prop_map, ACE_TRY { compare = - super_props[j].value_type->equal (prop_type, - ACE_TRY_ENV); + super_props[j].value_type->equal (prop_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index 40991128986..b70563d8c7f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -37,15 +37,15 @@ public: ~TAO_Service_Type_Repository (void); virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber - incarnation (CORBA::Environment &) + incarnation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber add_type (const char *name, const char *if_name, const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, - CORBA::Environment &) + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, @@ -98,8 +98,8 @@ public: // parameter, the DuplicateServiceTypeName exception is raised. // END SPEC - virtual void remove_type (const char *name, - CORBA::Environment &) + virtual void remove_type (const char *name + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -114,8 +114,8 @@ public: // the HasSubTypes exception is raised. END SPEC virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq * - list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types, - CORBA::Environment &) + list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // BEGIN SPEC @@ -130,8 +130,8 @@ public: // END SPEC virtual CosTradingRepos::ServiceTypeRepository::TypeStruct * - describe_type (const char *name, - CORBA::Environment &) + describe_type (const char *name + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)); @@ -144,8 +144,8 @@ public: // END SPEC virtual CosTradingRepos::ServiceTypeRepository::TypeStruct * - fully_describe_type (const char *name, - CORBA::Environment &) + fully_describe_type (const char *name + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)); @@ -161,8 +161,8 @@ public: // the CosTrading::UnknownServiceType exception is raised. // END SPEC - virtual void mask_type (const char *name, - CORBA::Environment &) + virtual void mask_type (const char *name + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -180,8 +180,8 @@ public: // exception is raised. // END SPEC - virtual void unmask_type (const char *name, - CORBA::Environment &) + virtual void unmask_type (const char *name + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -243,31 +243,31 @@ public: TAO_String_Queue &target); void validate_properties (Prop_Map &prop_map, - const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, - CORBA::Environment &) + const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)); // Confirm that the properties in props have valid names, and aren't // duplicated. Cram those properties into the prop_map. void validate_supertypes (Service_Type_Map &super_map, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, - CORBA::Environment &) + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)); // Confirm that the each super type exists, and cram them into super_map. void validate_inheritance (Prop_Map &prop_map, - const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types, - CORBA::Environment &) + const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition)); // Ensure that properties of a super_type aren't having their types // or retstrictions redefined. // void validate_interface (const char *if_name, // Service_Type_Map &super_map, - // CORBA::Environment &_env) + // TAO_ENV_SINGLE_ARG_DECL) // ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch)); // Ensure that the interface type derives from its superclasses'. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp index b9c8e7f296d..436b6381e6a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp @@ -173,11 +173,11 @@ type_repos (CosTrading::TypeRepository_ptr new_value) // @@ Seth, There is no way to propagate the exception out. ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ()); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; this->type_repos_ = new_value; // @@ What can we do even if we catch this? this->service_type_repos_ = - CosTradingRepos::ServiceTypeRepository::_narrow (new_value, ACE_TRY_ENV); + CosTradingRepos::ServiceTypeRepository::_narrow (new_value TAO_ENV_ARG_PARAMETER); } CosTradingRepos::ServiceTypeRepository_ptr diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp index fae8ab289e6..a7fb0f83e10 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp @@ -29,13 +29,13 @@ visit_property (TAO_Property_Constraint* literal) if (this->props_.find (prop_name, prop_index) == 0) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; CORBA::Any *value = 0; // Retrieve the value of the property from the Property_Evaluator ACE_TRY { - value = this->prop_eval_.property_value (prop_index, ACE_TRY_ENV); + value = this->prop_eval_.property_value (prop_index TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index 8ec8825635b..9904d27b106 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -45,8 +45,8 @@ query (const char *type, CORBA::ULong how_many, CosTrading::OfferSeq_out returned_offers, CosTrading::OfferIterator_out returned_offer_iterator, - CosTrading::PolicyNameSeq_out returned_limits_applied, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::PolicyNameSeq_out returned_limits_applied + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -60,13 +60,13 @@ query (const char *type, CosTrading::DuplicatePolicyName)) { // Instantiate a class to help interpret query policies. - TAO_Policies policies (this->trader_, in_policies, ACE_TRY_ENV); + TAO_Policies policies (this->trader_, in_policies TAO_ENV_ARG_PARAMETER); ACE_CHECK; // If a federated query returns to us, ignore it to prevent // redundant results and infinite loops. CosTrading::Admin::OctetSeq* request_id = 0; - int check = this->seen_request_id (policies, request_id, ACE_TRY_ENV); + int check = this->seen_request_id (policies, request_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (check) @@ -84,7 +84,7 @@ query (const char *type, // If the importer has specified a starting trader, foward the // query. CosTrading::TraderName* trader_name = - policies.starting_trader (ACE_TRY_ENV); + policies.starting_trader (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (! CORBA::is_nil (link_if) && trader_name != 0) @@ -101,8 +101,8 @@ query (const char *type, how_many, returned_offers, returned_offer_iterator, - returned_limits_applied, - ACE_TRY_ENV); + returned_limits_applied + TAO_ENV_ARG_PARAMETER); ACE_CHECK; return; } @@ -113,7 +113,7 @@ query (const char *type, CosTradingRepos::ServiceTypeRepository_ptr rep = support_attrs.service_type_repos (); CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct = - rep->fully_describe_type (type, ACE_TRY_ENV); + rep->fully_describe_type (type TAO_ENV_ARG_PARAMETER); ACE_CHECK; // @@ Should throw a NO_MEMORY exception here... @@ -133,17 +133,17 @@ query (const char *type, // meets those constraints. TAO_Preference_Interpreter -- parses // the preference string and orders offers according to those // constraints. - TAO_Offer_Filter offer_filter (policies, - ACE_TRY_ENV); + TAO_Offer_Filter offer_filter (policies + TAO_ENV_ARG_PARAMETER); ACE_CHECK; TAO_Trader_Constraint_Validator validator (type_struct.in ()); TAO_Constraint_Interpreter constr_inter (validator, - constraint, - ACE_TRY_ENV); + constraint + TAO_ENV_ARG_PARAMETER); ACE_CHECK; TAO_Preference_Interpreter pref_inter (validator, - preferences, - ACE_TRY_ENV); + preferences + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Try to find the map of offers of desired service type. @@ -154,7 +154,7 @@ query (const char *type, pref_inter, offer_filter); - CORBA::Boolean result = policies.exact_type_match (ACE_TRY_ENV); + CORBA::Boolean result = policies.exact_type_match (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!result) @@ -171,8 +171,8 @@ query (const char *type, rep, constr_inter, pref_inter, - offer_filter, - ACE_TRY_ENV); + offer_filter + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -187,8 +187,8 @@ query (const char *type, policies, pref_inter, *returned_offers.ptr (), - returned_offer_iterator, - ACE_TRY_ENV); + returned_offer_iterator + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // The following steps are only appropriate for a linked trader. @@ -200,8 +200,8 @@ query (const char *type, CORBA::Boolean should_follow = this->retrieve_links (policies, offers_returned, - CosTrading::LinkNameSeq_out (links.out ()), - ACE_TRY_ENV); + CosTrading::LinkNameSeq_out (links.out ()) + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (should_follow && links->length () != 0) @@ -218,8 +218,8 @@ query (const char *type, how_many, *returned_offers.ptr (), returned_offer_iterator.ptr (), - *returned_limits_applied.ptr (), - ACE_TRY_ENV); + *returned_limits_applied.ptr () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -286,8 +286,8 @@ lookup_all_subtypes (const char* type, CosTradingRepos::ServiceTypeRepository_ptr rep, TAO_Constraint_Interpreter& constr_inter, TAO_Preference_Interpreter& pref_inter, - TAO_Offer_Filter& offer_filter, - CORBA::Environment& ACE_TRY_ENV) + TAO_Offer_Filter& offer_filter + TAO_ENV_ARG_DECL) { // BEGIN SPEC // The trader may return a service offer of a subtype of the "type" @@ -308,7 +308,7 @@ lookup_all_subtypes (const char* type, // types with lower incarnation numbers. sst.incarnation (inc_num); - all_types = rep->list_types (sst, ACE_TRY_ENV); + all_types = rep->list_types (sst TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Scan all types inserted after the super types. If the transitive @@ -321,8 +321,8 @@ lookup_all_subtypes (const char* type, i++) { // Obtain a description of the prospective type. - type_struct = rep->fully_describe_type (all_types[i], - ACE_TRY_ENV); + type_struct = rep->fully_describe_type (all_types[i] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& @@ -356,8 +356,8 @@ fill_receptacles (const char* /* type */, TAO_Policies& policies, TAO_Preference_Interpreter& pref_inter, CosTrading::OfferSeq& offers, - CosTrading::OfferIterator_ptr& offer_itr, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::OfferIterator_ptr& offer_itr + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)) { @@ -372,13 +372,13 @@ fill_receptacles (const char* /* type */, // "offer_itr" will be nil. // END SPEC - TAO_Property_Filter prop_filter (desired_props, ACE_TRY_ENV); + TAO_Property_Filter prop_filter (desired_props TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // RETURNING: Calculate how many offers go into the sequence // Calculate how many go into the iterator - CORBA::ULong return_card = policies.return_card (ACE_TRY_ENV); + CORBA::ULong return_card = policies.return_card (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong i = 0; @@ -423,9 +423,9 @@ fill_receptacles (const char* /* type */, this->create_offer_iterator (prop_filter); // Register it with the POA. - offer_itr = oi->_this (ACE_TRY_ENV); + offer_itr = oi->_this (TAO_ENV_SINGLE_ARG_PARAMETER); // @@ Seth, ACE_CHECK_RETURN (what?); - oi->_remove_ref (ACE_TRY_ENV); + oi->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (total_offers - offers_in_iterator); // Add to the iterator @@ -492,13 +492,13 @@ CORBA::Boolean TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: retrieve_links (TAO_Policies& policies, CORBA::ULong offers_returned, - CosTrading::LinkNameSeq_out links, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::LinkNameSeq_out links + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)) { CORBA::Boolean should_follow = 0; - CosTrading::FollowOption follow_rule = policies.link_follow_rule (ACE_TRY_ENV); + CosTrading::FollowOption follow_rule = policies.link_follow_rule (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (should_follow); // Determine whether or not a federated query is warranted. A query @@ -507,7 +507,7 @@ retrieve_links (TAO_Policies& policies, if ((follow_rule == CosTrading::always || (follow_rule == CosTrading::if_no_local && offers_returned == 0))) { - CORBA::ULong hc = policies.hop_count (ACE_TRY_ENV); + CORBA::ULong hc = policies.hop_count (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (hc > 0) @@ -521,7 +521,7 @@ retrieve_links (TAO_Policies& policies, CosTrading::Link_ptr link_if = this->trader_.trading_components ().link_if (); - links = link_if->list_links (ACE_TRY_ENV); + links = link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Determine which of the links registered with the Link @@ -533,12 +533,12 @@ retrieve_links (TAO_Policies& policies, { // Grab the link information. CosTrading::Link::LinkInfo_var - link_info (link_if->describe_link (links[i], ACE_TRY_ENV)); + link_info (link_if->describe_link (links[i] TAO_ENV_ARG_PARAMETER)); ACE_CHECK_RETURN (should_follow); // Compute the link follow rule. CosTrading::FollowOption link_rule = - policies.link_follow_rule (link_info.in (), ACE_TRY_ENV); + policies.link_follow_rule (link_info.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (should_follow); // Determine if the link follow rule applies. @@ -574,8 +574,8 @@ federated_query (const CosTrading::LinkNameSeq& links, CORBA::ULong how_many, CosTrading::OfferSeq& offers, CosTrading::OfferIterator_ptr& offer_iter, - CosTrading::PolicyNameSeq& limits, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::PolicyNameSeq& limits + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -624,13 +624,13 @@ federated_query (const CosTrading::LinkNameSeq& links, { // Obtain information about the link we're traversing. CosTrading::Link::LinkInfo_var link_info = - link_interface->describe_link (links[i], ACE_TRY_ENV); + link_interface->describe_link (links[i] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Set the link follow policy for the query over the link. policies.copy_in_follow_option (policies_to_pass, - link_info.in (), - ACE_TRY_ENV); + link_info.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosTrading::Lookup_var remote_lookup = @@ -645,8 +645,8 @@ federated_query (const CosTrading::LinkNameSeq& links, how_many - offers.length (), CosTrading::OfferSeq_out (out_offers), CosTrading::OfferIterator_out (out_offer_iter), - CosTrading::PolicyNameSeq_out (out_limits), - ACE_TRY_ENV); + CosTrading::PolicyNameSeq_out (out_limits) + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong j = 0; @@ -687,10 +687,10 @@ federated_query (const CosTrading::LinkNameSeq& links, this->order_merged_sequence (pref_inter, offers); // Return the collection of offer iterators. - offer_iter = offer_iter_collection->_this (ACE_TRY_ENV); + offer_iter = offer_iter_collection->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - offer_iter_collection->_remove_ref (ACE_TRY_ENV); + offer_iter_collection->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -743,8 +743,8 @@ forward_query (const char* next_hop, CORBA::ULong how_many, CosTrading::OfferSeq_out offers, CosTrading::OfferIterator_out offer_itr, - CosTrading::PolicyNameSeq_out limits_applied, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::PolicyNameSeq_out limits_applied + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -764,17 +764,17 @@ forward_query (const char* next_hop, ACE_TRY { CosTrading::Link::LinkInfo_var link_info = - link_interface->describe_link (next_hop, ACE_TRY_ENV); + link_interface->describe_link (next_hop TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosTrading::Lookup_var remote_lookup = CosTrading::Lookup::_duplicate (link_info->target.in ()); - CORBA::Object_var us = this->_this (ACE_TRY_ENV); + CORBA::Object_var us = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean self_loop = - remote_lookup->_is_equivalent (us.in (), ACE_TRY_ENV); + remote_lookup->_is_equivalent (us.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (! self_loop) @@ -788,8 +788,8 @@ forward_query (const char* next_hop, how_many, offers, offer_itr, - limits_applied, - ACE_TRY_ENV); + limits_applied + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -802,8 +802,8 @@ forward_query (const char* next_hop, how_many, offers, offer_itr, - limits_applied, - ACE_TRY_ENV); + limits_applied + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -822,21 +822,21 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CORBA::Boolean TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: seen_request_id (TAO_Policies& policies, - CosTrading::Admin::OctetSeq*& seq, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::Admin::OctetSeq*& seq + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)) { CORBA::Boolean return_value = 0; - seq = policies.request_id (ACE_TRY_ENV); + seq = policies.request_id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); if (seq == 0) { CosTrading::Admin_ptr admin_if = this->trader_.trading_components ().admin_if (); - seq = admin_if->request_id_stem (ACE_TRY_ENV); + seq = admin_if->request_id_stem (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); } else @@ -898,8 +898,8 @@ CosTrading::OfferId TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: _cxx_export (CORBA::Object_ptr reference, const char *type, - const CosTrading::PropertySeq &properties, - CORBA::Environment& ACE_TRY_ENV) + const CosTrading::PropertySeq &properties + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::InvalidObjectRef, CosTrading::IllegalServiceType, @@ -927,7 +927,7 @@ _cxx_export (CORBA::Object_ptr reference, // Yank our friend, the type struct, and confirm that the given // properties match the type definition. CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct = - rep->fully_describe_type (type, ACE_TRY_ENV); + rep->fully_describe_type (type TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Oops the type is masked, we shouldn't let exporters know the type @@ -937,7 +937,7 @@ _cxx_export (CORBA::Object_ptr reference, // TAO-specific way to determine if an object is derived from or is // an interface type. - int check = (! reference->_is_a (type_struct->if_name, ACE_TRY_ENV)); + int check = (! reference->_is_a (type_struct->if_name TAO_ENV_ARG_PARAMETER)); ACE_CHECK_RETURN (0); if (check) ACE_THROW_RETURN (CosTrading::Register:: @@ -945,7 +945,7 @@ _cxx_export (CORBA::Object_ptr reference, // Validate that the properties defined for this offer are correct // to their types and strength. - this->validate_properties (type, type_struct.ptr (), properties, ACE_TRY_ENV); + this->validate_properties (type, type_struct.ptr (), properties TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // CORBA::ULong plength = properties.length (); @@ -975,8 +975,8 @@ _cxx_export (CORBA::Object_ptr reference, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> void TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -withdraw (const char *id, - CORBA::Environment& ACE_TRY_ENV) +withdraw (const char *id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -984,14 +984,14 @@ withdraw (const char *id, { // Get service type map. TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database (); - offer_database.remove_offer ((CosTrading::OfferId) id, ACE_TRY_ENV); + offer_database.remove_offer ((CosTrading::OfferId) id TAO_ENV_ARG_PARAMETER); } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Register::OfferInfo * TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -describe (const char *id, - CORBA::Environment& ACE_TRY_ENV) +describe (const char *id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -1003,7 +1003,7 @@ describe (const char *id, // Perform a lookup to find the offer. CosTrading::Offer* offer = - offer_database.lookup_offer ((CosTrading::OfferId) id, type, ACE_TRY_ENV); + offer_database.lookup_offer ((CosTrading::OfferId) id, type TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CosTrading::Register::OfferInfo *offer_info = 0; @@ -1026,8 +1026,8 @@ void TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: modify (const char *id, const CosTrading::PropertyNameSeq& del_list, - const CosTrading::PropertySeq& modify_list, - CORBA::Environment& ACE_TRY_ENV) + const CosTrading::PropertySeq& modify_list + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented, CosTrading::IllegalOfferId, @@ -1043,7 +1043,7 @@ modify (const char *id, { // Throw an exception if the trader is not configured // to support properties modification. - int check = (! this->supports_modifiable_properties (ACE_TRY_ENV)); + int check = (! this->supports_modifiable_properties (TAO_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; if (check) @@ -1057,22 +1057,22 @@ modify (const char *id, TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database (); CosTrading::Offer* offer = offer_database. - lookup_offer (ACE_const_cast (CosTrading::OfferId, id), type, ACE_TRY_ENV); + lookup_offer (ACE_const_cast (CosTrading::OfferId, id), type TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (offer != 0) { // Yank our friend, the type struct. CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct = - rep->fully_describe_type (type, ACE_TRY_ENV); + rep->fully_describe_type (type TAO_ENV_ARG_PARAMETER); ACE_CHECK; TAO_Offer_Modifier offer_mod (type, type_struct.in (), offer); // Delete, add, and change properties of the offer. - offer_mod.delete_properties (del_list, ACE_TRY_ENV); + offer_mod.delete_properties (del_list TAO_ENV_ARG_PARAMETER); ACE_CHECK; - offer_mod.merge_properties (modify_list, ACE_TRY_ENV); + offer_mod.merge_properties (modify_list TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Alter our reference to the offer. We do this last, since the @@ -1086,8 +1086,8 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> void TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: withdraw_using_constraint (const char *type, - const char *constr, - CORBA::Environment& ACE_TRY_ENV) + const char *constr + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -1104,7 +1104,7 @@ withdraw_using_constraint (const char *type, // Retrieve the type struct CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct = - rep->fully_describe_type (type, ACE_TRY_ENV); + rep->fully_describe_type (type TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Try to find the map of offers of desired service type. @@ -1123,7 +1123,7 @@ withdraw_using_constraint (const char *type, #endif /* _MSC_VER */ TAO_Trader_Constraint_Validator validator (type_struct.in ()); - TAO_Constraint_Interpreter constr_inter (validator, constr, ACE_TRY_ENV); + TAO_Constraint_Interpreter constr_inter (validator, constr TAO_ENV_ARG_PARAMETER); ACE_CHECK; while (offer_iter.has_more_offers ()) @@ -1146,7 +1146,7 @@ withdraw_using_constraint (const char *type, char* offer_id = 0; ids.dequeue_head (offer_id); - offer_database.remove_offer (offer_id, ACE_TRY_ENV); + offer_database.remove_offer (offer_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::string_free (offer_id); } @@ -1158,8 +1158,8 @@ withdraw_using_constraint (const char *type, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Register_ptr TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -resolve (const CosTrading::TraderName &name, - CORBA::Environment& ACE_TRY_ENV) +resolve (const CosTrading::TraderName &name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::IllegalTraderName, CosTrading::Register::UnknownTraderName, @@ -1184,11 +1184,11 @@ resolve (const CosTrading::TraderName &name, ACE_TRY { // Ensure that the link to the next trader exists. - link_info = link_if->describe_link (name[0], ACE_TRY_ENV); + link_info = link_if->describe_link (name[0] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; remote_reg = - CosTrading::Register::_narrow (link_info->target_reg.in (), ACE_TRY_ENV); + CosTrading::Register::_narrow (link_info->target_reg.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1212,7 +1212,7 @@ resolve (const CosTrading::TraderName &name, for (int i = trader_name.length () - 1; i >= 0; i--) trader_name[i] = name[i + 1]; - return_value = remote_reg->resolve (trader_name, ACE_TRY_ENV); + return_value = remote_reg->resolve (trader_name TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosTrading::Register::_nil ()); } @@ -1224,8 +1224,8 @@ void TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: validate_properties (const char* type, const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct, - const CosTrading::PropertySeq& properties, - CORBA::Environment& ACE_TRY_ENV) + const CosTrading::PropertySeq& properties + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::PropertyTypeMismatch, CosTrading::ReadonlyDynamicProperty, @@ -1235,7 +1235,7 @@ validate_properties (const char* type, CORBA::ULong length = properties.length (); const CosTradingRepos::ServiceTypeRepository::PropStructSeq& prop_types = type_struct->props; - TAO_Property_Evaluator_By_Name prop_eval (properties, ACE_TRY_ENV); + TAO_Property_Evaluator_By_Name prop_eval (properties TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Perform property validation @@ -1260,8 +1260,8 @@ validate_properties (const char* type, else { int check = - (! prop_type->equal (prop_struct.value_type.in (), - ACE_TRY_ENV)); + (! prop_type->equal (prop_struct.value_type.in () + TAO_ENV_ARG_PARAMETER)); ACE_CHECK; if (check) { @@ -1343,7 +1343,7 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin (void) template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Admin::OctetSeq * -TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (CORBA::Environment&) +TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 0); @@ -1365,8 +1365,8 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (CORBA::Environment&) template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_def_search_card (CORBA::ULong value, - CORBA::Environment& ) +set_def_search_card (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1379,8 +1379,8 @@ set_def_search_card (CORBA::ULong value, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_max_search_card (CORBA::ULong value, - CORBA::Environment& ) +set_max_search_card (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1393,8 +1393,8 @@ set_max_search_card (CORBA::ULong value, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_def_match_card (CORBA::ULong value, - CORBA::Environment& ) +set_def_match_card (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1407,8 +1407,8 @@ set_def_match_card (CORBA::ULong value, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_max_match_card (CORBA::ULong value, - CORBA::Environment& ) +set_max_match_card (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1421,8 +1421,8 @@ set_max_match_card (CORBA::ULong value, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_def_return_card (CORBA::ULong value, - CORBA::Environment& ) +set_def_return_card (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1435,8 +1435,8 @@ set_def_return_card (CORBA::ULong value, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_max_return_card (CORBA::ULong value, - CORBA::Environment& ) +set_max_return_card (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1449,8 +1449,8 @@ set_max_return_card (CORBA::ULong value, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_max_list (CORBA::ULong value, - CORBA::Environment& ) +set_max_list (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1463,8 +1463,8 @@ set_max_list (CORBA::ULong value, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CORBA::Boolean TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_supports_modifiable_properties (CORBA::Boolean value, - CORBA::Environment& ) +set_supports_modifiable_properties (CORBA::Boolean value + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean return_value = @@ -1477,8 +1477,8 @@ set_supports_modifiable_properties (CORBA::Boolean value, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CORBA::Boolean TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_supports_dynamic_properties (CORBA::Boolean value, - CORBA::Environment& ) +set_supports_dynamic_properties (CORBA::Boolean value + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean return_value = @@ -1491,8 +1491,8 @@ set_supports_dynamic_properties (CORBA::Boolean value, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CORBA::Boolean TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_supports_proxy_offers (CORBA::Boolean value, - CORBA::Environment& ) +set_supports_proxy_offers (CORBA::Boolean value + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean return_value = @@ -1505,8 +1505,8 @@ set_supports_proxy_offers (CORBA::Boolean value, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_def_hop_count (CORBA::ULong value, - CORBA::Environment& ) +set_def_hop_count (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1519,8 +1519,8 @@ set_def_hop_count (CORBA::ULong value, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CORBA::ULong TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_max_hop_count (CORBA::ULong value, - CORBA::Environment& ) +set_max_hop_count (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1533,8 +1533,8 @@ set_max_hop_count (CORBA::ULong value, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::FollowOption TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_def_follow_policy (CosTrading::FollowOption policy, - CORBA::Environment& ) +set_def_follow_policy (CosTrading::FollowOption policy + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::FollowOption return_value = @@ -1547,8 +1547,8 @@ set_def_follow_policy (CosTrading::FollowOption policy, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::FollowOption TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_max_follow_policy (CosTrading::FollowOption policy, - CORBA::Environment& ) +set_max_follow_policy (CosTrading::FollowOption policy + TAO_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::FollowOption return_value = @@ -1561,8 +1561,8 @@ set_max_follow_policy (CosTrading::FollowOption policy, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::FollowOption TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_max_link_follow_policy (CosTrading::FollowOption policy, - CORBA::Environment&) +set_max_link_follow_policy (CosTrading::FollowOption policy + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::FollowOption return_value = @@ -1575,8 +1575,8 @@ set_max_link_follow_policy (CosTrading::FollowOption policy, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::TypeRepository_ptr TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_type_repos (CosTrading::TypeRepository_ptr repository, - CORBA::Environment&) +set_type_repos (CosTrading::TypeRepository_ptr repository + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::TypeRepository_ptr return_value = @@ -1589,8 +1589,8 @@ set_type_repos (CosTrading::TypeRepository_ptr repository, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Admin::OctetSeq* TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -set_request_id_stem (const CosTrading::Admin::OctetSeq& stem, - CORBA::Environment&) +set_request_id_stem (const CosTrading::Admin::OctetSeq& stem + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, @@ -1604,8 +1604,8 @@ void TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: list_offers (CORBA::ULong how_many, CosTrading::OfferIdSeq_out ids, - CosTrading::OfferIdIterator_out id_itr, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::OfferIdIterator_out id_itr + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)) { // This method only applies when the register interface is implemented @@ -1618,14 +1618,14 @@ list_offers (CORBA::ULong how_many, id_itr = CosTrading::OfferIdIterator::_nil (); if (how_many > 0) { - int check = offer_id_iter->next_n (how_many, ids, ACE_TRY_ENV); + int check = offer_id_iter->next_n (how_many, ids TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (check == 1) { - id_itr = offer_id_iter->_this (ACE_TRY_ENV); + id_itr = offer_id_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - offer_id_iter->_remove_ref (ACE_TRY_ENV); + offer_id_iter->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else @@ -1640,8 +1640,8 @@ void TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: list_proxies (CORBA::ULong, CosTrading::OfferIdSeq_out, - CosTrading::OfferIdIterator_out, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::OfferIdIterator_out + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)) { @@ -1668,8 +1668,8 @@ TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>:: add_link (const char *name, CosTrading::Lookup_ptr target, CosTrading::FollowOption def_pass_on_follow_rule, - CosTrading::FollowOption limiting_follow_rule, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::FollowOption limiting_follow_rule + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::DuplicateLinkName, @@ -1699,7 +1699,7 @@ add_link (const char *name, // Ensure that the limiting link behavior for this link doesn't // exceed the maximum allowed for a link. CosTrading::FollowOption follow_policy = - this->max_link_follow_policy (ACE_TRY_ENV); + this->max_link_follow_policy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (limiting_follow_rule < follow_policy) ACE_THROW (CosTrading::Link::LimitingFollowTooPermissive @@ -1721,8 +1721,8 @@ add_link (const char *name, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> void TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -remove_link (const char *name, - CORBA::Environment& ACE_TRY_ENV) +remove_link (const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName)) @@ -1742,8 +1742,8 @@ remove_link (const char *name, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Link::LinkInfo * -TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name, - CORBA::Environment& ACE_TRY_ENV) +TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName)) @@ -1777,7 +1777,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name, // This avoids the nested upcall that would occur were we to invoke // this method in the add_link method. - new_link_info->target_reg = old_link_info.target->register_if (ACE_TRY_ENV); + new_link_info->target_reg = old_link_info.target->register_if (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (new_link_info); // return the link information for this link name. @@ -1786,7 +1786,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::LinkNameSeq* -TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (CORBA::Environment&) +TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate space for the link names. @@ -1809,8 +1809,8 @@ void TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: modify_link (const char *name, CosTrading::FollowOption def_pass_on_follow_rule, - CosTrading::FollowOption limiting_follow_rule, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::FollowOption limiting_follow_rule + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName, CosTrading::Link::DefaultFollowTooPermissive, @@ -1835,7 +1835,7 @@ modify_link (const char *name, // Ensure that the limiting link behavior for this link doesn't // exceed the maximum allowed for a link. CosTrading::FollowOption follow_policy = - this->max_link_follow_policy (ACE_TRY_ENV); + this->max_link_follow_policy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (limiting_follow_rule < follow_policy) @@ -1870,8 +1870,8 @@ export_proxy (CosTrading::Lookup_ptr, const CosTrading::PropertySeq&, CORBA::Boolean, const char *, - const CosTrading::PolicySeq&, - CORBA::Environment& ACE_TRY_ENV) + const CosTrading::PolicySeq& + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -1890,8 +1890,8 @@ export_proxy (CosTrading::Lookup_ptr, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> void TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -withdraw_proxy (const char *, - CORBA::Environment& ACE_TRY_ENV) +withdraw_proxy (const char * + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -1903,8 +1903,8 @@ withdraw_proxy (const char *, template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Proxy::ProxyInfo * TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: -describe_proxy (const char *, - CORBA::Environment& ACE_TRY_ENV) +describe_proxy (const char * + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -1918,8 +1918,8 @@ void TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: list_proxies (CORBA::ULong, CosTrading::OfferIdSeq*&, - CosTrading::OfferIdIterator_ptr&, - CORBA::Environment& ACE_TRY_ENV) + CosTrading::OfferIdIterator_ptr& + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)) { diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index bf7c9e1e85c..34d492776d7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -74,8 +74,8 @@ public: CORBA::ULong how_many, CosTrading::OfferSeq_out offers, CosTrading::OfferIterator_out offer_itr, - CosTrading::PolicyNameSeq_out limits_applied, - CORBA::Environment& env) + CosTrading::PolicyNameSeq_out limits_applied + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -179,8 +179,8 @@ private: CosTradingRepos::ServiceTypeRepository_ptr rep, TAO_Constraint_Interpreter& constr_inter, TAO_Preference_Interpreter& pref_inter, - TAO_Offer_Filter& offer_filter, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_Offer_Filter& offer_filter + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Traverse the type hierarchy to pull the matching offers from all // subtypes of the root type. @@ -198,8 +198,8 @@ private: TAO_Policies& policies, TAO_Preference_Interpreter& pref_inter, CosTrading::OfferSeq& offers, - CosTrading::OfferIterator_ptr& offer_itr, - CORBA::Environment& env) + CosTrading::OfferIterator_ptr& offer_itr + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)); // This method takes the list of ordered offers and places a number @@ -217,8 +217,8 @@ private: CORBA::ULong how_many, CosTrading::OfferSeq_out offers, CosTrading::OfferIterator_out offer_itr, - CosTrading::PolicyNameSeq_out limits_applied, - CORBA::Environment& env) + CosTrading::PolicyNameSeq_out limits_applied + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -235,8 +235,8 @@ private: CORBA::Boolean retrieve_links (TAO_Policies& policies, CORBA::ULong offer_returned, - CosTrading::LinkNameSeq_out links, - CORBA::Environment& _env) + CosTrading::LinkNameSeq_out links + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)); // Assemble a sequence of links that the federate_query method @@ -255,8 +255,8 @@ private: CORBA::ULong how_many, CosTrading::OfferSeq& offers, CosTrading::OfferIterator_ptr& offer_itr, - CosTrading::PolicyNameSeq& limits_applied, - CORBA::Environment& env) + CosTrading::PolicyNameSeq& limits_applied + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -277,8 +277,8 @@ private: // Merge the results from a federated query into the collected results. CORBA::Boolean seen_request_id (TAO_Policies& policies, - CosTrading::Admin::OctetSeq*& seq, - CORBA::Environment& _env) + CosTrading::Admin::OctetSeq*& seq + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)); @@ -321,8 +321,8 @@ public: virtual CosTrading::OfferId _cxx_export (CORBA::Object_ptr reference, const char *type, - const CosTrading::PropertySeq& properties, - CORBA::Environment& _env) + const CosTrading::PropertySeq& properties + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::InvalidObjectRef, CosTrading::IllegalServiceType, @@ -388,7 +388,7 @@ public: // parameter, the DuplicatePropertyName exception is raised. // END SPEC - virtual void withdraw (const char *id, CORBA::Environment& _env) + virtual void withdraw (const char *id TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -408,8 +408,8 @@ public: // END SPEC virtual CosTrading::Register::OfferInfo* - describe (const char * id, - CORBA::Environment& _env) + describe (const char * id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -431,8 +431,8 @@ public: virtual void modify (const char * id, const CosTrading::PropertyNameSeq& del_list, - const CosTrading::PropertySeq& modify_list, - CORBA::Environment& _env) + const CosTrading::PropertySeq& modify_list + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented, CosTrading::IllegalOfferId, @@ -500,8 +500,8 @@ public: // END SPEC virtual void withdraw_using_constraint (const char *type, - const char *constr, - CORBA::Environment& _env) + const char *constr + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -532,8 +532,8 @@ public: // END SPEC virtual CosTrading::Register_ptr - resolve (const CosTrading::TraderName &name, - CORBA::Environment& _env) + resolve (const CosTrading::TraderName &name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::IllegalTraderName, CosTrading::Register::UnknownTraderName, @@ -566,8 +566,8 @@ public: void validate_properties (const char* type, const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct, - const CosTrading::PropertySeq& properties, - CORBA::Environment& _env) + const CosTrading::PropertySeq& properties + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::PropertyTypeMismatch, CosTrading::ReadonlyDynamicProperty, @@ -622,94 +622,94 @@ public: // = Importing Parameters (used by the Lookup Interface) - virtual CORBA::ULong set_def_search_card (CORBA::ULong value, - CORBA::Environment &) + virtual CORBA::ULong set_def_search_card (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong set_max_search_card (CORBA::ULong value, - CORBA::Environment &) + virtual CORBA::ULong set_max_search_card (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // search card is the cardinality of the offers searched for // constraint compliance. - virtual CORBA::ULong set_def_match_card (CORBA::ULong value, - CORBA::Environment &) + virtual CORBA::ULong set_def_match_card (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong set_max_match_card (CORBA::ULong value, - CORBA::Environment &) + virtual CORBA::ULong set_max_match_card (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // match card is the cardinality of offers found compliant with the // constraints. - virtual CORBA::ULong set_def_return_card (CORBA::ULong value, - CORBA::Environment &) + virtual CORBA::ULong set_def_return_card (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong set_max_return_card (CORBA::ULong value, - CORBA::Environment &) + virtual CORBA::ULong set_max_return_card (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // return card is the cardinality of the offers returned from // Lookup. - virtual CORBA::ULong set_max_list (CORBA::ULong value, - CORBA::Environment &) + virtual CORBA::ULong set_max_list (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean - set_supports_modifiable_properties (CORBA::Boolean value, - CORBA::Environment &) + set_supports_modifiable_properties (CORBA::Boolean value + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean - set_supports_dynamic_properties (CORBA::Boolean value, - CORBA::Environment &) + set_supports_dynamic_properties (CORBA::Boolean value + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean - set_supports_proxy_offers (CORBA::Boolean value, - CORBA::Environment &) + set_supports_proxy_offers (CORBA::Boolean value + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Types of offers available for consideration. Ween out those // offers with modifiable properties // = Link Interface parameters - virtual CORBA::ULong set_def_hop_count (CORBA::ULong value, - CORBA::Environment &) + virtual CORBA::ULong set_def_hop_count (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong set_max_hop_count (CORBA::ULong value, - CORBA::Environment &) + virtual CORBA::ULong set_max_hop_count (CORBA::ULong value + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::FollowOption - set_def_follow_policy (CosTrading::FollowOption policy, - CORBA::Environment &) + set_def_follow_policy (CosTrading::FollowOption policy + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::FollowOption - set_max_follow_policy (CosTrading::FollowOption policy, - CORBA::Environment &) + set_max_follow_policy (CosTrading::FollowOption policy + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::FollowOption - set_max_link_follow_policy (CosTrading::FollowOption policy, - CORBA::Environment &) + set_max_link_follow_policy (CosTrading::FollowOption policy + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = Set Type Repository virtual CosTrading::TypeRepository_ptr - set_type_repos (CosTrading::TypeRepository_ptr repository, - CORBA::Environment &) + set_type_repos (CosTrading::TypeRepository_ptr repository + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::Admin::OctetSeq* - request_id_stem (CORBA::Environment &) + request_id_stem (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::Admin::OctetSeq* - set_request_id_stem (const CosTrading::Admin::OctetSeq& stem, - CORBA::Environment &) + set_request_id_stem (const CosTrading::Admin::OctetSeq& stem + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void list_offers (CORBA::ULong how_many, CosTrading::OfferIdSeq_out ids, - CosTrading::OfferIdIterator_out id_itr, - CORBA::Environment& env) + CosTrading::OfferIdIterator_out id_itr + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)); @@ -734,8 +734,8 @@ public: virtual void list_proxies (CORBA::ULong, CosTrading::OfferIdSeq_out, - CosTrading::OfferIdIterator_out, - CORBA::Environment& env) + CosTrading::OfferIdIterator_out + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)); @@ -775,8 +775,8 @@ public: virtual void add_link (const char *name, CosTrading::Lookup_ptr target, CosTrading::FollowOption def_pass_on_follow_rule, - CosTrading::FollowOption limiting_follow_rule, - CORBA::Environment& _env) + CosTrading::FollowOption limiting_follow_rule + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::DuplicateLinkName, @@ -824,8 +824,8 @@ public: // creation of the link. // END SPEC - virtual void remove_link (const char *name, - CORBA::Environment& _env) + virtual void remove_link (const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName)); @@ -841,8 +841,8 @@ public: // not in the trader. // END SPEC - virtual CosTrading::Link::LinkInfo* describe_link (const char *name, - CORBA::Environment&) + virtual CosTrading::Link::LinkInfo* describe_link (const char *name + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName)); @@ -870,7 +870,7 @@ public: // state. // END SPEC - virtual CosTrading::LinkNameSeq* list_links (CORBA::Environment &) + virtual CosTrading::LinkNameSeq* list_links (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // BEGIN SPEC @@ -882,8 +882,8 @@ public: virtual void modify_link (const char *name, CosTrading::FollowOption def_pass_on_follow_rule, - CosTrading::FollowOption limiting_follow_rule, - CORBA::Environment& _env) + CosTrading::FollowOption limiting_follow_rule + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName, CosTrading::Link::DefaultFollowTooPermissive, @@ -956,8 +956,8 @@ public: const CosTrading::PropertySeq &, CORBA::Boolean if_match_all, const char *, - const CosTrading::PolicySeq &, - CORBA::Environment& _env) + const CosTrading::PolicySeq & + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -970,16 +970,16 @@ public: CosTrading::DuplicatePropertyName, CosTrading::DuplicatePolicyName)); - virtual void withdraw_proxy (const char *, - CORBA::Environment& _env) + virtual void withdraw_proxy (const char * + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, CosTrading::Proxy::NotProxyOfferId)); virtual CosTrading::Proxy::ProxyInfo * - describe_proxy (const char *, - CORBA::Environment& _env) + describe_proxy (const char * + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -989,8 +989,8 @@ public: virtual void list_proxies (CORBA::ULong, CosTrading::OfferIdSeq *&, - CosTrading::OfferIdIterator_ptr &, - CORBA::Environment& env) + CosTrading::OfferIdIterator_ptr & + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp index e97ee08d360..b452b289d20 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp @@ -26,9 +26,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components) ACE_NEW (lookup, (TAO_Lookup<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this)); - this->trading_components ().lookup_if (lookup->_this (ACE_TRY_ENV)); + this->trading_components ().lookup_if (lookup->_this (TAO_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; - lookup->_remove_ref (ACE_TRY_ENV); + lookup->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->ifs_[LOOKUP_IF] = lookup; @@ -40,9 +40,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components) ACE_NEW (reg, (TAO_Register<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this)); - this->trading_components ().register_if (reg->_this (ACE_TRY_ENV)); + this->trading_components ().register_if (reg->_this (TAO_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; - reg->_remove_ref (ACE_TRY_ENV); + reg->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->ifs_[REGISTER_IF] = reg; @@ -54,9 +54,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components) ACE_NEW (admin, (TAO_Admin<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this)); - this->trading_components ().admin_if (admin->_this (ACE_TRY_ENV)); + this->trading_components ().admin_if (admin->_this (TAO_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; - admin->_remove_ref (ACE_TRY_ENV); + admin->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->ifs_[ADMIN_IF] = admin; @@ -68,9 +68,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components) ACE_NEW (proxy, (TAO_Proxy<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this)); - this->trading_components ().proxy_if (proxy->_this (ACE_TRY_ENV)); + this->trading_components ().proxy_if (proxy->_this (TAO_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; - proxy->_remove_ref (ACE_TRY_ENV); + proxy->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->ifs_[PROXY_IF] = proxy; @@ -82,9 +82,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components) ACE_NEW (link, (TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this)); - this->trading_components ().link_if (link->_this (ACE_TRY_ENV)); + this->trading_components ().link_if (link->_this (TAO_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; - link->_remove_ref (ACE_TRY_ENV); + link->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->ifs_[LINK_IF] = link; @@ -105,14 +105,14 @@ TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void) ACE_TRY { PortableServer::POA_var poa = - this->ifs_[i]->_default_POA (ACE_TRY_ENV); + this->ifs_[i]->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this->ifs_[i], ACE_TRY_ENV); + poa->servant_to_id (this->ifs_[i] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -146,35 +146,35 @@ TAO_Trader_Components (const TAO_Trading_Components_i& comps) } template <class IF> CosTrading::Lookup_ptr -TAO_Trader_Components<IF>::lookup_if (CORBA::Environment&) +TAO_Trader_Components<IF>::lookup_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Lookup::_duplicate (this->comps_.lookup_if ()); } template <class IF> CosTrading::Register_ptr -TAO_Trader_Components<IF>::register_if (CORBA::Environment&) +TAO_Trader_Components<IF>::register_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Register::_duplicate (this->comps_.register_if ()); } template <class IF> CosTrading::Admin_ptr -TAO_Trader_Components<IF>::admin_if (CORBA::Environment&) +TAO_Trader_Components<IF>::admin_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Admin::_duplicate (this->comps_.admin_if ()); } template <class IF> CosTrading::Proxy_ptr -TAO_Trader_Components<IF>::proxy_if (CORBA::Environment&) +TAO_Trader_Components<IF>::proxy_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Proxy::_duplicate (this->comps_.proxy_if ()); } template <class IF> CosTrading::Link_ptr -TAO_Trader_Components<IF>::link_if (CORBA::Environment&) +TAO_Trader_Components<IF>::link_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::Link::_duplicate (this->comps_.link_if ()); @@ -187,28 +187,28 @@ TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs) } template <class IF> CORBA::Boolean -TAO_Support_Attributes<IF>::supports_modifiable_properties (CORBA::Environment&) +TAO_Support_Attributes<IF>::supports_modifiable_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.supports_modifiable_properties (); } template <class IF> CORBA::Boolean -TAO_Support_Attributes<IF>::supports_dynamic_properties (CORBA::Environment&) +TAO_Support_Attributes<IF>::supports_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.supports_dynamic_properties (); } template <class IF> CORBA::Boolean -TAO_Support_Attributes<IF>::supports_proxy_offers (CORBA::Environment&) +TAO_Support_Attributes<IF>::supports_proxy_offers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.supports_proxy_offers (); } template <class IF> CosTrading::TypeRepository_ptr -TAO_Support_Attributes<IF>::type_repos (CORBA::Environment& ) +TAO_Support_Attributes<IF>::type_repos (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { return CosTrading::TypeRepository::_duplicate (this->attrs_.type_repos ()); @@ -222,77 +222,77 @@ TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs) } template <class IF> CORBA::ULong -TAO_Import_Attributes<IF>::def_search_card (CORBA::Environment&) +TAO_Import_Attributes<IF>::def_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_search_card (); } template <class IF> CORBA::ULong -TAO_Import_Attributes<IF>::max_search_card (CORBA::Environment&) +TAO_Import_Attributes<IF>::max_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_search_card (); } template <class IF> CORBA::ULong -TAO_Import_Attributes<IF>::def_match_card (CORBA::Environment&) +TAO_Import_Attributes<IF>::def_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_match_card (); } template <class IF> CORBA::ULong -TAO_Import_Attributes<IF>::max_match_card (CORBA::Environment&) +TAO_Import_Attributes<IF>::max_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_match_card (); } template <class IF> CORBA::ULong -TAO_Import_Attributes<IF>::def_return_card (CORBA::Environment&) +TAO_Import_Attributes<IF>::def_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_return_card (); } template <class IF> CORBA::ULong -TAO_Import_Attributes<IF>::max_return_card (CORBA::Environment&) +TAO_Import_Attributes<IF>::max_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_return_card (); } template <class IF> CORBA::ULong -TAO_Import_Attributes<IF>::max_list (CORBA::Environment&) +TAO_Import_Attributes<IF>::max_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_list (); } template <class IF> CORBA::ULong -TAO_Import_Attributes<IF>::def_hop_count (CORBA::Environment&) +TAO_Import_Attributes<IF>::def_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_hop_count (); } template <class IF> CORBA::ULong -TAO_Import_Attributes<IF>::max_hop_count (CORBA::Environment&) +TAO_Import_Attributes<IF>::max_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_hop_count (); } template <class IF> CosTrading::FollowOption -TAO_Import_Attributes<IF>::def_follow_policy (CORBA::Environment&) +TAO_Import_Attributes<IF>::def_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.def_follow_policy (); } template <class IF> CosTrading::FollowOption -TAO_Import_Attributes<IF>::max_follow_policy (CORBA::Environment&) +TAO_Import_Attributes<IF>::max_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_follow_policy (); @@ -306,7 +306,7 @@ TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs) } template <class IF> CosTrading::FollowOption -TAO_Link_Attributes<IF>::max_link_follow_policy (CORBA::Environment &) +TAO_Link_Attributes<IF>::max_link_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->attrs_.max_link_follow_policy (); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h index ea2a7672860..fd7aa7d1dd7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h @@ -113,27 +113,27 @@ public: TAO_Trader_Components (const TAO_Trading_Components_i& comps); // = CosTrading::TraderComponents methods. - virtual CosTrading::Lookup_ptr lookup_if (CORBA::Environment &) + virtual CosTrading::Lookup_ptr lookup_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns an object reference to the Lookup interface of the trader. // Returns nil if the trader does not support Lookup interface. - virtual CosTrading::Register_ptr register_if (CORBA::Environment &) + virtual CosTrading::Register_ptr register_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns object reference for the Register interface of the trader. // Returns nil if the trader does not support Register interface. - virtual CosTrading::Link_ptr link_if (CORBA::Environment &) + virtual CosTrading::Link_ptr link_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns object reference for the Link interface of the trader. // Returns nil if the trader does not support Link interface. - virtual CosTrading::Proxy_ptr proxy_if (CORBA::Environment &) + virtual CosTrading::Proxy_ptr proxy_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns object reference to the Proxy interface of the trader. // Returns nil if the trader does not support Proxy interface. - virtual CosTrading::Admin_ptr admin_if (CORBA::Environment &) + virtual CosTrading::Admin_ptr admin_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns object reference for the Admin interface of the trader. // Returns nil if the trader does not support Admin interface. @@ -152,16 +152,16 @@ public: // = CosTrading::SupportAttributes methods. - virtual CORBA::Boolean supports_modifiable_properties (CORBA::Environment &) + virtual CORBA::Boolean supports_modifiable_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean supports_dynamic_properties (CORBA::Environment &) + virtual CORBA::Boolean supports_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean supports_proxy_offers (CORBA::Environment &) + virtual CORBA::Boolean supports_proxy_offers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CosTrading::TypeRepository_ptr type_repos (CORBA::Environment &) + virtual CosTrading::TypeRepository_ptr type_repos (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -178,47 +178,47 @@ public: // = CosTrading::ImportAttributes methods. - virtual CORBA::ULong def_search_card (CORBA::Environment &) + virtual CORBA::ULong def_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong max_search_card (CORBA::Environment &) + virtual CORBA::ULong max_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Search cardinality determines the maximum number of offers searched // before not considering other offers. - virtual CORBA::ULong def_match_card (CORBA::Environment &) + virtual CORBA::ULong def_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong max_match_card (CORBA::Environment &) + virtual CORBA::ULong max_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Match cardinality determines the maximum number of offers // matched to the constraints before not considering other offers.. - virtual CORBA::ULong def_return_card (CORBA::Environment &) + virtual CORBA::ULong def_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong max_return_card (CORBA::Environment &) + virtual CORBA::ULong max_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return cardinality determines the maximum number of offers marked // to return before not considering other offers. - virtual CORBA::ULong max_list (CORBA::Environment &) + virtual CORBA::ULong max_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong def_hop_count (CORBA::Environment &) + virtual CORBA::ULong def_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong max_hop_count (CORBA::Environment &) + virtual CORBA::ULong max_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CosTrading::FollowOption def_follow_policy (CORBA::Environment &) + virtual CosTrading::FollowOption def_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CosTrading::FollowOption max_follow_policy (CORBA::Environment &) + virtual CosTrading::FollowOption max_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -235,7 +235,7 @@ public: TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs); // = CosTrading::LinkAttributes methods - virtual CosTrading::FollowOption max_link_follow_policy (CORBA::Environment &) + virtual CosTrading::FollowOption max_link_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp index 8264d00775a..9ab03d4f1c8 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp @@ -230,10 +230,10 @@ TAO_Property_Evaluator::is_dynamic_property (int index) CORBA::TypeCode_var type = value.type (); // @@ Seth, this will not work on platforms using environment variable. - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; - if (type->equal (CosTradingDynamic::_tc_DynamicProp, - ACE_TRY_ENV)) + if (type->equal (CosTradingDynamic::_tc_DynamicProp + TAO_ENV_ARG_PARAMETER)) return_value = 1; } @@ -241,8 +241,8 @@ TAO_Property_Evaluator::is_dynamic_property (int index) } CORBA::Any* -TAO_Property_Evaluator::property_value (int index, - CORBA::Environment& ACE_TRY_ENV) +TAO_Property_Evaluator::property_value (int index + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) { CORBA::Any* prop_val = 0; @@ -282,7 +282,7 @@ TAO_Property_Evaluator::property_value (int index, ACE_TRY { // Retrieve the value of the dynamic property. - prop_val = dp_eval->evalDP(name, type, info, ACE_TRY_ENV); + prop_val = dp_eval->evalDP(name, type, info TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->dp_cache_ != 0) @@ -325,8 +325,8 @@ TAO_Property_Evaluator::property_type (int index) } TAO_Property_Evaluator_By_Name:: -TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties, - CORBA::Environment& ACE_TRY_ENV, +TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties + TAO_ENV_ARG_DECL, CORBA::Boolean supports_dp) ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName, CosTrading::IllegalPropertyName)) @@ -377,8 +377,8 @@ is_dynamic_property(const char* property_name) } CORBA::Any* -TAO_Property_Evaluator_By_Name::property_value (const char* property_name, - CORBA::Environment& ACE_TRY_ENV) +TAO_Property_Evaluator_By_Name::property_value (const char* property_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) { int index = 0; @@ -390,8 +390,8 @@ TAO_Property_Evaluator_By_Name::property_value (const char* property_name, if (this->table_.find (prop_name, index) == 0) { prop_value = - this->TAO_Property_Evaluator::property_value (index, - ACE_TRY_ENV); + this->TAO_Property_Evaluator::property_value (index + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -447,12 +447,12 @@ construct_dynamic_prop (const char* name, if (this->prop_.in () == CosTradingDynamic::DynamicPropEval::_nil ()) { // Seth, we need a way to either propagate exceptions out. - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; - this->prop_ = this->_this (ACE_TRY_ENV); + this->prop_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - this->_remove_ref (ACE_TRY_ENV); + this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -472,17 +472,17 @@ TAO_Dynamic_Property::destroy (void) if (this->prop_.in () != CosTradingDynamic::DynamicPropEval::_nil ()) { // @@ Seth, we need a way to propagate exceptions out. - ACE_DECLARE_NEW_CORBA_ENV; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + TAO_ENV_DECLARE_NEW_ENV; + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -503,8 +503,8 @@ const char* TAO_Policies::POLICY_NAMES[] = }; TAO_Policies::TAO_Policies (TAO_Trader_Base& trader, - const CosTrading::PolicySeq& policies, - CORBA::Environment& ACE_TRY_ENV) + const CosTrading::PolicySeq& policies + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName, CosTrading::DuplicatePolicyName)) : trader_ (trader) @@ -572,8 +572,8 @@ TAO_Policies::~TAO_Policies (void) } CORBA::ULong -TAO_Policies::ulong_prop (POLICY_TYPE pol, - CORBA::Environment& ACE_TRY_ENV) const +TAO_Policies::ulong_prop (POLICY_TYPE pol + TAO_ENV_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { CORBA::ULong return_value = 0, max_value = 0; @@ -611,7 +611,7 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol, const CosTrading::PolicyValue& value = policy->value; CORBA::TypeCode_var type = value.type (); - CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong, ACE_TRY_ENV); + CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); if (!equal_ulong) @@ -628,29 +628,29 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol, } CORBA::ULong -TAO_Policies::search_card (CORBA::Environment& ACE_TRY_ENV) const +TAO_Policies::search_card (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->ulong_prop (SEARCH_CARD, ACE_TRY_ENV); + return this->ulong_prop (SEARCH_CARD TAO_ENV_ARG_PARAMETER); } CORBA::ULong -TAO_Policies::match_card (CORBA::Environment& ACE_TRY_ENV) const +TAO_Policies::match_card (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->ulong_prop (MATCH_CARD, ACE_TRY_ENV); + return this->ulong_prop (MATCH_CARD TAO_ENV_ARG_PARAMETER); } CORBA::ULong -TAO_Policies::return_card (CORBA::Environment& ACE_TRY_ENV) const +TAO_Policies::return_card (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->ulong_prop (RETURN_CARD, ACE_TRY_ENV); + return this->ulong_prop (RETURN_CARD TAO_ENV_ARG_PARAMETER); } CORBA::Boolean -TAO_Policies::boolean_prop (POLICY_TYPE pol, - CORBA::Environment& ACE_TRY_ENV) const +TAO_Policies::boolean_prop (POLICY_TYPE pol + TAO_ENV_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { CORBA::Boolean def_value = 1, @@ -683,7 +683,7 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol, CORBA::TypeCode_var type = value.type (); CORBA::Boolean equal_boolean = - type->equal (CORBA::_tc_boolean, ACE_TRY_ENV); + type->equal (CORBA::_tc_boolean TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); if (!equal_boolean) @@ -704,36 +704,36 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol, CORBA::Boolean -TAO_Policies::use_modifiable_properties (CORBA::Environment& ACE_TRY_ENV) const +TAO_Policies::use_modifiable_properties (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->boolean_prop (USE_MODIFIABLE_PROPERTIES, ACE_TRY_ENV); + return this->boolean_prop (USE_MODIFIABLE_PROPERTIES TAO_ENV_ARG_PARAMETER); } CORBA::Boolean -TAO_Policies::use_dynamic_properties (CORBA::Environment& ACE_TRY_ENV) const +TAO_Policies::use_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->boolean_prop (USE_DYNAMIC_PROPERTIES, ACE_TRY_ENV); + return this->boolean_prop (USE_DYNAMIC_PROPERTIES TAO_ENV_ARG_PARAMETER); } CORBA::Boolean -TAO_Policies::use_proxy_offers (CORBA::Environment& ACE_TRY_ENV) const +TAO_Policies::use_proxy_offers (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->boolean_prop (USE_PROXY_OFFERS, ACE_TRY_ENV); + return this->boolean_prop (USE_PROXY_OFFERS TAO_ENV_ARG_PARAMETER); } CORBA::Boolean -TAO_Policies::exact_type_match (CORBA::Environment& ACE_TRY_ENV) const +TAO_Policies::exact_type_match (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->boolean_prop (EXACT_TYPE_MATCH, ACE_TRY_ENV); + return this->boolean_prop (EXACT_TYPE_MATCH TAO_ENV_ARG_PARAMETER); } CosTrading::TraderName* -TAO_Policies::starting_trader (CORBA::Environment& ACE_TRY_ENV) const +TAO_Policies::starting_trader (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, CosTrading::Lookup::InvalidPolicyValue)) { @@ -746,11 +746,11 @@ TAO_Policies::starting_trader (CORBA::Environment& ACE_TRY_ENV) const CORBA::TypeCode_var type = value.type (); CORBA::Boolean equal_tradername = - type->equal (CosTrading::_tc_TraderName, ACE_TRY_ENV); + type->equal (CosTrading::_tc_TraderName TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (trader_name); CORBA::Boolean equal_linknameseq = - type->equal (CosTrading::_tc_LinkNameSeq, ACE_TRY_ENV); + type->equal (CosTrading::_tc_LinkNameSeq TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (trader_name); if (!equal_tradername || @@ -765,7 +765,7 @@ TAO_Policies::starting_trader (CORBA::Environment& ACE_TRY_ENV) const } CosTrading::FollowOption -TAO_Policies::link_follow_rule (CORBA::Environment& ACE_TRY_ENV) const +TAO_Policies::link_follow_rule (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { CosTrading::FollowOption return_value = @@ -782,7 +782,7 @@ TAO_Policies::link_follow_rule (CORBA::Environment& ACE_TRY_ENV) const // Extract the link follow rule CORBA::Boolean type_equal = - type->equal (CosTrading::_tc_FollowOption, ACE_TRY_ENV); + type->equal (CosTrading::_tc_FollowOption TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); if (!type_equal) @@ -799,8 +799,8 @@ TAO_Policies::link_follow_rule (CORBA::Environment& ACE_TRY_ENV) const } CosTrading::FollowOption -TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info, - CORBA::Environment& ACE_TRY_ENV) const +TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info + TAO_ENV_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, CosTrading::Lookup::InvalidPolicyValue, CosTrading::Link::IllegalLinkName, @@ -814,7 +814,7 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info, // If not defined defaults to trader.def_link_follow_rule CosTrading::FollowOption query_link_follow_rule = - this->link_follow_rule (ACE_TRY_ENV); + this->link_follow_rule (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); return_value = (query_link_follow_rule < trader_max_follow_policy) @@ -826,14 +826,14 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info, } CORBA::ULong -TAO_Policies::hop_count (CORBA::Environment& ACE_TRY_ENV) const +TAO_Policies::hop_count (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->ulong_prop (HOP_COUNT, ACE_TRY_ENV); + return this->ulong_prop (HOP_COUNT TAO_ENV_ARG_PARAMETER); } CosTrading::Admin::OctetSeq* -TAO_Policies::request_id (CORBA::Environment& ACE_TRY_ENV) const +TAO_Policies::request_id (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { CosTrading::Admin::OctetSeq* request_id = 0; @@ -845,7 +845,7 @@ TAO_Policies::request_id (CORBA::Environment& ACE_TRY_ENV) const CORBA::TypeCode_var type = value.type (); CORBA::Boolean equal_octetseq = - type->equal (CosTrading::Admin::_tc_OctetSeq, ACE_TRY_ENV); + type->equal (CosTrading::Admin::_tc_OctetSeq TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (request_id); if (!equal_octetseq) @@ -861,8 +861,8 @@ TAO_Policies::request_id (CORBA::Environment& ACE_TRY_ENV) const void TAO_Policies:: copy_in_follow_option (CosTrading::PolicySeq& policy_seq, - const CosTrading::Link::LinkInfo& link_info, - CORBA::Environment& ACE_TRY_ENV) const + const CosTrading::Link::LinkInfo& link_info + TAO_ENV_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, CosTrading::Lookup::InvalidPolicyValue)) { @@ -873,7 +873,7 @@ copy_in_follow_option (CosTrading::PolicySeq& policy_seq, if (this->policies_[LINK_FOLLOW_RULE] != 0) { CosTrading::FollowOption query_link_follow_rule = - this->link_follow_rule (ACE_TRY_ENV); + this->link_follow_rule (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; follow_option = (CosTrading::FollowOption) @@ -943,9 +943,9 @@ copy_to_pass (CosTrading::PolicySeq& policy_seq, if (i == HOP_COUNT) { // @@ Seth, Same thing here, are you trying to catch the exception??? (and forget about it?) - CORBA::Environment env; + TAO_ENV_DECLARE_NEW_ENV; new_policy.name = POLICY_NAMES[HOP_COUNT]; - new_policy.value <<= this->hop_count (env) - 1; + new_policy.value <<= this->hop_count (TAO_ENV_SINGLE_ARG_PARAMETER) - 1; // Don't count hop count twice. if (this->policies_[i] == 0) @@ -1087,8 +1087,8 @@ TAO_Offer_Modifier::~TAO_Offer_Modifier (void) void TAO_Offer_Modifier:: -delete_properties (const CosTrading::PropertyNameSeq& deletes, - CORBA::Environment& ACE_TRY_ENV) +delete_properties (const CosTrading::PropertyNameSeq& deletes + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, CosTrading::Register::MandatoryProperty, CosTrading::IllegalPropertyName, @@ -1127,8 +1127,8 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes, void TAO_Offer_Modifier:: -merge_properties (const CosTrading::PropertySeq& modifies, - CORBA::Environment& ACE_TRY_ENV) +merge_properties (const CosTrading::PropertySeq& modifies + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName, CosTrading::PropertyTypeMismatch, @@ -1174,7 +1174,7 @@ merge_properties (const CosTrading::PropertySeq& modifies, // seemed "safest". CORBA::Boolean td_equal = - type_def->equal (prop_type.in (), ACE_TRY_ENV); + type_def->equal (prop_type.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!td_equal) @@ -1248,26 +1248,26 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies) // CosTrading::PropertySeq::freebuf (prop_buf); } -TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies, - CORBA::Environment& ACE_TRY_ENV) +TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies + TAO_ENV_ARG_DECL) { - search_card_ = policies.search_card (ACE_TRY_ENV); + search_card_ = policies.search_card (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - match_card_ = policies.match_card (ACE_TRY_ENV); + match_card_ = policies.match_card (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - return_card_ = policies.return_card (ACE_TRY_ENV); + return_card_ = policies.return_card (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - dp_ = policies.use_dynamic_properties (ACE_TRY_ENV); + dp_ = policies.use_dynamic_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - mod_ = policies.use_modifiable_properties (ACE_TRY_ENV); + mod_ = policies.use_modifiable_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Boolean exact_type_match = - policies.exact_type_match (ACE_TRY_ENV); + policies.exact_type_match (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (exact_type_match == 1) @@ -1422,8 +1422,8 @@ TAO_Offer_Filter::limits_applied (void) } TAO_Property_Filter:: -TAO_Property_Filter (const SPECIFIED_PROPS& desired_props, - CORBA::Environment& ACE_TRY_ENV) +TAO_Property_Filter (const SPECIFIED_PROPS& desired_props + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)) : policy_ (desired_props._d ()) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index e5db59b78ba..f7e52735058 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -72,7 +72,7 @@ public: // Returns 1 if the property at index <index> is dynamic. Returns a // 0 when the index is out of bounds. - CORBA::Any* property_value(int index, CORBA::Environment& _env) + CORBA::Any* property_value(int index TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); // Returns value of the property whose index is <index>. If the @@ -129,8 +129,8 @@ class TAO_Trading_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Ev // be O(lg n). public: - TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties, - CORBA::Environment& _env, + TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties + TAO_ENV_ARG_DECL , CORBA::Boolean supports_dp = 1) ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName, CosTrading::IllegalPropertyName)); @@ -146,8 +146,8 @@ public: // defined and dynamic. If the property is undefined, this method // will throw a Property_Undefined exception with impunity. - CORBA::Any* property_value(const char* property_name, - CORBA::Environment& _env) + CORBA::Any* property_value(const char* property_name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); // This method is identical to its counterpart in @@ -187,8 +187,8 @@ public: virtual CORBA::Any* evalDP(const char* name, CORBA::TypeCode_ptr returned_type, - const CORBA::Any& extra_info, - CORBA::Environment& _env) + const CORBA::Any& extra_info + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTradingDynamic::DPEvalFailure)) = 0; // Dynamic property evaluation call-back method. @@ -245,8 +245,8 @@ public: static const char * POLICY_NAMES[]; TAO_Policies (TAO_Trader_Base& trader, - const CosTrading::PolicySeq& policies, - CORBA::Environment& _env) + const CosTrading::PolicySeq& policies + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName, CosTrading::DuplicatePolicyName)); @@ -274,7 +274,7 @@ public: ~TAO_Policies (void); - CORBA::ULong search_card (CORBA::Environment& _env) const + CORBA::ULong search_card (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC @@ -286,7 +286,7 @@ public: // trader's def_search_card attribute is used. // END SPEC - CORBA::ULong match_card (CORBA::Environment& _env) const + CORBA::ULong match_card (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC @@ -298,7 +298,7 @@ public: // attribute is used. // END SPEC - CORBA::ULong return_card (CORBA::Environment& _env) const + CORBA::ULong return_card (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC @@ -312,7 +312,7 @@ public: // = Offer consideration policies - CORBA::Boolean use_modifiable_properties (CORBA::Environment& _env) const + CORBA::Boolean use_modifiable_properties (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC @@ -325,7 +325,7 @@ public: // included. // END SPEC - CORBA::Boolean use_dynamic_properties (CORBA::Environment& _env) const + CORBA::Boolean use_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC @@ -338,7 +338,7 @@ public: // included. // END SPEC - CORBA::Boolean use_proxy_offers (CORBA::Environment& _env) const + CORBA::Boolean use_proxy_offers (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC @@ -350,7 +350,7 @@ public: // specified, such offers will be included. // END SPEC - CORBA::Boolean exact_type_match (CORBA::Environment& _env) const + CORBA::Boolean exact_type_match (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC @@ -362,7 +362,7 @@ public: // = Federated trader policies (not implemented yet) - CosTrading::TraderName* starting_trader (CORBA::Environment& _env) const + CosTrading::TraderName* starting_trader (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, CosTrading::Lookup::InvalidPolicyValue)); // BEGIN SPEC @@ -381,7 +381,7 @@ public: // "starting_trader" policy with the first component removed. // END SPEC - CosTrading::FollowOption link_follow_rule (CORBA::Environment& _env) const + CosTrading::FollowOption link_follow_rule (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // Determine the link follow policy for this query overall. @@ -392,8 +392,8 @@ public: // END SPEC - CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info, - CORBA::Environment& _env) const + CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info + TAO_ENV_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, CosTrading::Lookup::InvalidPolicyValue, CosTrading::Link::IllegalLinkName, @@ -407,7 +407,7 @@ public: // else min(trader.max_follow_policy, link.limiting_follow_rule, // trader.def_follow_policy) - CORBA::ULong hop_count (CORBA::Environment& _env) const + CORBA::ULong hop_count (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // BEGIN SPEC @@ -422,7 +422,7 @@ public: // decremented before passing on to a federated trader. // END SPEC - CosTrading::Admin::OctetSeq* request_id (CORBA::Environment& _env) const + CosTrading::Admin::OctetSeq* request_id (TAO_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // Return the request_id passed to the query method across a link to // another trader. @@ -436,8 +436,8 @@ public: // Policies to forward to the next trader in a directed query. void copy_in_follow_option (CosTrading::PolicySeq& policy_seq, - const CosTrading::Link::LinkInfo& link_info, - CORBA::Environment& _env) const + const CosTrading::Link::LinkInfo& link_info + TAO_ENV_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, CosTrading::Lookup::InvalidPolicyValue)); // Determine the link follow policy to pass down the link with <link_name>. @@ -451,13 +451,13 @@ public: private: - CORBA::ULong ulong_prop (POLICY_TYPE pol, - CORBA::Environment& _env) const + CORBA::ULong ulong_prop (POLICY_TYPE pol + TAO_ENV_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // Reconclile a ULong property with its default. - CORBA::Boolean boolean_prop (POLICY_TYPE pol, - CORBA::Environment& _env) const + CORBA::Boolean boolean_prop (POLICY_TYPE pol + TAO_ENV_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // Reconcile a Boolean property with its debault. @@ -567,8 +567,8 @@ public: ~TAO_Offer_Modifier (void); - void delete_properties (const CosTrading::PropertyNameSeq& deletes, - CORBA::Environment& _env) + void delete_properties (const CosTrading::PropertyNameSeq& deletes + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, CosTrading::Register::MandatoryProperty, CosTrading::IllegalPropertyName, @@ -576,8 +576,8 @@ public: // Delete the properties whose names were given to the // constructor. Ensure we don't delete mandatory properties. - void merge_properties (const CosTrading::PropertySeq& modifies, - CORBA::Environment& _env) + void merge_properties (const CosTrading::PropertySeq& modifies + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName, CosTrading::PropertyTypeMismatch, @@ -638,8 +638,8 @@ class TAO_Offer_Filter // enforcer. public: - TAO_Offer_Filter (TAO_Policies& policies, - CORBA::Environment& _env); + TAO_Offer_Filter (TAO_Policies& policies + TAO_ENV_ARG_DECL); // Glean from the TypeStruct and Policy setting the appropriate way // to screen unsuitable offers from consideration. @@ -716,8 +716,8 @@ public: TAO_Property_Filter (void) : policy_ (CosTrading::Lookup::all) {} // An accomplice to g++'s insane lust for copy constructors. - TAO_Property_Filter (const SPECIFIED_PROPS& desired_props, - CORBA::Environment& env) + TAO_Property_Filter (const SPECIFIED_PROPS& desired_props + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)); // Verify that the specified properties are correct. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index 629756484c0..9074816f56b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -75,13 +75,13 @@ TAO_Trading_Loader::~TAO_Trading_Loader (void) int TAO_Trading_Loader::init (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB Manager this->orb_manager_.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = @@ -89,7 +89,7 @@ TAO_Trading_Loader::init (int argc, char *argv[]) // Initializes and sets up the Trading Service CORBA::Object_var object = - this->create_object (orb.in (), argc, argv, ACE_TRY_ENV); + this->create_object (orb.in (), argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -115,7 +115,7 @@ TAO_Trading_Loader::fini (void) trd_comp.link_if (); CosTrading::LinkNameSeq_var link_name_seq = - our_link->list_links (ACE_TRY_ENV); + our_link->list_links (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -131,16 +131,16 @@ TAO_Trading_Loader::fini (void) ACE_DEBUG ((LM_DEBUG, "*** Describing the next link.\n")); CosTrading::Link::LinkInfo_var link_info = - our_link->describe_link (link_name_seq[i], - ACE_TRY_ENV); + our_link->describe_link (link_name_seq[i] + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "*** Removing link to %s.\n", ACE_static_cast (const char *, link_name_seq[i]))); - our_link->remove_link (link_name_seq[i], - ACE_TRY_ENV); + our_link->remove_link (link_name_seq[i] + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosTrading::Lookup_ptr remote_lookup; @@ -150,18 +150,18 @@ TAO_Trading_Loader::fini (void) ACE_DEBUG ((LM_DEBUG, "*** Retrieving its link interface.\n")); CosTrading::Link_var remote_link = - remote_lookup->link_if (ACE_TRY_ENV); + remote_lookup->link_if (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "*** Removing its link to us.\n")); if (this->bootstrapper_) - remote_link->remove_link ("Bootstrap", - ACE_TRY_ENV); + remote_link->remove_link ("Bootstrap" + TAO_ENV_ARG_PARAMETER); else - remote_link->remove_link (this->name_.in (), - ACE_TRY_ENV); + remote_link->remove_link (this->name_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -176,10 +176,10 @@ TAO_Trading_Loader::fini (void) } int -TAO_Trading_Loader::run (CORBA::Environment &ACE_TRY_ENV) +TAO_Trading_Loader::run (TAO_ENV_SINGLE_ARG_DECL) { int return_value = - this->orb_manager_.run (ACE_TRY_ENV); + this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return return_value; @@ -187,15 +187,15 @@ TAO_Trading_Loader::run (CORBA::Environment &ACE_TRY_ENV) CORBA::Object_ptr TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr, - int argc, char *argv[], - CORBA::Environment &ACE_TRY_ENV) + int argc, char *argv[] + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Duplicate the ORB CORBA::ORB_var orb = CORBA::ORB::_duplicate (orb_ptr); // Activating the poa manager - this->orb_manager_.activate_poa_manager (ACE_TRY_ENV); + this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Create a Trader Object and set its Service Type Repository. @@ -209,7 +209,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr, TAO_Trading_Components_i &trd_comp = this->trader_->trading_components (); - sup_attr.type_repos (this->type_repos_._this (ACE_TRY_ENV)); + sup_attr.type_repos (this->type_repos_._this (TAO_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // The Spec says: return a reference to the Lookup interface from @@ -218,8 +218,8 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr, trd_comp.lookup_if (); this->ior_ = - orb->object_to_string (lookup, - ACE_TRY_ENV); + orb->object_to_string (lookup + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Parse the args @@ -242,7 +242,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr, // @@ Could do other things. For example, every timeout // period try to federate again, but let's not hardcode that // policy. - int rc = this->bootstrap_to_federation (ACE_TRY_ENV); + int rc = this->bootstrap_to_federation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); if (rc == -1) @@ -255,7 +255,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr, } int -TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV) +TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL) { // If all traders follow this strategy, it creates a complete graph // of all known traders on a multicast network. @@ -265,7 +265,7 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, "*** Bootstrapping to another Trading Service.\n")); CORBA::Object_var trading_obj = - orb->resolve_initial_references ("TradingService", ACE_TRY_ENV); + orb->resolve_initial_references ("TradingService" TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (trading_obj.in ())) @@ -277,14 +277,14 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n")); CosTrading::Lookup_var lookup_if = - CosTrading::Lookup::_narrow (trading_obj.in (), - ACE_TRY_ENV); + CosTrading::Lookup::_narrow (trading_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "*** Obtaining the link interface.\n")); CosTrading::Link_var link_if = - lookup_if->link_if (ACE_TRY_ENV); + lookup_if->link_if (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); TAO_Trading_Components_i &trd_comp = @@ -299,8 +299,8 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV) link_if->add_link (this->name_.in (), our_lookup, CosTrading::always, - CosTrading::always, - ACE_TRY_ENV); + CosTrading::always + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -308,14 +308,14 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV) our_link->add_link ("Bootstrap", lookup_if.in (), CosTrading::always, - CosTrading::always, - ACE_TRY_ENV); + CosTrading::always + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "*** Retrieving list of known linked traders.\n")); CosTrading::LinkNameSeq_var link_name_seq = - link_if->list_links (ACE_TRY_ENV); + link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -334,8 +334,8 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV) ACE_static_cast (const char *, link_name_seq[i]))); CosTrading::Link::LinkInfo_var link_info = - link_if->describe_link (link_name_seq[i], - ACE_TRY_ENV); + link_if->describe_link (link_name_seq[i] + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CosTrading::Lookup_ptr remote_lookup; @@ -344,7 +344,7 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, "*** Retrieving its link interface.\n")); CosTrading::Link_var remote_link = - remote_lookup->link_if (ACE_TRY_ENV); + remote_lookup->link_if (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -352,8 +352,8 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV) remote_link->add_link (this->name_.in (), our_lookup, CosTrading::always, - CosTrading::always, - ACE_TRY_ENV); + CosTrading::always + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -361,8 +361,8 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV) our_link->add_link (link_name_seq[i], remote_lookup, CosTrading::always, - CosTrading::always, - ACE_TRY_ENV); + CosTrading::always + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index 2536febca92..7b994f6d36d 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -46,12 +46,12 @@ public: // Called by the Service Configurator framework to remove the // Event Service. Defined in <ace/Service_Config.h> - int run (CORBA::Environment &ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL); // Run the Trading Service CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, - int argc, char *argv[], - CORBA::Environment &ACE_TRY_ENV) + int argc, char *argv[] + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This function call initializes the Trading Service given a reference to the // ORB and the command line parameters. @@ -62,7 +62,7 @@ public: // Enable the Trading Service to answer multicast requests for its // IOR. - int bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV); + int bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL); // Bootstrap to another trader, and attach to its trader network. int parse_args (int &argc, char *argv []); |