diff options
| author | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-29 20:21:11 +0000 |
|---|---|---|
| committer | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-29 20:21:11 +0000 |
| commit | 56681ffa90714cf82c32e907c0f80cea75166740 (patch) | |
| tree | fd798ba5478a08b4b6f842cb8515ed9776861f5f /TAO/orbsvcs/orbsvcs | |
| parent | 6b5e98c78a7f66029147fad41e2e75cea35854aa (diff) | |
| download | ATCD-56681ffa90714cf82c32e907c0f80cea75166740.tar.gz | |
ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
427 files changed, 4949 insertions, 4949 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index efbedd11025..4b2ef6a487e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -73,7 +73,7 @@ TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (void) // Empty the_spec means apply operation to all flows void TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { @@ -92,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + flow_connection_entry->int_id_->stop (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -103,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + entry->int_id_->stop (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -122,7 +122,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec // Empty the_spec means apply operation to all flows void TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { @@ -142,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + flow_connection_entry->int_id_->start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -153,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + entry->int_id_->start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -174,7 +174,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec void TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { @@ -192,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + flow_connection_entry->int_id_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -204,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + entry->int_id_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -225,7 +225,7 @@ CORBA::Boolean TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/, const AVStreams::flowSpec &/*flowspec*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) @@ -237,7 +237,7 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/, // E.g., loss of flow, reestablishment of flow, etc.. void TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -249,7 +249,7 @@ void TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec, const char *fp_name, const CORBA::Any &fp_settings - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::FPError)) @@ -257,7 +257,7 @@ 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 TAO_ENV_ARG_PARAMETER); + this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -265,7 +265,7 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec, // Gets the flow connection. CORBA::Object_ptr TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::notSupported)) @@ -282,7 +282,7 @@ TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name void TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name, CORBA::Object_ptr flow_connection_obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::notSupported)) @@ -290,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 TAO_ENV_ARG_PARAMETER); + flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -323,7 +323,7 @@ TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void) CORBA::Boolean TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr /* remote_negotiator */, const AVStreams::streamQoS &/* qos_spec */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -365,11 +365,11 @@ int MMDevice_Map_Hash_Key::operator == (const MMDevice_Map_Hash_Key &hash_key) const { CORBA::Boolean result = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { result = - this->mmdevice_->_is_equivalent (hash_key.mmdevice_ TAO_ENV_ARG_PARAMETER); + this->mmdevice_->_is_equivalent (hash_key.mmdevice_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -387,14 +387,14 @@ operator < (const MMDevice_Map_Hash_Key &left, const MMDevice_Map_Hash_Key &right) { int result = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ULong left_hash = left.mmdevice_->_hash (left.hash_maximum_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong right_hash = right.mmdevice_->_hash (right.hash_maximum_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result = left_hash < right_hash; } @@ -412,11 +412,11 @@ u_long MMDevice_Map_Hash_Key::hash (void) const { u_long result = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { result = this->mmdevice_->_hash (this->hash_maximum_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -436,10 +436,10 @@ MMDevice_Map_Hash_Key::hash (void) const TAO_StreamCtrl::TAO_StreamCtrl (void) :mcastconfigif_ (0) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->streamctrl_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->streamctrl_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; char buf [BUFSIZ]; int result = ACE_OS::hostname (buf, BUFSIZ); @@ -477,13 +477,13 @@ TAO_StreamCtrl::~TAO_StreamCtrl (void) // Empty the_spec means apply operation to all flows void TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { ACE_TRY { - TAO_Basic_StreamCtrl::stop (flow_spec TAO_ENV_ARG_PARAMETER); + TAO_Basic_StreamCtrl::stop (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->flow_connection_map_.current_size () > 0) return; @@ -491,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 TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->stop (flow_spec ACE_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 TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->stop (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -514,13 +514,13 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec // Empty the_spec means apply operation to all flows void TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { ACE_TRY { - TAO_Basic_StreamCtrl::start (flow_spec TAO_ENV_ARG_PARAMETER); + TAO_Basic_StreamCtrl::start (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->flow_connection_map_.current_size () > 0) return; @@ -529,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 TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->start (flow_spec ACE_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 TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->start (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -553,13 +553,13 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec // Empty the_spec means apply operation to all flows void TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { ACE_TRY { - TAO_Basic_StreamCtrl::destroy (flow_spec TAO_ENV_ARG_PARAMETER); + TAO_Basic_StreamCtrl::destroy (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->flow_connection_map_.current_size () > 0) return; @@ -568,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 TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->destroy (flow_spec ACE_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 TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -600,7 +600,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, AVStreams::MMDevice_ptr b_party, AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_flows - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -649,7 +649,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, met_qos, named_vdev.inout (), the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) @@ -659,21 +659,21 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, streamctrl_any <<= this->streamctrl_.in (); this->sep_a_->define_property ("Related_StreamCtrl", streamctrl_any - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -681,7 +681,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, mmdevice_a_any <<= a_party; this->vdev_a_->define_property ("Related_MMDevice", mmdevice_a_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // add the mmdevice, sep and vdev to the map. @@ -720,7 +720,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, met_qos, named_vdev.inout (), the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n")); @@ -728,28 +728,28 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, 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 () - TAO_ENV_ARG_PARAMETER))); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -757,7 +757,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, mmdevice_b_any <<= b_party; this->vdev_b_->define_property ("Related_MMDevice", mmdevice_b_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // add the mmdevice, sep and vdev to the map. MMDevice_Map_Entry map_entry; @@ -783,12 +783,12 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, sep_b_peer_any <<= this->sep_a_.in(); this->sep_a_->define_property ("PeerAdapter", sep_a_peer_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sep_b_->define_property ("PeerAdapter", sep_b_peer_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -801,20 +801,20 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, ACE_TRY_EX (set_source_id) { CORBA::Any_ptr flows_any = this->sep_a_->get_property_value ("Flows" - TAO_ENV_ARG_PARAMETER); + ACE_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] TAO_ENV_ARG_PARAMETER); + this->sep_a_->get_fep (flows [i] ACE_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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); producer->set_source_id (this->source_id_++); } @@ -839,7 +839,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, // the streamctrl has to give an array of source ids to // the sep. this->sep_a_->set_source_id (this->source_id_++ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -850,7 +850,7 @@ 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mcastconfigif_ptr_ = this->mcastconfigif_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // Multicast source being added. @@ -858,7 +858,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->mcastconfigif_ptr_.in (), the_qos, the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (!result) ACE_ERROR_RETURN ((LM_ERROR, "set_Mcast_peer failed\n"), 0); } @@ -873,7 +873,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->mcastconfigif_->set_peer (this->vdev_b_.in (), the_qos, the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -885,7 +885,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, connect_leaf_success = this->sep_a_->connect_leaf (this->sep_b_.in (), the_qos, the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (connect_leaf); connect_leaf_success = 1; } @@ -905,9 +905,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 TAO_ENV_ARG_PARAMETER); + this->sep_a_->multiconnect (the_qos, connect_flows ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->sep_b_->multiconnect (the_qos, connect_flows TAO_ENV_ARG_PARAMETER); + this->sep_b_->multiconnect (the_qos, connect_flows ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -921,14 +921,14 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->vdev_b_.in (), the_qos, the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->vdev_b_->set_peer (this->streamctrl_.in (), this->vdev_a_.in (), the_qos, the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -938,7 +938,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->sep_a_->connect (this->sep_b_.in (), the_qos, the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == 0) ACE_ERROR_RETURN ((LM_ERROR, "sep_a->connect (sep_b) failed\n"), 0); @@ -951,7 +951,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->sep_b_.in (), the_qos, the_flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -973,7 +973,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, AVStreams::StreamEndPoint_B_ptr sep_b, AVStreams::streamQoS &stream_qos, const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -997,24 +997,24 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, sep_any <<= sep_b; sep_a->define_property ("PeerAdapter", sep_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sep_any <<= sep_a; sep_b->define_property ("PeerAdapter", sep_any - TAO_ENV_ARG_PARAMETER); + ACE_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" TAO_ENV_ARG_PARAMETER); + flows_any = sep_a->get_property_value ("Flows" ACE_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" TAO_ENV_ARG_PARAMETER); + flows_any = sep_b->get_property_value ("Flows" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; flows_any.in () >>= temp_flows; b_flows = *temp_flows; @@ -1033,11 +1033,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, // get the flowendpoint references. CORBA::Object_var fep_obj = sep_a->get_fep (flowname - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::FlowEndPoint_ptr fep = AVStreams::FlowEndPoint::_narrow (fep_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_CString fep_key (flowname); result = a_fep_map->bind (fep_key, fep); @@ -1051,11 +1051,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, // get the flowendpoint references. CORBA::Object_var fep_obj = sep_b->get_fep (flowname - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::FlowEndPoint_ptr fep = AVStreams::FlowEndPoint::_narrow (fep_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_CString fep_key (flowname); result = b_fep_map->bind (fep_key, fep); @@ -1119,7 +1119,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + fep_a->get_connected_fep (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); if (!CORBA::is_nil (connected_to.in ())) @@ -1136,7 +1136,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + fep_b->get_connected_fep (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); if (!CORBA::is_nil (connected_to.in ())) @@ -1146,7 +1146,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, } if (fep_a->is_fep_compatible (fep_b - TAO_ENV_ARG_PARAMETER) == 1) + ACE_ENV_ARG_PARAMETER) == 1) { ACE_TRY_CHECK_EX (flow_connect); // assume that flow names are same so that we @@ -1154,7 +1154,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, CORBA::Object_var flow_connection_obj; CORBA::Any_var flowname_any = fep_a->get_property_value ("Flow" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); const char *flowname = 0; flowname_any.in () >>= flowname; @@ -1162,11 +1162,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, { flow_connection_obj = this->get_flow_connection (flowname - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); } ACE_CATCHANY @@ -1175,11 +1175,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, ACE_NEW_RETURN (flowConnection, TAO_FlowConnection, 0); - flow_connection = flowConnection->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + flow_connection = flowConnection->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); this->set_flow_connection (flowname, flow_connection.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); } ACE_ENDTRY; @@ -1198,11 +1198,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, { producer = AVStreams::FlowProducer::_narrow (fep_a - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); consumer = AVStreams::FlowConsumer::_narrow (fep_b - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); // If the types don't match then try in @@ -1211,11 +1211,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, { producer = AVStreams::FlowProducer::_narrow (fep_b - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); consumer = AVStreams::FlowConsumer::_narrow (fep_a - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (producer_check); } // At this point they should both be @@ -1234,12 +1234,12 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, ACE_CHECK_RETURN (0); CORBA::String_var fep_a_name, fep_b_name; flowname_any = fep_a->get_property_value ("FlowName" - TAO_ENV_ARG_PARAMETER); + ACE_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" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); flowname_any.in () >>= temp_name; fep_b_name = CORBA::string_dup (temp_name); AVStreams::QoS flow_qos; @@ -1258,7 +1258,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, flow_connection->connect (producer.in (), consumer.in (), flow_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connect); } } @@ -1280,7 +1280,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, this->sep_a_->connect (this->sep_b_.in (), stream_qos, flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -1289,7 +1289,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, } void -TAO_StreamCtrl::unbind (TAO_ENV_SINGLE_ARG_DECL) +TAO_StreamCtrl::unbind (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed)) { @@ -1305,13 +1305,13 @@ TAO_StreamCtrl::unbind (TAO_ENV_SINGLE_ARG_DECL) MMDevice_Map::ENTRY *entry = 0; for (;a_iterator.next (entry)!= 0;a_iterator.advance ()) { - entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->destroy (flow_spec ACE_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 TAO_ENV_ARG_PARAMETER); + entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1327,7 +1327,7 @@ TAO_StreamCtrl::unbind (TAO_ENV_SINGLE_ARG_DECL) void TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */, const AVStreams::flowSpec &/* the_spec */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow)) @@ -1337,7 +1337,7 @@ TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */, void TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */, const AVStreams::flowSpec & /* the_spec */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow)) @@ -1347,7 +1347,7 @@ TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */, AVStreams::VDev_ptr TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev, AVStreams::StreamEndPoint_out sep - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed)) { @@ -1369,7 +1369,7 @@ CORBA::Boolean TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) @@ -1438,13 +1438,13 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos, if (in_flowspec.length () != 0) { - this->vdev_a_->modify_QoS (new_qos, in_flowspec TAO_ENV_ARG_PARAMETER); + this->vdev_a_->modify_QoS (new_qos, in_flowspec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } if (out_flowspec.length () != 0) { - this->vdev_b_->modify_QoS (new_qos, out_flowspec TAO_ENV_ARG_PARAMETER); + this->vdev_b_->modify_QoS (new_qos, out_flowspec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1479,7 +1479,7 @@ CORBA::Boolean TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer, AVStreams::streamQoS & qos, const AVStreams::flowSpec & flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)) @@ -1490,7 +1490,7 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer, ACE_NEW_RETURN (info, Peer_Info, 0); - info->peer_ = AVStreams::VDev::_narrow (peer TAO_ENV_ARG_PARAMETER); + info->peer_ = AVStreams::VDev::_narrow (peer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; info->qos_ = qos; info->flow_spec_ = flow_spec; @@ -1509,7 +1509,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Peer_Info *info; @@ -1519,7 +1519,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 TAO_ENV_ARG_PARAMETER); + info->peer_->configure (a_configuration ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1535,7 +1535,7 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati void TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties &initial - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->initial_configuration_ = initial; @@ -1545,7 +1545,7 @@ TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properti void TAO_MCastConfigIf::set_format (const char * flowName, const char * format_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -1558,7 +1558,7 @@ TAO_MCastConfigIf::set_format (const char * flowName, { if (this->in_flowSpec (info->flow_spec_, flowName)) { - info->peer_->set_format (flowName, format_name TAO_ENV_ARG_PARAMETER); + info->peer_->set_format (flowName, format_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1576,7 +1576,7 @@ TAO_MCastConfigIf::set_format (const char * flowName, void TAO_MCastConfigIf::set_dev_params (const char * flowName, const CosPropertyService::Properties & new_params - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)) @@ -1591,7 +1591,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 TAO_ENV_ARG_PARAMETER); + info->peer_->set_dev_params (flowName, new_params ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -1650,21 +1650,21 @@ TAO_Base_StreamEndPoint::handle_open (void) int TAO_Base_StreamEndPoint::handle_stop (const AVStreams::flowSpec & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } int TAO_Base_StreamEndPoint::handle_start (const AVStreams::flowSpec & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } int TAO_Base_StreamEndPoint::handle_destroy (const AVStreams::flowSpec & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } @@ -1686,7 +1686,7 @@ TAO_Base_StreamEndPoint::handle_postconnect (AVStreams::flowSpec &) // The following function is for backward compatibility. CORBA::Boolean TAO_Base_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 1; } @@ -1758,7 +1758,7 @@ CORBA::Boolean TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, AVStreams::streamQoS &qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -1784,7 +1784,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder, CORBA::Boolean result = this->negotiator_->negotiate (peer_negotiator, qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (negotiate); if (!result) if (TAO_debug_level > 0) @@ -1805,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" TAO_ENV_ARG_PARAMETER); + responder->get_property_value ("AvailableProtocols" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (available_protocols); AVStreams::protocolSpec peer_protocols; AVStreams::protocolSpec *temp_protocols; @@ -1884,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::StreamEndPoint_var streamendpoint = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; retv = responder->request_connection (streamendpoint.in (), 0, network_qos, flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) @@ -1959,12 +1959,12 @@ TAO_StreamEndPoint::translate_qos (const AVStreams::streamQoS& application_qos, void TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { // Make the upcall into the app - this->handle_stop (flow_spec TAO_ENV_ARG_PARAMETER); + this->handle_stop (flow_spec ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (flow_spec.length () > 0) @@ -2007,13 +2007,13 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec // Empty the_spec --> apply to all flows void TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->handle_start (flow_spec ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (flow_spec.length () > 0) @@ -2098,12 +2098,12 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec // Close the connection void TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)) { CORBA::Any_var vdev_any = this->get_property_value ("Related_VDev" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); CORBA::Any_var mc_str_any; CORBA::Object_var mc_obj; AVStreams::VDev_ptr vdev; @@ -2112,10 +2112,10 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec const char *media_ctrl_str; vdev_any.in() >>= vdev; mc_str_any = vdev->get_property_value ("Related_MediaCtrl" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); mc_str_any.in() >>= media_ctrl_str; mc_obj = TAO_AV_CORE::instance()->orb()->string_to_object (media_ctrl_str - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); media_ctrl = Null_MediaCtrl::_narrow (mc_obj.in()); // deactivate the associated vdev and media ctrl @@ -2210,7 +2210,7 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec } // Make the upcall into the app - // this->handle_destroy (the_spec TAO_ENV_ARG_PARAMETER); + // this->handle_destroy (the_spec ACE_ENV_ARG_PARAMETER); // } @@ -2221,7 +2221,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato CORBA::Boolean /*is_mcast*/, AVStreams::streamQoS &qos, AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpDenied, AVStreams::noSuchFlow, @@ -2293,7 +2293,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato return 0; // Make the upcall to the app - result = this->handle_connection_requested (flow_spec TAO_ENV_ARG_PARAMETER); + result = this->handle_connection_requested (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2310,7 +2310,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato int TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_flows - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -2347,7 +2347,7 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos, CORBA::Boolean TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_flows - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) @@ -2356,7 +2356,7 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::modify_QoS\n")); - int result = this->change_qos (new_qos, the_flows TAO_ENV_ARG_PARAMETER); + int result = this->change_qos (new_qos, the_flows ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (result != 0) @@ -2370,7 +2370,7 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, CORBA::Boolean TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &protocols - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -2380,7 +2380,7 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro protocol_restriction_any <<= protocols; this->define_property ("ProtocolRestriction", protocol_restriction_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->protocols_ = protocols; } @@ -2397,7 +2397,7 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro void TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::streamOpFailed)) @@ -2411,7 +2411,7 @@ void TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/, const char *fp_name, const CORBA::Any &fp_settings - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::FPError)) @@ -2425,7 +2425,7 @@ TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/, CORBA::Object_ptr TAO_StreamEndPoint::get_fep (const char *flow_name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow)) @@ -2439,7 +2439,7 @@ TAO_StreamEndPoint::get_fep (const char *flow_name char* TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -2461,7 +2461,7 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep flowname_any <<= flow_name.in (); fep->define_property ("Flow", flowname_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2476,7 +2476,7 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep char* TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -2485,7 +2485,7 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep ACE_TRY { CORBA::Any_var flow_name_any = - fep->get_property_value ("FlowName" TAO_ENV_ARG_PARAMETER); + fep->get_property_value ("FlowName" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; const char *tmp; @@ -2495,7 +2495,7 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep ACE_CATCHANY { flow_name = - this->add_fep_i_add_property (fep TAO_ENV_ARG_PARAMETER); + this->add_fep_i_add_property (fep ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } ACE_ENDTRY; @@ -2504,22 +2504,22 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep char * TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) { AVStreams::FlowEndPoint_var fep = - AVStreams::FlowEndPoint::_narrow (fep_obj TAO_ENV_ARG_PARAMETER); + AVStreams::FlowEndPoint::_narrow (fep_obj ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::String_var flow_name = - this->add_fep_i (fep.in () TAO_ENV_ARG_PARAMETER); + this->add_fep_i (fep.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_TRY { - fep->lock (TAO_ENV_SINGLE_ARG_PARAMETER); + fep->lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Add it to the sequence of flowNames supported. // put the flowname and the flowendpoint in a hashtable. @@ -2537,7 +2537,7 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj flows_any <<= this->flows_; this->define_property ("Flows", flows_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2552,7 +2552,7 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj void TAO_StreamEndPoint::remove_fep (const char *flow_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -2575,7 +2575,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name this->flows_ = new_flows; this->define_property ("Flows", flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2589,7 +2589,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name // Sets the negotiator object. void TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -2598,7 +2598,7 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator negotiator <<= new_negotiator; this->define_property ("Negotiator", negotiator - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->negotiator_ = AVStreams::Negotiator::_duplicate (new_negotiator); } @@ -2615,7 +2615,7 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator void TAO_StreamEndPoint::set_key (const char *flow_name, const AVStreams::key & the_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -2627,7 +2627,7 @@ TAO_StreamEndPoint::set_key (const char *flow_name, ACE_OS::sprintf (PublicKey_property, "%s_PublicKey", flow_name); this->define_property (PublicKey_property, PublicKey - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2641,7 +2641,7 @@ TAO_StreamEndPoint::set_key (const char *flow_name, // Set the source id. void TAO_StreamEndPoint::set_source_id (CORBA::Long source_id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->source_id_ = source_id; @@ -2650,7 +2650,7 @@ TAO_StreamEndPoint::set_source_id (CORBA::Long source_id CORBA::Boolean TAO_StreamEndPoint::multiconnect (AVStreams::streamQoS &/*the_qos*/, AVStreams::flowSpec &/*flow_spec*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::multiconnect\n")); @@ -2701,7 +2701,7 @@ TAO_StreamEndPoint_A::TAO_StreamEndPoint_A (void) CORBA::Boolean TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -2738,7 +2738,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 TAO_ENV_ARG_PARAMETER); + AVStreams::FlowProducer_var producer = AVStreams::FlowProducer::_narrow (flow_endpoint ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (narrow); // Else narrow succeeeded. if (!CORBA::is_nil (producer.in ())) @@ -2750,7 +2750,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, { CORBA::Any_var streamctrl_any; streamctrl_any = this->get_property_value ("Related_StreamCtrl" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::StreamCtrl_ptr streamctrl; streamctrl_any.in () >>= streamctrl; @@ -2759,10 +2759,10 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, CORBA::Object_var flow_connection_obj = this->streamctrl_->get_flow_connection (forward_entry->flowname () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); } ACE_CATCHANY @@ -2775,11 +2775,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + flow_connection = flowConnection->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->streamctrl_->set_flow_connection (forward_entry->flowname (), flow_connection.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -2789,12 +2789,12 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, CORBA::Any fp_settings; flow_connection->use_flow_protocol (forward_entry->flow_protocol_str (), fp_settings - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } result = flow_connection->add_producer (producer.in (), flow_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == 0) ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_A::multiconnect: add_producer failed\n"), 0); @@ -2894,7 +2894,7 @@ CORBA::Boolean TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */, AVStreams::streamQoS & /* the_qos */, const AVStreams::flowSpec & /* the_flows */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -2908,7 +2908,7 @@ TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */ void TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */, const AVStreams::flowSpec & /* theSpec */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, @@ -2937,7 +2937,7 @@ TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void) CORBA::Boolean TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -2963,7 +2963,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, AVStreams::FlowConsumer_var consumer; ACE_TRY_EX (narrow) { - consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in () TAO_ENV_ARG_PARAMETER); + consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (narrow); } ACE_CATCHANY @@ -2984,7 +2984,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, { CORBA::Any_var streamctrl_any; streamctrl_any = this->get_property_value ("Related_StreamCtrl" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::StreamCtrl_ptr streamctrl; streamctrl_any.in () >>= streamctrl; @@ -2992,10 +2992,10 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, } CORBA::Object_var flow_connection_obj = this->streamctrl_->get_flow_connection (forward_entry->flowname () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_connection); } ACE_CATCHANY @@ -3007,7 +3007,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, ACE_CHECK_RETURN (0); result = flow_connection->add_consumer (consumer.in (), flow_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == 0) ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect:add_consumer failed\n"), 0); @@ -3089,7 +3089,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, AVStreams::VDev_ptr the_peer_dev, AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -3105,7 +3105,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -3117,7 +3117,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, anyval <<= ior.in (); this->define_property ("Related_VDev", anyval - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -3127,7 +3127,7 @@ 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" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; anyptr.in () >>= media_ctrl_ior; @@ -3136,10 +3136,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 TAO_ENV_ARG_PARAMETER); + (media_ctrl_ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result = this->set_media_ctrl (media_ctrl_obj TAO_ENV_ARG_PARAMETER); + result = this->set_media_ctrl (media_ctrl_obj ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3154,7 +3154,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl, CORBA::Boolean TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_UNUSED_ARG (media_ctrl); @@ -3175,7 +3175,7 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */, AVStreams::MCastConfigIf_ptr mcast_peer, AVStreams::streamQoS &/* the_qos */, const AVStreams::flowSpec &/* the_spec */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -3188,7 +3188,7 @@ 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*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)) @@ -3199,7 +3199,7 @@ TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/ void TAO_VDev::set_format (const char *flowName, const char *format_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -3213,7 +3213,7 @@ TAO_VDev::set_format (const char *flowName, format <<= format_name; this->define_property (format_property, format - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3230,7 +3230,7 @@ TAO_VDev::set_format (const char *flowName, void TAO_VDev::set_dev_params (const char *flowName, const CosPropertyService::Properties &new_params - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)) @@ -3245,7 +3245,7 @@ TAO_VDev::set_dev_params (const char *flowName, devParams <<= new_params; this->define_property (devParams_property, devParams - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3262,7 +3262,7 @@ TAO_VDev::set_dev_params (const char *flowName, CORBA::Boolean TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &flowspec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)) @@ -3282,13 +3282,13 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, CORBA::Any_ptr streamendpoint_a_any = this->get_property_value ("Related_StreamEndpoint" - TAO_ENV_ARG_PARAMETER); + ACE_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); + sep_a->modify_QoS (the_qos, flowspec ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } else ACE_DEBUG ((LM_DEBUG, @@ -3300,10 +3300,10 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, CORBA::Any_ptr streamendpoint_b_any = this->get_property_value ("Related_StreamEndpoint" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); *streamendpoint_b_any >>= sep_b; - sep_b->modify_QoS (the_qos, flowspec TAO_ENV_ARG_PARAMETER); + sep_b->modify_QoS (the_qos, flowspec ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } } @@ -3334,7 +3334,7 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device, AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -3347,15 +3347,15 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device, ACE_NEW_RETURN (this->stream_ctrl_, TAO_StreamCtrl, 0); - AVStreams::MMDevice_var mmdevice = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::MMDevice_var mmdevice = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->stream_ctrl_->bind_devs (peer_device, mmdevice.in (), the_qos, the_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - streamctrl = this->stream_ctrl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + streamctrl = this->stream_ctrl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3374,7 +3374,7 @@ TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer, AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -3397,7 +3397,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, CORBA::Boolean_out met_qos, char *&/*named_vdev*/, const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { AVStreams::StreamEndPoint_A_ptr sep_a (AVStreams::StreamEndPoint_A::_nil ()); AVStreams::StreamEndPoint_B_ptr sep_b (AVStreams::StreamEndPoint_B::_nil ()); @@ -3410,7 +3410,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, { if (this->endpoint_strategy_->create_A (sep_a, the_vdev - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "TAO_MMDevice::create_A_B (%P|%t) - " "error in create_A\n"), @@ -3422,7 +3422,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, { if (this->endpoint_strategy_->create_B (sep_b, the_vdev - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "TAO_MMDevice::create_A_B (%P|%t) - " "error in create_B\n"), @@ -3451,12 +3451,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 () TAO_ENV_ARG_PARAMETER); + streamctrl->get_flow_connection (forward_entry.flowname () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flowconnection); if (!CORBA::is_nil (flowconnection_obj.in ())) { flowconnection = AVStreams::FlowConnection::_narrow (flowconnection_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flowconnection); } } @@ -3494,7 +3494,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, flow_qos, met_qos, named_fdev.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } break; case MMDEVICE_B: @@ -3504,7 +3504,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, flow_qos, met_qos, named_fdev.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } break; } @@ -3525,7 +3525,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, flow_qos, met_qos, named_fdev.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } break; case MMDEVICE_B: @@ -3538,7 +3538,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type, flow_qos, met_qos, named_fdev.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } break; } @@ -3550,10 +3550,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 TAO_ENV_ARG_PARAMETER); + flow_endpoint->define_property ("FlowName", flowname_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sep->add_fep (flow_endpoint.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -3575,7 +3575,7 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl, CORBA::Boolean_out met_qos, char *&named_vdev, const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -3584,16 +3584,16 @@ 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 TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core_instance ()->orb ()->object_to_string (streamctrl ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); AVStreams::StreamEndPoint_A_ptr sep_a = 0; AVStreams::StreamEndPoint_var sep; ACE_TRY { - sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec TAO_ENV_ARG_PARAMETER); + sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in() TAO_ENV_ARG_PARAMETER); + sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3614,7 +3614,7 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl, CORBA::Boolean_out met_qos, char *&named_vdev, const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -3627,9 +3627,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 TAO_ENV_ARG_PARAMETER); + sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in() TAO_ENV_ARG_PARAMETER); + sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3647,7 +3647,7 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl, void TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */, const char * /* vdev_name */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -3661,7 +3661,7 @@ TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */, char * TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -3679,7 +3679,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 TAO_ENV_ARG_PARAMETER); + fdev->define_property ("Flow", flowname_any ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3694,7 +3694,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)) @@ -3704,14 +3704,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 TAO_ENV_ARG_PARAMETER); + fdev = AVStreams::FDev::_narrow (fdev_obj ACE_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" TAO_ENV_ARG_PARAMETER); + flow_name_any = fdev->get_property_value ("Flow" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flow_name); const char *tmp; @@ -3721,7 +3721,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj ACE_CATCHANY { flow_name = - this->add_fdev_i (fdev.in () TAO_ENV_ARG_PARAMETER); + this->add_fdev_i (fdev.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } ACE_ENDTRY; @@ -3746,7 +3746,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj { this->define_property ("Flows", flows_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (flows); } ACE_CATCHANY @@ -3762,7 +3762,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow)) @@ -3779,7 +3779,7 @@ TAO_MMDevice::get_fdev (const char *flow_name // Removes the fdev from this MMDevice. void TAO_MMDevice::remove_fdev (const char *flow_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow, @@ -3806,7 +3806,7 @@ TAO_MMDevice::remove_fdev (const char *flow_name this->flows_ = new_flows; this->define_property ("Flows", flows - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -3862,7 +3862,7 @@ TAO_FlowConnection::set_protocol (const char *protocol) // stop this flow. void -TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL) +TAO_FlowConnection::stop (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -3873,7 +3873,7 @@ TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL) this->flow_producer_set_.end (); producer_begin != producer_end; ++producer_begin) { - (*producer_begin)->stop (TAO_ENV_SINGLE_ARG_PARAMETER); + (*producer_begin)->stop (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin @@ -3882,7 +3882,7 @@ TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL) this->flow_consumer_set_.end (); consumer_begin != consumer_end; ++consumer_begin) { - (*consumer_begin)->stop (TAO_ENV_SINGLE_ARG_PARAMETER); + (*consumer_begin)->stop (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -3897,7 +3897,7 @@ TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL) // start this flow. void -TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL) +TAO_FlowConnection::start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -3908,7 +3908,7 @@ TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL) this->flow_consumer_set_.end (); consumer_begin != consumer_end; ++consumer_begin) { - (*consumer_begin)->start (TAO_ENV_SINGLE_ARG_PARAMETER); + (*consumer_begin)->start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } FlowProducer_SetItor producer_begin = this->flow_producer_set_.begin @@ -3917,7 +3917,7 @@ TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL) this->flow_producer_set_.end (); producer_begin != producer_end; ++producer_begin) { - (*producer_begin)->start (TAO_ENV_SINGLE_ARG_PARAMETER); + (*producer_begin)->start (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -3932,7 +3932,7 @@ TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL) // destroy this flow. void -TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_FlowConnection::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -3943,7 +3943,7 @@ TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL) this->flow_producer_set_.end (); producer_begin != producer_end; ++producer_begin) { - (*producer_begin)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + (*producer_begin)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin @@ -3952,7 +3952,7 @@ TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL) this->flow_consumer_set_.end (); consumer_begin != consumer_end; ++consumer_begin) { - (*consumer_begin)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + (*consumer_begin)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -3971,7 +3971,7 @@ TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL) // modify the QoS for this flow. CORBA::Boolean TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed)) { @@ -3984,7 +3984,7 @@ TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos CORBA::Boolean TAO_FlowConnection::use_flow_protocol (const char * fp_name, const CORBA::Any & fp_settings - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::FPError, AVStreams::notSupported)) @@ -3998,7 +3998,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 TAO_ENV_ARG_PARAMETER); + (fp_name, fp_settings ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin @@ -4008,7 +4008,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name, consumer_begin != consumer_end; ++consumer_begin) { (*consumer_begin)->use_flow_protocol - (fp_name, fp_settings TAO_ENV_ARG_PARAMETER); + (fp_name, fp_settings ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -4016,7 +4016,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name, void TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (the_event); @@ -4026,7 +4026,7 @@ CORBA::Boolean TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party, AVStreams::FDev_ptr b_party, AVStreams::QoS & flow_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -4035,7 +4035,7 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party, CORBA::Boolean result = 0; ACE_TRY { - AVStreams::FlowConnection_var flowconnection = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::FlowConnection_var flowconnection = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean met_qos; CORBA::String_var named_fdev ((const char *)""); @@ -4044,19 +4044,19 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party, flow_qos, met_qos, named_fdev.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::FlowConsumer_var consumer = b_party->create_consumer (flowconnection.in (), flow_qos, met_qos, named_fdev.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result = this->connect (producer.in (), consumer.in (), flow_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4074,7 +4074,7 @@ CORBA::Boolean TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, AVStreams::FlowConsumer_ptr consumer, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::formatMismatch, AVStreams::FEPMismatch, @@ -4091,19 +4091,19 @@ 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; flow_producer->set_peer (flowconnection.in (), flow_consumer, the_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; flow_consumer->set_peer (flowconnection.in (), flow_producer, the_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; char *consumer_address = @@ -4111,7 +4111,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, 0, // false for is_mcast flow_producer, this->fp_name_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (consumer_address, "") == 0) @@ -4121,12 +4121,12 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, 0, // false for is_mcast flow_consumer, this->fp_name_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; flow_consumer->connect_to_peer (the_qos, consumer_address, this->fp_name_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_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. @@ -4137,7 +4137,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, flow_producer->connect_to_peer (the_qos, consumer_address, this->fp_name_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -4152,7 +4152,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, CORBA::Boolean -TAO_FlowConnection::disconnect (TAO_ENV_SINGLE_ARG_DECL) +TAO_FlowConnection::disconnect (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_CHECK_RETURN (0); @@ -4162,7 +4162,7 @@ TAO_FlowConnection::disconnect (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::alreadyConnected, AVStreams::notSupported)) @@ -4181,7 +4181,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, for (; begin != end; ++begin) { if ((*begin)->_is_equivalent (producer - TAO_ENV_ARG_PARAMETER)) + ACE_ENV_ARG_PARAMETER)) // producer exists in the set, a duplicate. ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_producer: producer already exists\n"), 1); } @@ -4216,7 +4216,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, met_qos, mcast_address, this->fp_name_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->producer_address_.in () == 0) @@ -4239,15 +4239,15 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, ACE_NEW_RETURN (this->mcastconfigif_i_, TAO_MCastConfigIf, 0); - this->mcastconfigif_ = this->mcastconfigif_i_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mcastconfigif_ = this->mcastconfigif_i_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - AVStreams::FlowConnection_var flowconnection = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::FlowConnection_var flowconnection = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; flow_producer->set_Mcast_peer (flowconnection.in (), this->mcastconfigif_.in (), the_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4263,7 +4263,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, CORBA::Boolean TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::alreadyConnected)) { @@ -4276,7 +4276,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, for (; begin != end; ++begin) { if ((*begin)->_is_equivalent (consumer - TAO_ENV_ARG_PARAMETER)) + ACE_ENV_ARG_PARAMETER)) // Consumer exists in the set, a duplicate. ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_Consumer: Consumer already exists\n"), 1); } @@ -4301,21 +4301,21 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, if (!this->ip_multicast_) { flow_consumer->set_protocol_restriction (protocols - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; char * address = flow_consumer->go_to_listen (the_qos, 1, flow_producer, this->fp_name_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean is_met; flow_producer->connect_mcast (the_qos, is_met, address, this->fp_name_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -4328,14 +4328,14 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, flow_consumer->connect_to_peer (the_qos, this->producer_address_.in (), this->fp_name_.inout () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // char * address = // flow_consumer->go_to_listen (the_qos, // 1, // flow_producer, // this->fp_name_.inout () - // TAO_ENV_ARG_PARAMETER); + // ACE_ENV_ARG_PARAMETER); // ACE_TRY_CHECK; } @@ -4349,7 +4349,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, this->mcastconfigif_->set_peer (flow_consumer, stream_qos, flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4364,7 +4364,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, CORBA::Boolean TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notConnected)) { @@ -4405,17 +4405,17 @@ TAO_FlowEndPoint::open (const char *flowname, this->format_ = format; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowEndPoint::open\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Any flowname_any; flowname_any <<= flowname; this->define_property ("Flow", flowname_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->set_format (format - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->protocol_addresses_ = protocols; AVStreams::protocolSpec protocol_spec (protocols.length ()); @@ -4429,7 +4429,7 @@ TAO_FlowEndPoint::open (const char *flowname, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", protocol_spec[i].in ())); } this->set_protocol_restriction (protocol_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4453,7 +4453,7 @@ 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_FlowEndPoint::lock (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // lock the current flowendpoint @@ -4467,7 +4467,7 @@ TAO_FlowEndPoint::lock (TAO_ENV_SINGLE_ARG_DECL) // unlocks the flowendpoint , becomes free to be used in another flow. void -TAO_FlowEndPoint::unlock (TAO_ENV_SINGLE_ARG_DECL) +TAO_FlowEndPoint::unlock (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_CHECK; @@ -4477,7 +4477,7 @@ TAO_FlowEndPoint::unlock (TAO_ENV_SINGLE_ARG_DECL) void -TAO_FlowEndPoint::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowEndPoint::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { int result = TAO_AV_Core::deactivate_servant (this); @@ -4490,7 +4490,7 @@ TAO_FlowEndPoint::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } AVStreams::StreamEndPoint_ptr -TAO_FlowEndPoint::related_sep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowEndPoint::related_sep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -4499,14 +4499,14 @@ TAO_FlowEndPoint::related_sep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowEndPoint::related_flow_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return AVStreams::FlowConnection::_duplicate (this->related_flow_connection_.in ()); @@ -4514,7 +4514,7 @@ TAO_FlowEndPoint::related_flow_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_CHECK; @@ -4524,7 +4524,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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowEndPoint::get_connected_fep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notConnected, AVStreams::notSupported)) @@ -4535,7 +4535,7 @@ TAO_FlowEndPoint::get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Boolean TAO_FlowEndPoint::use_flow_protocol (const char * fp_name, const CORBA::Any & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::FPError, AVStreams::notSupported)) @@ -4547,7 +4547,7 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name, flowname_property <<= fp_name; this->define_property ("FlowProtocol", flowname_property - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4562,7 +4562,7 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name, void TAO_FlowEndPoint::set_format (const char * format - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -4575,7 +4575,7 @@ TAO_FlowEndPoint::set_format (const char * format format_val <<= format; this->define_property ("Format", format_val - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4588,7 +4588,7 @@ TAO_FlowEndPoint::set_format (const char * format void TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)) @@ -4600,7 +4600,7 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set DevParams_property <<= new_settings; this->define_property ("DevParams", DevParams_property - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -4613,7 +4613,7 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set void TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & protocols - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported)) { @@ -4630,11 +4630,11 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot AvailableProtocols_property <<= protocols; this->define_property ("AvailableProtocols", AvailableProtocols_property - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::protocolSpec *temp_spec; CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; temp_any.in () >>= temp_spec; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n")); @@ -4655,7 +4655,7 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot CORBA::Boolean TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::formatMismatch, AVStreams::deviceQosMismatch)) @@ -4671,7 +4671,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format"; format_ptr = this->get_property_value ("Format" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; const char *temp_format; @@ -4680,7 +4680,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep // get my peer's format value exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format[2]"; format_ptr = peer_fep->get_property_value ("Format" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; format_ptr.in () >>= temp_format; peer_format = CORBA::string_dup (temp_format); @@ -4696,7 +4696,7 @@ 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" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AvailableProtocols_ptr.in () >>= temp_protocols; my_protocol_spec = *temp_protocols; @@ -4704,7 +4704,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep exception_message = "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols[2]"; AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AvailableProtocols_ptr.in () >>= temp_protocols; peer_protocol_spec = *temp_protocols; @@ -4750,7 +4750,7 @@ CORBA::Boolean TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr /* the_fc */, AVStreams::FlowEndPoint_ptr the_peer_fep, AVStreams::QoS & /* the_qos */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)) @@ -4764,7 +4764,7 @@ CORBA::Boolean TAO_FlowEndPoint::set_Mcast_peer (AVStreams::FlowConnection_ptr /* the_fc */, AVStreams::MCastConfigIf_ptr mcast_peer, AVStreams::QoS & /* the_qos */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed)) { @@ -4778,7 +4778,7 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role, CORBA::Boolean /*is_mcast*/, AVStreams::FlowEndPoint_ptr peer_fep, char *& flowProtocol - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -4800,13 +4800,13 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role, AVStreams::protocolSpec *temp_protocols; CORBA::Any_var AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); AvailableProtocols_ptr.in () >>= temp_protocols; peer_protocol_spec = *temp_protocols; AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); AvailableProtocols_ptr.in () >>= temp_protocols; my_protocol_spec = *temp_protocols; @@ -4871,7 +4871,7 @@ TAO_FlowEndPoint::connect_to_peer_i (TAO_FlowSpec_Entry::Role role, AVStreams::QoS & /*the_qos*/, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -4935,7 +4935,7 @@ TAO_FlowProducer::TAO_FlowProducer (const char *flowname, // gets the reverse channel for feedback. char * TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -4943,7 +4943,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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowProducer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); @@ -4956,7 +4956,7 @@ TAO_FlowProducer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_FlowProducer::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowProducer::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); @@ -4980,7 +4980,7 @@ TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer_fep, char *& flowProtocol - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -4991,14 +4991,14 @@ TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos, is_mcast, peer_fep, flowProtocol - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -5008,7 +5008,7 @@ TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos, the_qos, address, use_flow_protocol - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // Connect to a IP multicast address. char * @@ -5016,7 +5016,7 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */, CORBA::Boolean_out /* is_met */, const char *address, const char * use_flow_protocol - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::notSupported, @@ -5060,7 +5060,7 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */, // sets the key for this flow. void TAO_FlowProducer::set_key (const AVStreams::key & the_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -5069,7 +5069,7 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key anyval <<= the_key; this->define_property ("PublicKey", anyval - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -5083,7 +5083,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->source_id_ = source_id; @@ -5108,7 +5108,7 @@ TAO_FlowConsumer::TAO_FlowConsumer (const char *flowname, // The start, stop and destroy are to be handled by the application. void -TAO_FlowConsumer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowConsumer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); @@ -5118,7 +5118,7 @@ TAO_FlowConsumer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_FlowConsumer::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FlowConsumer::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); @@ -5134,7 +5134,7 @@ TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos, CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer_fep, char *& flowProtocol - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -5145,14 +5145,14 @@ TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos, is_mcast, peer_fep, flowProtocol - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -5162,7 +5162,7 @@ TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos, the_qos, address, use_flow_protocol - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } //------------------------------------------------------------ diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 80edd90fc01..95ab3009b5b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -95,14 +95,14 @@ 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -112,7 +112,7 @@ public: * Empty the_spec means apply operation to all flows */ virtual void destroy (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -120,7 +120,7 @@ public: /// Empty the_spec means apply operation to all flows virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); @@ -128,14 +128,14 @@ public: /// 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::FPError)); @@ -143,7 +143,7 @@ public: /// Not implemented in the light profile, will raise the notsupported /// exception virtual CORBA::Object_ptr get_flow_connection (const char *flow_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::notSupported)); @@ -152,7 +152,7 @@ public: /// exception virtual void set_flow_connection (const char *flow_name, CORBA::Object_ptr flow_connection - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::notSupported)); @@ -186,7 +186,7 @@ class TAO_AV_Export TAO_Negotiator public: virtual CORBA::Boolean negotiate (AVStreams::Negotiator_ptr remote_negotiator, const AVStreams::streamQoS &qos_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -251,14 +251,14 @@ 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -268,7 +268,7 @@ public: * Empty the_spec means apply operation to all flows */ virtual void destroy (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -283,7 +283,7 @@ public: AVStreams::MMDevice_ptr b_party, AVStreams::streamQoS& the_qos, const AVStreams::flowSpec& the_flows - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -298,7 +298,7 @@ public: AVStreams::StreamEndPoint_B_ptr b_party, AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_flows - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -306,7 +306,7 @@ public: virtual void unbind_dev (AVStreams::MMDevice_ptr dev, const AVStreams::flowSpec & the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow)); @@ -314,19 +314,19 @@ public: /// 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void unbind (ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed)); @@ -334,7 +334,7 @@ public: /// Empty the_spec means apply operation to all flows virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); @@ -386,28 +386,28 @@ public: virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer, AVStreams::streamQoS & the_qos, const AVStreams::flowSpec & the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)); virtual void configure (const CosPropertyService::Property & a_configuration - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_initial_configuration (const CosPropertyService::Properties & initial - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void set_format (const char * flowName, const char * format_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, @@ -494,15 +494,15 @@ public: /// Application needs to define this virtual int handle_stop (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Application needs to define this virtual int handle_start (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Application needs to define this virtual int handle_destroy (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Application needs to define this virtual CORBA::Boolean handle_preconnect (AVStreams::flowSpec &the_spec); @@ -512,7 +512,7 @@ public: /// Application needs to define this virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual int get_callback (const char *flowname, TAO_AV_Callback *&callback); @@ -563,19 +563,19 @@ public: /// Stop the stream. Empty the_spec means, for all the flows virtual void stop (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow)); @@ -583,7 +583,7 @@ public: virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder, AVStreams::streamQoS& qos_spec, const AVStreams::flowSpec& the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -595,7 +595,7 @@ public: CORBA::Boolean is_mcast, AVStreams::streamQoS &qos, AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpDenied, AVStreams::noSuchFlow, @@ -605,23 +605,23 @@ public: /// Change the transport qos on a stream virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_flows - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Used to restrict the set of protocols virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// disconnect the flows virtual void disconnect (const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::streamOpFailed)); @@ -630,46 +630,46 @@ public: virtual void set_FPStatus (const AVStreams::flowSpec &the_spec, const char *fp_name, const CORBA::Any &fp_settings - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Destructor @@ -677,17 +677,17 @@ public: CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// Helper methods to implement add_fep() char* add_fep_i (AVStreams::FlowEndPoint_ptr fep - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); @@ -753,7 +753,7 @@ public: /// Used for ATM-style multicast virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -763,7 +763,7 @@ public: virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_flows - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -773,7 +773,7 @@ public: /// Used to remove a multicast leaf virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep, const AVStreams::flowSpec &theSpec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -806,7 +806,7 @@ public: /// Used for internet-style multicast virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos, AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -837,7 +837,7 @@ public: AVStreams::VDev_ptr the_peer_dev, AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -848,7 +848,7 @@ public: AVStreams::MCastConfigIf_ptr a_mcastconfigif, AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed, @@ -856,7 +856,7 @@ public: /// Called by the peer VDev to configure the device (catch all) virtual void configure (const CosPropertyService::Property &the_config_mesg - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)); @@ -864,14 +864,14 @@ public: /// Used to set a format on a flowname virtual void set_format (const char *flowName, const char *format_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::PropertyException, AVStreams::streamOpFailed)); @@ -879,7 +879,7 @@ public: /// Called to change QoS of the device virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed)); @@ -890,7 +890,7 @@ 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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// My stream controller AVStreams::StreamCtrl_var streamctrl_; @@ -927,7 +927,7 @@ public: CORBA::Boolean_out met_qos, char *&named_vdev, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Can be used to request the MMDevice to create a new StreamCtrl, /// and call bind_devs on it @@ -935,7 +935,7 @@ public: AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -946,7 +946,7 @@ public: AVStreams::streamQoS &the_qos, CORBA::Boolean_out is_met, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::noSuchFlow, @@ -959,7 +959,7 @@ public: CORBA::Boolean_out met_qos, char *&named_vdev, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -974,7 +974,7 @@ public: CORBA::Boolean_out met_qos, char *&named_vdev, const AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -985,27 +985,27 @@ public: /// Remove the StreamEndPoint and the related vdev virtual void destroy (AVStreams::StreamEndPoint_ptr the_ep, const char *vdev_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::noSuchFlow, @@ -1017,7 +1017,7 @@ public: protected: /// Helper method to implement add_fdev() char* add_fdev_i (AVStreams::FDev_ptr fdev - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notSupported, AVStreams::streamOpFailed)); @@ -1066,34 +1066,34 @@ public: TAO_FlowConnection (void); /// stop this flow. - virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// start this flow. - virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// destroy this flow. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -1101,7 +1101,7 @@ public: virtual CORBA::Boolean connect_devs (AVStreams::FDev_ptr a_party, AVStreams::FDev_ptr b_party, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -1111,20 +1111,20 @@ public: virtual CORBA::Boolean connect (AVStreams::FlowProducer_ptr flow_producer, AVStreams::FlowConsumer_ptr flow_consumer, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::formatMismatch, AVStreams::FEPMismatch, AVStreams::alreadyConnected)); /// disconnect this flow connection. - virtual CORBA::Boolean disconnect (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Boolean disconnect (ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::alreadyConnected, AVStreams::notSupported)); @@ -1132,13 +1132,13 @@ public: /// adds a consumer to this flow connection. virtual CORBA::Boolean add_consumer (AVStreams::FlowConsumer_ptr flow_consumer, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notConnected)); @@ -1200,41 +1200,41 @@ public: TAO_AV_Protocol_Object *object); /// lock the flow endpoint for a particular flow. - virtual CORBA::Boolean lock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Boolean lock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// unlock the flow endpoint for subsequent use. - virtual void unlock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void unlock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// destroy this flow. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_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(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual AVStreams::StreamEndPoint_ptr related_sep(ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual AVStreams::FlowConnection_ptr related_flow_connection(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual AVStreams::FlowConnection_ptr related_flow_connection(ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual AVStreams::FlowEndPoint_ptr get_connected_fep (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::notConnected, AVStreams::notSupported)); @@ -1242,33 +1242,33 @@ public: //// use the specified flow protocol. virtual CORBA::Boolean use_flow_protocol (const char * fp_name, const CORBA::Any & fp_settings - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::formatMismatch, AVStreams::deviceQosMismatch)); @@ -1277,7 +1277,7 @@ public: virtual CORBA::Boolean set_peer (AVStreams::FlowConnection_ptr the_fc, AVStreams::FlowEndPoint_ptr the_peer_fep, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed, AVStreams::streamOpFailed)); @@ -1286,7 +1286,7 @@ public: virtual CORBA::Boolean set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc, AVStreams::MCastConfigIf_ptr a_mcastconfigif, AVStreams::QoS & the_qos - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::QoSRequestFailed)); @@ -1299,7 +1299,7 @@ public: virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -1310,7 +1310,7 @@ public: AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -1325,7 +1325,7 @@ public: CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, char *& flowProtocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1337,7 +1337,7 @@ public: CORBA::Boolean is_mcast, AVStreams::FlowEndPoint_ptr peer, char *& flowProtocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1394,22 +1394,22 @@ public: * know the reverse channel on its peer fep to send data to. */ virtual char * get_rev_channel (const char * pcol_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// stop this flow, to be overridden by the application. - virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// start this flow, to be overridden by the application. - virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void start (ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1418,7 +1418,7 @@ public: virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -1429,7 +1429,7 @@ public: CORBA::Boolean_out is_met, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::notSupported, @@ -1440,13 +1440,13 @@ public: /// sets the public key to be used for encryption of the data. virtual void set_key (const AVStreams::key & the_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -1469,18 +1469,18 @@ public: const char *format); /// stop this flow, to be overridden by the application. - virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// start this flow, to be overridden by the application. - virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void start (ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToListen, AVStreams::FPError, @@ -1489,7 +1489,7 @@ public: virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos, const char * address, const char * use_flow_protocol - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::failedToConnect, AVStreams::FPError, @@ -1513,33 +1513,33 @@ public: virtual AVStreams::Position get_media_position (AVStreams::PositionOrigin an_origin, AVStreams::PositionKey a_key - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::MediaControl::PostionKeyNotSupported)) =0; virtual void set_media_position (const AVStreams::Position & a_position - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::MediaControl::PostionKeyNotSupported, AVStreams::InvalidPosition)) =0; virtual void start (const AVStreams::Position & a_position - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; virtual void pause (const AVStreams::Position & a_position - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; virtual void resume (const AVStreams::Position & a_position - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::InvalidPosition)) =0; virtual void stop (const AVStreams::Position & a_position - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 1c4406449ed..5c73560bc55 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -149,7 +149,7 @@ TAO_AV_Core::reactor (void) int TAO_AV_Core::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Core::init ")); this->orb_ = CORBA::ORB::_duplicate (orb); @@ -1016,18 +1016,18 @@ TAO_AV_Core::deactivate_servant (PortableServer::Servant servant) // the servant when all pending requests on this servant are // complete. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - PortableServer::POA_var poa = servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 d170ef600b4..c1242aed973 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h @@ -86,7 +86,7 @@ public: int init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL); + ACE_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 fe0fb2884ad..f70a5c8b9e9 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -53,7 +53,7 @@ TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void) int TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_endpoint */, AVStreams::VDev_ptr & /* vdev */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error creating A endpoint\n"), @@ -67,7 +67,7 @@ TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_ int TAO_AV_Endpoint_Strategy::create_B (AVStreams::StreamEndPoint_B_ptr & /* stream_endpoint */, AVStreams::VDev_ptr & /*vdev */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Get ourselves a Naming service - this->bind_to_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + this->bind_to_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the stream endpoint created by the child from the naming service - this->get_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Vdev created by the child from the naming service - this->get_vdev (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_vdev (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -191,7 +191,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DEC return 0; CORBA::Object_var naming_obj = - TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -200,7 +200,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DEC -1); this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -215,7 +215,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DEC // Get the VDev created in the child process from the namingservice int -TAO_AV_Endpoint_Process_Strategy::get_vdev (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Process_Strategy::get_vdev (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -236,13 +236,13 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (TAO_ENV_SINGLE_ARG_DECL) // Get the CORBA::Object CORBA::Object_var vdev = this->naming_context_->resolve (VDev_Name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow it this->vdev_ = AVStreams::VDev::_narrow (vdev.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check if valid @@ -280,7 +280,7 @@ TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A (void) int TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -319,13 +319,13 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL // Get the CORBA::Object CORBA::Object_var stream_endpoint_a = this->naming_context_->resolve (Stream_Endpoint_A_Name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the reference this->stream_endpoint_a_ = AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check for validity @@ -363,7 +363,7 @@ TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B (void) int TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -374,7 +374,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s 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_ - TAO_ENV_ARG_PARAMETER))); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -413,13 +413,13 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL // Get the CORBA::Object reference CORBA::Object_var stream_endpoint_b = this->naming_context_->resolve (Stream_Endpoint_B_Name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the reference this->stream_endpoint_b_ = AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 7323dd79bcb..f57d2ac3533 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h @@ -44,12 +44,12 @@ 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 - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + virtual int bind_to_naming_service (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) = 0; /// Get the Vdev object reference for the newly created /// endpoint - virtual int get_vdev (TAO_ENV_SINGLE_ARG_DECL); + virtual int get_vdev (ACE_ENV_SINGLE_ARG_DECL); /// Naming context CosNaming::NamingContext_var naming_context_; @@ -135,10 +135,10 @@ protected: /// Creates an "A" type stream endpoint, and a vdev virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Gets the "A" type stream endpoint from the child process - virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); + virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL); }; @@ -163,11 +163,11 @@ protected: /// Creates a "B" type stream endpoint, and a vdev virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint, AVStreams::VDev_ptr &vdev - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Gets the object reference of the "B" type streamendpoint. - virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); + virtual int get_stream_endpoint (ACE_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 87dac015760..68df61b060d 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_stream_endpoint (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_vdev (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_mediactrl (ACE_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 TAO_ENV_ARG_DECL) +TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL) { PortableServer::ObjectId_var id = this->poa_->activate_object (servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Object_var obj = this->poa_->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::String_var str = this->orb_->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -92,15 +92,15 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ // Activate the object under the root poa. // CORBA::String_var vdev_ior = this->activate_with_poa (vdev, -// TAO_ENV_ARG_PARAMETER); +// ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->vdev_ = vdev->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - vdev->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + vdev->_remove_ref (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -128,7 +128,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ // Activate the mediactrl object under the root poa. // CORBA::String_var mediactrl_ior = this->activate_with_poa (media_ctrl -// TAO_ENV_ARG_PARAMETER); +// ACE_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,13 +138,13 @@ 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + = media_ctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - media_ctrl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + media_ctrl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = this->orb_->object_to_string (media_ctrl_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); anyval <<= str.in(); @@ -152,7 +152,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ this->vdev_->define_property ("Related_MediaCtrl", anyval - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -235,7 +235,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */) { if (this->activate () == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -251,7 +251,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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -262,14 +262,14 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act return -1; // CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_a -// TAO_ENV_ARG_PARAMETER); +// ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->stream_endpoint_a_ = stream_endpoint_a->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - stream_endpoint_a->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + stream_endpoint_a->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -312,7 +312,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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -321,13 +321,13 @@ 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 -// TAO_ENV_ARG_PARAMETER); +// ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->stream_endpoint_b_ = stream_endpoint_b->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - stream_endpoint_b->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + stream_endpoint_b->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -345,7 +345,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */) + ACE_ENV_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */) { if (this->activate () == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -393,19 +393,19 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get ourselves a naming_service object reference - this->bind_to_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + this->bind_to_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Register the vdev with the naming service - this->register_vdev (TAO_ENV_SINGLE_ARG_PARAMETER); + this->register_vdev (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // register the stream_endpoing with the naming_service - this->register_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER); + this->register_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -427,22 +427,22 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { PortableServer::ObjectId_var id = this->poa_->activate_object (servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Object_var obj = this->poa_->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::String_var str = this->orb_->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return str._retn (); @@ -453,7 +453,7 @@ 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*/ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -471,7 +471,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects // activate the stream_endpoint CORBA::String_var stream_endpoint_ior = this->activate_with_poa (this->stream_endpoint_ - TAO_ENV_ARG_PARAMETER); + ACE_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", @@ -479,7 +479,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects // activate the vdev CORBA::String_var vdev_ior = this->activate_with_poa (this->vdev_ - TAO_ENV_ARG_PARAMETER); + ACE_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", @@ -487,7 +487,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects // activate the media controller CORBA::String_var media_ctrl_ior = this->activate_with_poa (this->media_ctrl_ - TAO_ENV_ARG_PARAMETER); + ACE_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 ())); @@ -505,12 +505,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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -519,7 +519,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_se // 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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -535,7 +535,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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_ptr vdev_obj = CORBA::Object::_nil (); ACE_TRY @@ -555,26 +555,26 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (TA // make the media controller a property of the vdev CORBA::Any media_ctrl_property; CORBA::Object_var media_ctrl_obj = - this->media_ctrl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->media_ctrl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; media_ctrl_property <<= this->orb_->object_to_string (media_ctrl_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->vdev_->define_property ("Related_MediaCtrl", media_ctrl_property - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - vdev_obj = this->vdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + vdev_obj = this->vdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->vdev_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->vdev_->_remove_ref (ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (bind); } ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex) @@ -583,7 +583,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (TA // with this one this->naming_context_->rebind (this->vdev_name_, vdev_obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -612,7 +612,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 TAO_ENV_ARG_PARAMETER); + this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -660,14 +660,14 @@ 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_ptr stream_endpoint_obj = CORBA::Object::_nil (); ACE_TRY { - stream_endpoint_obj = this->stream_endpoint_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + stream_endpoint_obj = this->stream_endpoint_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->stream_endpoint_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->stream_endpoint_->_remove_ref (ACE_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 @@ -675,7 +675,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_e // Register the stream endpoint object with the naming server. this->naming_context_->bind (this->stream_endpoint_name_, stream_endpoint_obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex) @@ -683,7 +683,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_e // if the name was already there, replace the reference with the new one this->naming_context_->rebind (this->stream_endpoint_name_, stream_endpoint_obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -742,11 +742,11 @@ 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_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->naming_context_->unbind (this->vdev_name_ - TAO_ENV_ARG_PARAMETER); + ACE_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 f4cb2acefd7..1ff9129d44f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -42,15 +42,15 @@ protected: virtual int activate (void); /// activates the stream_endpoint with the POA - virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) = 0; /// activates the vdev with the POA - virtual int activate_vdev (TAO_ENV_SINGLE_ARG_DECL); + virtual int activate_vdev (ACE_ENV_SINGLE_ARG_DECL); /// activates the media controller with the POA - virtual int activate_mediactrl (TAO_ENV_SINGLE_ARG_DECL); + virtual int activate_mediactrl (ACE_ENV_SINGLE_ARG_DECL); /// Bridge method to create a vdev, a la Acceptor. Applications /// can override this @@ -65,7 +65,7 @@ protected: virtual int make_mediactrl (T_MediaCtrl *&media_ctrl); - char* activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL); + char* activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL); CORBA::ORB_var orb_; @@ -95,12 +95,12 @@ public: /// Overrides the base class stream_endpoint activator, to activate /// an "A" type endpoint - virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); + virtual int activate_stream_endpoint (ACE_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 - TAO_ENV_ARG_DECL); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + virtual int activate_stream_endpoint (ACE_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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; // ---------------------------------------------------------------------- @@ -168,22 +168,22 @@ protected: */ int activate_objects (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ///activate the servant with the poa - char* activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL); + char* activate_with_poa (PortableServer::Servant servant ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + int bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL); /// Registers vdev with the naming service - int register_vdev (TAO_ENV_SINGLE_ARG_DECL); + int register_vdev (ACE_ENV_SINGLE_ARG_DECL); /// Registers stream_endpoint with the naming service - int register_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL); + int register_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL); /// Releases the semaphore on which the parent is waiting on int release_semaphore (); diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp index e26e6bc7116..a309efdf318 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp @@ -28,7 +28,7 @@ TAO_FDev<T_Producer, T_Consumer>::TAO_FDev (const char *flowname) flowname_any <<= flowname; this->define_property ("Flow", flowname_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -63,7 +63,7 @@ TAO_FDev<T_Producer, T_Consumer>::flowname (const char *flow_name) flowname_any <<= flow_name; this->define_property ("Flow", flowname_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -81,7 +81,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, char *& named_fdev - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -93,7 +93,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr the_qos, met_qos, named_fdev - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } template <class T_Producer, class T_Consumer> @@ -103,7 +103,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr / AVStreams::QoS & /* the_qos */, CORBA::Boolean_out /* met_qos */, char *& /* named_fdev */ - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + producer = producer_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -134,7 +134,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_consumer (AVStreams::FlowConnection_ptr / AVStreams::QoS & /* the_qos */, CORBA::Boolean_out /* met_qos */, char *& /* named_fdev */ - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer = consumer_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -164,7 +164,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, char *& named_fdev - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -175,7 +175,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr the_qos, met_qos, named_fdev - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } template <class T_Producer, class T_Consumer> @@ -184,7 +184,7 @@ AVStreams::FlowConnection_ptr TAO_FDev<T_Producer, T_Consumer>::bind (AVStreams::FDev_ptr peer_device, AVStreams::QoS & the_qos, CORBA::Boolean_out is_met - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::QoSRequestFailed)) @@ -202,7 +202,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::QoSRequestFailed)) @@ -218,7 +218,7 @@ template <class T_Producer, class T_Consumer> void TAO_FDev<T_Producer, T_Consumer>::destroy (AVStreams::FlowEndPoint_ptr /* the_ep */, const char * /* fdev_name */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 b227851f3e7..c7a7cb87e47 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h @@ -48,7 +48,7 @@ public: AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, char *& named_fdev - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -61,14 +61,14 @@ public: AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, char *& named_fdev - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::streamOpDenied, @@ -81,13 +81,13 @@ public: AVStreams::QoS & the_qos, CORBA::Boolean_out met_qos, char *& named_fdev - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::QoSRequestFailed)); @@ -96,7 +96,7 @@ public: virtual AVStreams::FlowConnection_ptr bind_mcast (AVStreams::FDev_ptr first_peer, AVStreams::QoS & the_qos, CORBA::Boolean_out is_met - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, AVStreams::streamOpFailed, AVStreams::QoSRequestFailed)); @@ -104,7 +104,7 @@ public: /// destroys this FDev. virtual void destroy (AVStreams::FlowEndPoint_ptr the_ep, const char * fdev_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 dbeb3e615f0..27d79bd3ebd 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -318,7 +318,7 @@ int TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n")); @@ -375,7 +375,7 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/) AVStreams::Negotiator_var remote_negotiator; this->negotiator_->negotiate (remote_negotiator.in (), new_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } } } @@ -871,7 +871,7 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, int TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; int result = 0; // TAO_AV_Callback *callback = 0; @@ -1020,7 +1020,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) { CORBA::Any_ptr negotiator_any = this->endpoint_->get_property_value ("Negotiator" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (negotiator); *negotiator_any >>= negotiator; @@ -1298,7 +1298,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, { CORBA::Any_ptr negotiator_any = this->endpoint_->get_property_value ("Negotiator" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (negotiator); *negotiator_any >>= negotiator; diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp index f81818b7a51..0d2a88a1430 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp @@ -13,27 +13,27 @@ ACE_RCSID(orbsvcs, Channel_Clients_T, "$Id$") template<class TARGET> void ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - target_->push (events TAO_ENV_ARG_PARAMETER); + target_->push (events ACE_ENV_ARG_PARAMETER); } template<class TARGET> void ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - target_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + target_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); } template<class TARGET> void ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - target_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + target_->disconnect_push_supplier (ACE_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 7b88fccc846..91d7310ff86 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h @@ -42,11 +42,11 @@ public: // Forwards all calls to <owner>. virtual void push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); // Forwards to target_. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException)); // Forwards to target_. @@ -71,7 +71,7 @@ public: ACE_PushSupplier_Adapter (TARGET *target); // Forwards all calls to <owner>. - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void disconnect_push_supplier (ACE_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 ea9dc033f6f..6a0f43a1c82 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CC_Lock::lock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, "CC_Lock::lock\n")); @@ -47,7 +47,7 @@ CC_Lock::lock (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } CORBA::Boolean -CC_Lock::try_lock (TAO_ENV_SINGLE_ARG_DECL) +CC_Lock::try_lock (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "CC_Lock::try_lock. ")); @@ -82,7 +82,7 @@ CC_Lock::try_lock (TAO_ENV_SINGLE_ARG_DECL) } void -CC_Lock::unlock (TAO_ENV_SINGLE_ARG_DECL) +CC_Lock::unlock (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "CC_Lock::unlock\n")); @@ -103,7 +103,7 @@ CC_Lock::unlock (TAO_ENV_SINGLE_ARG_DECL) void CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +void CC_LockModeIterator::Next (ACE_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 dbc60939bbc..24b87792c7c 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 (TAO_ENV_SINGLE_ARG_DECL); + void lock (ACE_ENV_SINGLE_ARG_DECL); // Acquires this lock. Blocks until lock is obtained - CORBA::Boolean try_lock (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Boolean try_lock (ACE_ENV_SINGLE_ARG_DECL); // Tries to acquire this lock. If it is not possible to acquire the // lock, false is returned - void unlock (TAO_ENV_SINGLE_ARG_DECL); + void unlock (ACE_ENV_SINGLE_ARG_DECL); // Releases this lock. void change_mode (CosConcurrencyControl::lock_mode new_mode - TAO_ENV_ARG_DECL); + ACE_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(TAO_ENV_SINGLE_ARG_DECL); + void Next(ACE_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 f3afff015db..63082ca944a 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->Init (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->Init (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +CC_LockSet::Init (ACE_ENV_SINGLE_ARG_DECL) { // Set the mode of the statically allocated locks lock_[CC_IR] = 0; @@ -93,7 +93,7 @@ CORBA::Boolean CC_LockSet::compatible (CC_LockModeEnum mr) void CC_LockSet::lock (CosConcurrencyControl::lock_mode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "CC_LockSet::lock\n")); @@ -114,7 +114,7 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode CORBA::Boolean CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockModeEnum lm = lmconvert (mode); @@ -155,7 +155,7 @@ CC_LockSet::lmconvert (CosConcurrencyControl::lock_mode mode) void CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosConcurrencyControl::LockNotHeld)) { @@ -200,7 +200,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode void CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode, CosConcurrencyControl::lock_mode new_mode - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->unlock (held_mode ACE_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 efd63a16c41..e7080ab3572 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h @@ -87,25 +87,25 @@ public: // = CosConcurrencyControl methods virtual void lock (CosConcurrencyControl::lock_mode mode - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + void Init (ACE_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 87bcc3c04f6..56466309fd3 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 (TAO_ENV_SINGLE_ARG_DECL) +CC_LockSetFactory::create (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockSet *ls = 0; @@ -41,12 +41,12 @@ CC_LockSetFactory::create (TAO_ENV_SINGLE_ARG_DECL) CORBA::NO_MEMORY()); ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ()); - return ls->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return ls->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } CosConcurrencyControl::LockSet_ptr CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockSet *ls = 0; @@ -58,5 +58,5 @@ CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which CORBA::NO_MEMORY()); ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ()); - return ls->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return ls->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h index 538f11e3a63..92c6a480bd3 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 ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosConcurrencyControl::LockSet_ptr create_related ( CosConcurrencyControl::LockSet_ptr which - TAO_ENV_ARG_DECL) + ACE_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 266ea7e4c3c..3a46ea8d99b 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -53,7 +53,7 @@ TAO_Concurrency_Server::init (CORBA::ORB_var &orb, poa->activate_object_with_id (id.in (), &lock_set_factory_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringify the objref we'll be implementing, and print it to @@ -61,12 +61,12 @@ TAO_Concurrency_Server::init (CORBA::ORB_var &orb, // client. Then release the object. CORBA::Object_var obj = poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = orb->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 164716520b0..f600d8a2a53 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -33,89 +33,89 @@ TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin (void) void TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_CEC_Propagate_Event_Push push_worker (event); this->push_admin_.for_each (&push_worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_CEC_Propagate_Event_Pull pull_worker (event); this->pull_admin_.for_each (&pull_worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.connected (supplier TAO_ENV_ARG_PARAMETER); + this->push_admin_.connected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.reconnected (supplier TAO_ENV_ARG_PARAMETER); + this->push_admin_.reconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->push_admin_.disconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.connected (supplier TAO_ENV_ARG_PARAMETER); + this->pull_admin_.connected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.reconnected (supplier TAO_ENV_ARG_PARAMETER); + this->pull_admin_.reconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->pull_admin_.disconnected (supplier ACE_ENV_ARG_PARAMETER); } void -TAO_CEC_ConsumerAdmin::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ConsumerAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->push_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->pull_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->pull_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->push_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->pull_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_CEC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } @@ -124,18 +124,18 @@ TAO_CEC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - supplier->push (this->event_ TAO_ENV_ARG_PARAMETER); + supplier->push (this->event_ ACE_ENV_ARG_PARAMETER); } // **************************************************************** void TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - supplier->push (this->event_ TAO_ENV_ARG_PARAMETER); + supplier->push (this->event_ ACE_ENV_ARG_PARAMETER); } // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index b980088789a..61c5a765a72 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -58,43 +58,43 @@ public: /// For each elements call <worker->work()>. void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Push the event to all the consumers void push (const CORBA::Any &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Used to inform the EC that a Supplier has connected or /// disconnected from it. virtual void connected (TAO_CEC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void connected (TAO_CEC_ProxyPullSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPullSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPullSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// The event channel is shutting down, inform all the consumers of /// this - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // = The CosEventChannelAdmin::ConsumerAdmin methods... virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); private: /// The Event Channel we belong to @@ -119,7 +119,7 @@ public: TAO_CEC_Propagate_Event_Push (const CORBA::Any& event); void work (TAO_CEC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// The event @@ -134,7 +134,7 @@ public: TAO_CEC_Propagate_Event_Pull (const CORBA::Any& event); void work (TAO_CEC_ProxyPullSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_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 8db0065dc5b..254a5bdd1fa 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i @@ -3,17 +3,17 @@ ACE_INLINE void TAO_CEC_ConsumerAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.for_each (worker TAO_ENV_ARG_PARAMETER); + this->push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_CEC_ConsumerAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.for_each (worker TAO_ENV_ARG_PARAMETER); + this->pull_admin_.for_each (worker ACE_ENV_ARG_PARAMETER); } // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp index 4bf1072dd1d..f72c989f4ed 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp @@ -30,20 +30,20 @@ TAO_CEC_ConsumerControl::shutdown (void) void TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPushSupplier * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPullSupplier * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_CEC_ConsumerControl::system_exception (TAO_CEC_ProxyPushSupplier *, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index 9b84bca123e..1eccae7f2cf 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -59,7 +59,7 @@ public: * reclaim all the resources attached to that object. */ virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /** * Invoked by helper classes when they detect that a consumer no @@ -67,12 +67,12 @@ public: * CORBA::OBJECT_NOT_EXIST exception has been raised). */ virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 7c343706f36..a2343f4d940 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp @@ -32,15 +32,15 @@ TAO_CEC_Reactive_Dispatching::shutdown (void) void TAO_CEC_Reactive_Dispatching::push (TAO_CEC_ProxyPushSupplier* proxy, const CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->reactive_push_to_consumer (event TAO_ENV_ARG_PARAMETER); + proxy->reactive_push_to_consumer (event ACE_ENV_ARG_PARAMETER); } void TAO_CEC_Reactive_Dispatching::push_nocopy (TAO_CEC_ProxyPushSupplier* proxy, CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->reactive_push_to_consumer (event TAO_ENV_ARG_PARAMETER); + proxy->reactive_push_to_consumer (event ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index 9c6873bb59c..90fee4b6d21 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -54,10 +54,10 @@ public: /// The consumer represented by <proxy> should receive <event>. virtual void push (TAO_CEC_ProxyPushSupplier *proxy, const CORBA::Any &event - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy, CORBA::Any &event - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; }; // **************************************************************** @@ -82,10 +82,10 @@ public: virtual void shutdown (void); virtual void push (TAO_CEC_ProxyPushSupplier *proxy, const CORBA::Any &event - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy, CORBA::Any &event - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_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 a2fd07cb36e..3c9b579775f 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + int result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Message_Block::release (mb); @@ -54,7 +54,7 @@ TAO_CEC_Dispatching_Task::svc (void) void TAO_CEC_Dispatching_Task::push (TAO_CEC_ProxyPushSupplier *proxy, CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_Shutdown_Task_Command::execute (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL) { - this->proxy_->push_to_consumer (this->event_ TAO_ENV_ARG_PARAMETER); + this->proxy_->push_to_consumer (this->event_ ACE_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 85e81f2a5c8..b2a269a6793 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -42,7 +42,7 @@ public: virtual void push (TAO_CEC_ProxyPushSupplier *proxy, CORBA::Any& event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// An per-task allocator @@ -68,7 +68,7 @@ public: virtual ~TAO_CEC_Dispatch_Command (void); /// Command callback - virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) = 0; + virtual int execute (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); }; // **************************************************************** @@ -98,7 +98,7 @@ public: virtual ~TAO_CEC_Push_Command (void); /// Command callback - virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (ACE_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 e8613a8b31f..8a93d5c49cc 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_EventChannel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->dispatching_->activate (); this->pulling_strategy_->activate (); @@ -83,7 +83,7 @@ TAO_CEC_EventChannel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_CEC_EventChannel::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL) { this->dispatching_->shutdown (); this->pulling_strategy_->shutdown (); @@ -91,141 +91,141 @@ TAO_CEC_EventChannel::shutdown (TAO_ENV_SINGLE_ARG_DECL) this->consumer_control_->shutdown (); PortableServer::POA_var consumer_poa = - this->consumer_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (this->consumer_admin_ TAO_ENV_ARG_PARAMETER); + consumer_poa->servant_to_id (this->consumer_admin_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER); + consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var supplier_poa = - this->supplier_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var supplier_id = - supplier_poa->servant_to_id (this->supplier_admin_ TAO_ENV_ARG_PARAMETER); + supplier_poa->servant_to_id (this->supplier_admin_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER); + supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - this->consumer_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } void TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_CEC_EventChannel::for_consumers (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->consumer_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_CEC_EventChannel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->supplier_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_CEC_EventChannel::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index 825280e394f..71d438ce9f9 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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Shutdown any internal threads, cleanup all the internal /// structures, flush all the messages, etc. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Access the dispatching module.... TAO_CEC_Dispatching* dispatching (void) const; @@ -183,32 +183,32 @@ public: /// Used to inform the EC that a Consumer has connected or /// disconnected from it. virtual void connected (TAO_CEC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void connected (TAO_CEC_ProxyPullConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPullConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPullConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void connected (TAO_CEC_ProxyPullSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPullSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPullSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// The default implementation is: /// this->supplier_admin ()->_this (env); virtual CosEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (TAO_ENV_SINGLE_ARG_DECL) + for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Commit suicide. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_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 edefea7c31f..52fe306124f 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[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... this->orb_= - CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = - this->create_object (this->orb_.in (), argc, argv TAO_ENV_ARG_PARAMETER); + this->create_object (this->orb_.in (), argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -63,7 +63,7 @@ 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[] - TAO_ENV_ARG_DECL) + ACE_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" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_impl_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = - this->ec_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ior_file != 0) { CORBA::String_var ior = - orb->object_to_string (event_channel.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; FILE *file = ACE_OS::fopen (ior_file, "w"); ACE_OS::fprintf (file, "%s\n", ior.in ()); @@ -176,12 +176,12 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, { CORBA::Object_var obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->naming_context_ = CosNaming::NamingContext::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->channel_name_.length (1); @@ -191,14 +191,14 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, { this->naming_context_->rebind (this->channel_name_, event_channel.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else { this->naming_context_->bind (this->channel_name_, event_channel.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Release the resources of the Event Channel - this->ec_impl_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Deactivate the EC PortableServer::POA_var poa = - this->ec_impl_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this->ec_impl_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this->ec_impl_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Unbind the Naming Service if (this->bind_to_naming_service_) { this->naming_context_->unbind (this->channel_name_ - TAO_ENV_ARG_PARAMETER); + ACE_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 af490dc459f..f9d23daca61 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -49,7 +49,7 @@ public: */ CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_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 6cbad8bdcd8..bec500f45bf 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp @@ -63,20 +63,20 @@ TAO_CEC_MT_Dispatching::shutdown (void) void TAO_CEC_MT_Dispatching::push (TAO_CEC_ProxyPushSupplier* proxy, const CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Any event_copy = event; - this->push_nocopy (proxy, event_copy TAO_ENV_ARG_PARAMETER); + this->push_nocopy (proxy, event_copy ACE_ENV_ARG_PARAMETER); } void TAO_CEC_MT_Dispatching::push_nocopy (TAO_CEC_ProxyPushSupplier* proxy, CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Double checked locking.... if (this->active_ == 0) this->activate (); - this->task_.push (proxy, event TAO_ENV_ARG_PARAMETER); + this->task_.push (proxy, event ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h index 22b00e1c42e..e6c8fc6bf7d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h @@ -48,10 +48,10 @@ public: virtual void shutdown (void); virtual void push (TAO_CEC_ProxyPushSupplier* proxy, const CORBA::Any & event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (TAO_CEC_ProxyPushSupplier* proxy, CORBA::Any& event - TAO_ENV_ARG_DECL); + ACE_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 49022892370..5e7eccaa6ae 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullConsumer::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPullConsumer_var result; ACE_TRY { - result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -50,18 +50,18 @@ TAO_CEC_ProxyPullConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_ProxyPullConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -82,7 +82,7 @@ TAO_CEC_ProxyPullConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) CORBA::Any* TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( CORBA::Boolean_out has_event - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + any = supplier->try_pull (has_event ACE_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 TAO_ENV_ARG_PARAMETER); + control->supplier_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -124,7 +124,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier ( control->system_exception (this, sysex - TAO_ENV_ARG_PARAMETER); + ACE_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 ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + any = supplier->pull (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -175,7 +175,7 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier ( CORBA::Boolean TAO_CEC_ProxyPullConsumer::supplier_non_existent ( CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supplier_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } void -TAO_CEC_ProxyPullConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) { CosEventComm::PullSupplier_var supplier; @@ -212,7 +212,7 @@ TAO_CEC_ProxyPullConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) supplier = this->supplier_._retn (); } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -220,7 +220,7 @@ TAO_CEC_ProxyPullConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - supplier->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -263,7 +263,7 @@ TAO_CEC_ProxyPullConsumer::_decr_refcnt (void) void TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( CosEventComm::PullSupplier_ptr pull_supplier - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -311,12 +311,12 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier ( } // Notify the event channel... - this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->event_channel_->disconnect_callbacks ()) { ACE_TRY { - supplier->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect_pull_supplier (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPullConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPullConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullConsumer::_remove_ref (ACE_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 10c22bd458e..c02dc393684 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 (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::ProxyPullConsumer_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) + virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no supplier is connected... @@ -68,8 +68,8 @@ public: /// Pulls from the supplier, verifies that it is connected. 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); + ACE_ENV_ARG_DECL); + CORBA::Any* pull_from_supplier (ACE_ENV_SINGLE_ARG_DECL); /** * Invoke the _non_existent() pseudo-operation on the supplier. If @@ -77,10 +77,10 @@ public: * <disconnected> flag. */ CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); /// Increment and decrement the reference count. CORBA::ULong _incr_refcnt (void); @@ -89,16 +89,16 @@ public: // = The CosEventChannelAdmin::ProxyPullConsumer methods... virtual void connect_pull_supplier ( CosEventComm::PullSupplier_ptr pull_supplier - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); - virtual void disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The Servant methods - 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); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (ACE_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 7f0c235a487..c9cf88c6059 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullSupplier::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPullSupplier_var result; ACE_TRY { - result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -49,18 +49,18 @@ TAO_CEC_ProxyPullSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_ProxyPullSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -74,7 +74,7 @@ TAO_CEC_ProxyPullSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_ProxyPullSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullSupplier::shutdown (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) consumer = this->consumer_._retn (); } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer.in ())) @@ -98,7 +98,7 @@ TAO_CEC_ProxyPullSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - consumer->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -112,7 +112,7 @@ TAO_CEC_ProxyPullSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_CEC_ProxyPullSupplier::consumer_non_existent ( CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -132,7 +132,7 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return this->consumer_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumer_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -140,7 +140,7 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent ( void TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPullSupplier::pull (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected)) { @@ -176,7 +176,7 @@ TAO_CEC_ProxyPullSupplier::pull (TAO_ENV_SINGLE_ARG_DECL) CORBA::Any * TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)) { has_event = 0; @@ -232,7 +232,7 @@ TAO_CEC_ProxyPullSupplier::_decr_refcnt (void) void TAO_CEC_ProxyPullSupplier::connect_pull_consumer ( CosEventComm::PullConsumer_ptr pull_consumer - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_channel_->reconnected (this ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_pull_consumer (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPullSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPullSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPullSupplier::_remove_ref (ACE_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 a602d56a722..64627f44280 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 (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::ProxyPullSupplier_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) + virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no consumer is connected... @@ -74,7 +74,7 @@ public: CosEventComm::PullConsumer_ptr consumer (void) const; /// The event channel is shutting down - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); /** * Invoke the _non_existent() pseudo-operation on the consumer. If @@ -82,24 +82,24 @@ public: * <disconnected> flag. */ CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Push an event into the queue. void push (const CORBA::Any &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // = The CosEventChannelAdmin::ProxyPullSupplier methods... virtual void connect_pull_consumer ( CosEventComm::PullConsumer_ptr pull_consumer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); - virtual CORBA::Any * pull (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Any * pull (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); - virtual void disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_pull_supplier (ACE_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 (TAO_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (ACE_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 fde22699136..b76b417808e 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushConsumer::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushConsumer_var result; ACE_TRY { - result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -50,18 +50,18 @@ TAO_CEC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_ProxyPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -77,7 +77,7 @@ TAO_CEC_ProxyPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_CEC_ProxyPushConsumer::supplier_non_existent ( CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supplier_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } void -TAO_CEC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) { CosEventComm::PushSupplier_var supplier; @@ -119,7 +119,7 @@ TAO_CEC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) this->connected_ = 0; } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -127,7 +127,7 @@ TAO_CEC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -171,7 +171,7 @@ TAO_CEC_ProxyPushConsumer::_decr_refcnt (void) void TAO_CEC_ProxyPushConsumer::connect_push_supplier ( CosEventComm::PushSupplier_ptr push_supplier - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -216,12 +216,12 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier ( } // Notify the event channel... - this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_CEC_ProxyPushConsumer_Guard ace_mon (this->lock_, @@ -232,13 +232,13 @@ TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event return; this->event_channel_->consumer_admin ()->push (event - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_CEC_ProxyPushConsumer::disconnect_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect_push_supplier (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPushConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPushConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushConsumer::_remove_ref (ACE_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 433c5f71dee..11f903f48ed 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 (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::ProxyPushConsumer_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) + virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no supplier is connected... @@ -72,10 +72,10 @@ public: * <disconnected> flag. */ CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); /// Increment and decrement the reference count. CORBA::ULong _incr_refcnt (void); @@ -84,19 +84,19 @@ public: // = The CosEventChannelAdmin::ProxyPushConsumer methods... virtual void connect_push_supplier ( CosEventComm::PushSupplier_ptr push_supplier - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)); virtual void push (const CORBA::Any& event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The Servant methods - 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); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (ACE_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 e6b129f6bb3..e96d67bf03e 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushSupplier::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CosEventChannelAdmin::ProxyPushSupplier_var result; ACE_TRY { - result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -50,18 +50,18 @@ TAO_CEC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_ProxyPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -75,7 +75,7 @@ TAO_CEC_ProxyPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_CEC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_ProxyPushSupplier::shutdown (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) consumer = this->consumer_._retn (); } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer.in ())) @@ -99,7 +99,7 @@ TAO_CEC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -114,7 +114,7 @@ typedef TAO_ESF_Proxy_RefCount_Guard<TAO_CEC_EventChannel,TAO_CEC_ProxyPushSuppl void TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Destroy_Guard auto_destroy (this->refcount_, this->event_channel_, @@ -134,7 +134,7 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock); this->event_channel_->dispatching ()->push (this, event - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -142,7 +142,7 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event void TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Destroy_Guard auto_destroy (this->refcount_, this->event_channel_, @@ -162,7 +162,7 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -200,7 +200,7 @@ TAO_CEC_ProxyPushSupplier::_decr_refcnt (void) void TAO_CEC_ProxyPushSupplier::connect_push_consumer ( CosEventComm::PushConsumer_ptr push_consumer - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_channel_->reconnected (this ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); } void TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->event_channel_->disconnect_callbacks ()) { ACE_TRY { - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -296,7 +296,7 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ( void TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + consumer->push (event ACE_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 TAO_ENV_ARG_PARAMETER); + control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -333,7 +333,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event control->system_exception (this, sysex - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -346,7 +346,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event void TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( const CORBA::Any& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CosEventComm::PushConsumer_var consumer; { @@ -360,7 +360,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( ACE_TRY { - consumer->push (event TAO_ENV_ARG_PARAMETER); + consumer->push (event ACE_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 TAO_ENV_ARG_PARAMETER); + control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -378,7 +378,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( control->system_exception (this, sysex - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -391,7 +391,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer ( CORBA::Boolean TAO_CEC_ProxyPushSupplier::consumer_non_existent ( CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumer_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ } PortableServer::POA_ptr -TAO_CEC_ProxyPushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPushSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_CEC_ProxyPushSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_ProxyPushSupplier::_remove_ref (ACE_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 a3bcddab675..c83f3ac5679 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 (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosEventChannelAdmin::ProxyPushSupplier_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) + virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return 0 if no consumer is connected... @@ -72,19 +72,19 @@ public: CosEventComm::PushConsumer_ptr consumer (void) const; /// The event channel is shutting down - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); /// Internal methods to push an event to each consumer. virtual void push (const CORBA::Any &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (CORBA::Any &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Pushes to the consumer, verifies that it is connected. void push_to_consumer (const CORBA::Any &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void reactive_push_to_consumer (const CORBA::Any &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Invoke the _non_existent() pseudo-operation on the consumer. If @@ -92,16 +92,16 @@ public: * <disconnected> flag. */ CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // = The CosEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( CosEventComm::PushConsumer_ptr push_consumer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_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 (TAO_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (ACE_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 1b49e6ccb4c..17a9b861a61 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -51,11 +51,11 @@ public: #if 0 /// Some strategies may want to keep track of connected consumers. virtual void connected (TAO_CEC_ProxyPullConsumer * - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; virtual void reconnected (TAO_CEC_ProxyPullConsumer * - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; virtual void diconnected (TAO_CEC_ProxyPullConsumer * - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_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 538bda35e5f..e69cc13e61d 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 ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { TAO_CEC_Ping_Push_Consumer push_worker (this); this->event_channel_->consumer_admin ()->for_each (&push_worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_CEC_Ping_Pull_Consumer pull_worker (this); this->event_channel_->consumer_admin ()->for_each (&pull_worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -59,26 +59,26 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout ( CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Query the state of the consumers... - this->query_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -105,12 +105,12 @@ TAO_CEC_Reactive_ConsumerControl::activate (void) // Get the PolicyCurrent object CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -125,7 +125,7 @@ TAO_CEC_Reactive_ConsumerControl::activate (void) this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -148,11 +148,11 @@ TAO_CEC_Reactive_ConsumerControl::shutdown (void) void TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( TAO_CEC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -167,11 +167,11 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( void TAO_CEC_Reactive_ConsumerControl::consumer_not_exist ( TAO_CEC_ProxyPullSupplier *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - proxy->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -187,7 +187,7 @@ void TAO_CEC_Reactive_ConsumerControl::system_exception ( TAO_CEC_ProxyPushSupplier *proxy, CORBA::SystemException & /* exception */ - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -232,24 +232,24 @@ TAO_CEC_ConsumerControl_Adapter::handle_timeout ( void TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = supplier->consumer_non_existent (disconnected - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_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 TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -277,24 +277,24 @@ TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier void TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = supplier->consumer_non_existent (disconnected - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_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 TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_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 c6ab0973fdd..6020bc61659 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h @@ -86,17 +86,17 @@ public: virtual int activate (void); virtual int shutdown (void); virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + void query_consumers (ACE_ENV_SINGLE_ARG_DECL); private: /// The polling rate @@ -129,7 +129,7 @@ public: TAO_CEC_Ping_Push_Consumer (TAO_CEC_ConsumerControl *control); virtual void work (TAO_CEC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_CEC_ConsumerControl *control_; @@ -143,7 +143,7 @@ public: TAO_CEC_Ping_Pull_Consumer (TAO_CEC_ConsumerControl *control); virtual void work (TAO_CEC_ProxyPullSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_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 2270576d96a..fd272fcf314 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -42,29 +42,29 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout ( CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -91,12 +91,12 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void) // Get the PolicyCurrent object CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -111,7 +111,7 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void) this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -149,7 +149,7 @@ TAO_CEC_Pulling_Strategy_Adapter::handle_timeout ( void TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean has_event = 0; CORBA::Any_var any; @@ -157,7 +157,7 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer ACE_TRY { any = consumer->try_pull_from_supplier (has_event - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -169,7 +169,7 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer if (has_event) { - this->consumer_admin_->push (any.in () TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->push (any.in () ACE_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 e72af9018fd..77cdcb69b4e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h @@ -112,7 +112,7 @@ public: TAO_CEC_SupplierControl *control); virtual void work (TAO_CEC_ProxyPullConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_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 75651b761dc..c7a9465d8d9 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 ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { TAO_CEC_Ping_Push_Supplier push_worker (this); this->event_channel_->supplier_admin ()->for_each (&push_worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_CEC_Ping_Pull_Supplier pull_worker (this); this->event_channel_->supplier_admin ()->for_each (&pull_worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -60,26 +60,26 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout ( CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Query the state of the suppliers... - this->query_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -106,12 +106,12 @@ TAO_CEC_Reactive_SupplierControl::activate (void) // Get the PolicyCurrent object CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -126,7 +126,7 @@ TAO_CEC_Reactive_SupplierControl::activate (void) this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -149,11 +149,11 @@ TAO_CEC_Reactive_SupplierControl::shutdown (void) void TAO_CEC_Reactive_SupplierControl::supplier_not_exist ( TAO_CEC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -166,11 +166,11 @@ TAO_CEC_Reactive_SupplierControl::supplier_not_exist ( void TAO_CEC_Reactive_SupplierControl::supplier_not_exist ( TAO_CEC_ProxyPullConsumer *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - proxy->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -184,7 +184,7 @@ void TAO_CEC_Reactive_SupplierControl::system_exception ( TAO_CEC_ProxyPullConsumer *proxy, CORBA::SystemException & /* exception */ - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -229,24 +229,24 @@ TAO_CEC_SupplierControl_Adapter::handle_timeout ( void TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = consumer->supplier_non_existent (disconnected - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_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 TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -275,24 +275,24 @@ TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer void TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = consumer->supplier_non_existent (disconnected - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_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 TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_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 278d23130d8..f0a4ba4eba9 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h @@ -86,17 +86,17 @@ public: virtual int activate (void); virtual int shutdown (void); virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + void query_suppliers (ACE_ENV_SINGLE_ARG_DECL); private: /// The polling rate @@ -129,7 +129,7 @@ public: TAO_CEC_Ping_Push_Supplier (TAO_CEC_SupplierControl *control); virtual void work (TAO_CEC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_CEC_SupplierControl *control_; @@ -143,7 +143,7 @@ public: TAO_CEC_Ping_Pull_Supplier (TAO_CEC_SupplierControl *control); virtual void work (TAO_CEC_ProxyPullConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_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 7ec53139c38..fb7b6ba79aa 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_CEC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.connected (consumer TAO_ENV_ARG_PARAMETER); + this->push_admin_.connected (consumer ACE_ENV_ARG_PARAMETER); } void TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.reconnected (consumer TAO_ENV_ARG_PARAMETER); + this->push_admin_.reconnected (consumer ACE_ENV_ARG_PARAMETER); } void TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->push_admin_.disconnected (consumer ACE_ENV_ARG_PARAMETER); } void TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPullConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.connected (consumer TAO_ENV_ARG_PARAMETER); + this->pull_admin_.connected (consumer ACE_ENV_ARG_PARAMETER); } void TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPullConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.reconnected (consumer TAO_ENV_ARG_PARAMETER); + this->pull_admin_.reconnected (consumer ACE_ENV_ARG_PARAMETER); } void TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->pull_admin_.disconnected (consumer ACE_ENV_ARG_PARAMETER); } void -TAO_CEC_SupplierAdmin::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_SupplierAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->push_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->pull_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->pull_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CEC_SupplierAdmin::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->push_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CEC_SupplierAdmin::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_CEC_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->pull_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h index 5dbc4252c95..c9a06913059 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h @@ -58,40 +58,40 @@ public: /// For each elements call <worker->work()>. void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// For each elements call <worker->work()>. void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Keep track of connected consumers. virtual void connected (TAO_CEC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void connected (TAO_CEC_ProxyPullConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_CEC_ProxyPullConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_CEC_ProxyPullConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// The event channel is shutting down, inform all the consumers of /// this - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // = The CosEventChannelAdmin::SupplierAdmin methods... virtual CosEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr - obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_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 43b2cfbab3d..dc20a41a684 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i @@ -3,15 +3,15 @@ ACE_INLINE void TAO_CEC_SupplierAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push_admin_.for_each (worker TAO_ENV_ARG_PARAMETER); + this->push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_CEC_SupplierAdmin:: for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->pull_admin_.for_each (worker TAO_ENV_ARG_PARAMETER); + this->pull_admin_.for_each (worker ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp index c0856651a75..c87f08c65aa 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp @@ -30,20 +30,20 @@ TAO_CEC_SupplierControl::shutdown (void) void TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPushConsumer * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPullConsumer * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_CEC_SupplierControl::system_exception (TAO_CEC_ProxyPullConsumer *, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index 6e92fbcda70..5374a09b73d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -63,7 +63,7 @@ public: * CORBA::OBJECT_NOT_EXIST exception has been raised). */ virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /** * Invoked by helper classes when they detect that a supplier does @@ -71,12 +71,12 @@ public: * CORBA::OBJECT_NOT_EXIST exception has been raised). */ virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp index 011fe07d0ea..44b02a11e47 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp @@ -29,7 +29,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + worker->work (*j ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; (*j)->_decr_refcnt (); } @@ -81,42 +81,42 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); proxy->_incr_refcnt (); - this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.connected (proxy ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); proxy->_incr_refcnt (); - this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.reconnected (proxy ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.disconnected (proxy ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + shutdown (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_.shutdown (ACE_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 5f1b3e1e100..98578fe4fb5 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h @@ -41,14 +41,14 @@ public: // = The TAO_ESF_Proxy_Collection methods virtual void for_each (TAO_ESF_Worker<PROXY> *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void connected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (PROXY *proxy - TAO_ENV_ARG_DECL); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void shutdown (ACE_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 1ecba5d20e3..160bd3cabc4 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp @@ -66,7 +66,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Read_Guard ace_mon (this->mutex_, this->collection_); @@ -74,7 +74,7 @@ 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 TAO_ENV_ARG_PARAMETER); + worker->work (*i ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -82,7 +82,7 @@ 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>:: connected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + ace_mon.copy->collection.connected (proxy ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + ace_mon.copy->collection.reconnected (proxy ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + ace_mon.copy->collection.disconnected (proxy ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + shutdown (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + ace_mon.copy->collection.shutdown (ACE_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 8e646428cb0..52f2303f730 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h @@ -126,14 +126,14 @@ public: // = The TAO_ESF_Proxy methods virtual void for_each (TAO_ESF_Worker<PROXY> *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void connected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (PROXY *proxy - TAO_ENV_ARG_DECL); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void shutdown (ACE_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 564e6d08805..3344bc33cab 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp @@ -46,14 +46,14 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + worker->work (*i ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -108,7 +108,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->connected_i (proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -135,7 +135,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>:: reconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->reconnected_i (proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -162,7 +162,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>:: disconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->disconnected_i (proxy ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + shutdown (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown_i (ACE_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 7c28ba64540..175066320f3 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h @@ -93,12 +93,12 @@ public: int execute_delayed_operations (void); void connected_i (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void reconnected_i (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void disconnected_i (PROXY *proxy - TAO_ENV_ARG_DECL); - void shutdown_i (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + void shutdown_i (ACE_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; @@ -107,14 +107,14 @@ public: // = The TAO_ESF_Proxy methods virtual void for_each (TAO_ESF_Worker<PROXY> *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void connected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (PROXY *proxy - TAO_ENV_ARG_DECL); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void shutdown (ACE_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 964625575f9..7ba390a202f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i @@ -3,30 +3,30 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.connected (proxy ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.reconnected (proxy ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.disconnected (proxy ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + shutdown_i (ACE_ENV_SINGLE_ARG_DECL) { - this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_.shutdown (ACE_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 89fa3596658..631c41190c6 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp @@ -18,16 +18,16 @@ TAO_ESF_Connected_Command<Target,Object>::execute (void* arg) { if (arg != 0) { - TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = + ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = *ACE_static_cast(CORBA::Environment*, arg)); this->target_->connected_i (this->object_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { - TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV); + ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV); this->target_->connected_i (this->object_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return 0; @@ -40,16 +40,16 @@ TAO_ESF_Reconnected_Command<Target,Object>::execute (void* arg) { if (arg != 0) { - TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = + ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = *ACE_static_cast(CORBA::Environment*, arg)); this->target_->reconnected_i (this->object_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { - TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV); + ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV); this->target_->reconnected_i (this->object_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return 0; } @@ -61,16 +61,16 @@ TAO_ESF_Disconnected_Command<Target,Object>::execute (void* arg) { if (arg != 0) { - TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = + ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = *ACE_static_cast(CORBA::Environment*, arg)); this->target_->disconnected_i (this->object_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { - TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV); + ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV); this->target_->disconnected_i (this->object_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return 0; } @@ -82,14 +82,14 @@ TAO_ESF_Shutdown_Command<Target>::execute (void* arg) { if (arg != 0) { - TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = + ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = *ACE_static_cast(CORBA::Environment*, arg)); - this->target_->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER); } else { - TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV); - this->target_->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV); + this->target_->shutdown_i (ACE_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 2fc47be1f6c..28d63858848 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp @@ -31,14 +31,14 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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) TAO_ENV_ARG_PARAMETER); + worker->work ((*i) ACE_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 db5b6b2563a..8d08c77b968 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h @@ -33,14 +33,14 @@ public: // = The TAO_ESF_Proxy methods virtual void for_each (TAO_ESF_Worker<PROXY> *worker - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void connected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (PROXY *proxy - TAO_ENV_ARG_DECL); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void shutdown (ACE_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 21bf4981b67..d90394ed395 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i @@ -3,40 +3,40 @@ template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: connected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); proxy->_incr_refcnt (); - this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.connected (proxy ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); proxy->_incr_refcnt (); - this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.reconnected (proxy ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER); } template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>:: - shutdown (TAO_ENV_SINGLE_ARG_DECL) + shutdown (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD (ACE_LOCK, ace_mon, this->lock_); - this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_.shutdown (ACE_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 21123fd2cd9..c514674fda3 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp @@ -29,34 +29,34 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Connected<PROXY,PEER> worker (peer); - this->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->for_each (&worker ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Reconnected<PROXY,PEER> worker (peer); - this->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->for_each (&worker ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Peer_Disconnected<PROXY,PEER> worker (peer); - this->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->for_each (&worker ACE_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 256e342e17a..646fab48906 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 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 (); + * void connected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw (); + * void reconnected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw (); + * void disconnected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw (); * @endverbatim * * Similarly, the PEER interface must implement: * * @verbatim - * 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 (); + * void connected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw (); + * void reconnected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw (); + * void disconnected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw (); * @endverbatim */ template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> @@ -67,7 +67,7 @@ public: * The default implementation is a no-op. */ virtual void peer_connected (PEER *peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -77,7 +77,7 @@ public: * <reconnected> method */ virtual void peer_reconnected (PEER *peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -86,7 +86,7 @@ public: * proxy. */ virtual void peer_disconnected (PEER *peer - TAO_ENV_ARG_DECL) + ACE_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 81f2ea5d27a..ad0678ae0a7 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp @@ -13,12 +13,12 @@ ACE_RCSID(ESF, ESF_Peer_Workers, "$Id$") template<class P, class R> void TAO_ESF_Peer_Connected<P,R>::work (P *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->connected (this->peer_ TAO_ENV_ARG_PARAMETER); + proxy->connected (this->peer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline - this->peer_->connected (proxy TAO_ENV_ARG_PARAMETER); + this->peer_->connected (proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline } @@ -26,12 +26,12 @@ TAO_ESF_Peer_Connected<P,R>::work (P *proxy template<class P, class R> void TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->reconnected (this->peer_ TAO_ENV_ARG_PARAMETER); + proxy->reconnected (this->peer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline - this->peer_->reconnected (proxy TAO_ENV_ARG_PARAMETER); + this->peer_->reconnected (proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline } @@ -39,12 +39,12 @@ TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy template<class P, class R> void TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->disconnected (this->peer_ TAO_ENV_ARG_PARAMETER); + proxy->disconnected (this->peer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shouldn't happen, just following the discipline - this->peer_->disconnected (proxy TAO_ENV_ARG_PARAMETER); + this->peer_->disconnected (proxy ACE_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 e69984da721..9998a29d19f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h @@ -33,7 +33,7 @@ public: TAO_ESF_Peer_Connected (PEER *peer); void work (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: PEER* peer_; @@ -56,7 +56,7 @@ public: TAO_ESF_Peer_Reconnected (PEER *peer); void work (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: PEER* peer_; @@ -79,7 +79,7 @@ public: TAO_ESF_Peer_Disconnected (PEER *peer); void work (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_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 062b06869aa..a4bbb416902 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 (TAO_ENV_SINGLE_ARG_DECL) + obtain (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (INTERFACE::_nil ()); - this->collection_->connected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_->connected (proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (INTERFACE::_nil ()); return result._retn (); @@ -50,21 +50,21 @@ 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 (TAO_ENV_SINGLE_ARG_DECL) + shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ESF_Shutdown_Proxy<PROXY> worker; - this->collection_->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Cannot happen, just following the discipline. - this->collection_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: connected (PROXY * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -72,24 +72,24 @@ 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>:: reconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->collection_->reconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_->reconnected (proxy ACE_ENV_ARG_PARAMETER); } template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>:: disconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - proxy->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Cannot happen, just following the discipline. ACE_TRY { - this->collection_->disconnected (proxy TAO_ENV_ARG_PARAMETER); + this->collection_->disconnected (proxy ACE_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 a76275f083b..dfe39ce311e 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) throw (); + * PROXY::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw (); * // activate the proxy and return the object reference * @endverbatim * @@ -70,7 +70,7 @@ public: /// Iterate over its internal collection. void for_each (TAO_ESF_Worker<PROXY> *worker - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -97,7 +97,7 @@ public: * The default implementation is a no-op. */ virtual void connected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -107,7 +107,7 @@ public: * <reconnected> method */ virtual void reconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -116,7 +116,7 @@ public: * proxy. */ virtual void disconnected (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_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 be00cdad82e..9eec0894754 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i @@ -3,8 +3,8 @@ template<class EC,class P,class I> ACE_INLINE void TAO_ESF_Proxy_Admin<EC,P,I>:: for_each (TAO_ESF_Worker<P> *worker - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->collection_->for_each (worker TAO_ENV_ARG_PARAMETER); + this->collection_->for_each (worker ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h index b04cbe9f3b7..0337ec87245 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h @@ -129,12 +129,12 @@ public: * This encapsulates */ virtual void for_each (TAO_ESF_Worker<PROXY> *worker - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Insert a new element into the collection. The collection assumes /// ownership of the element. virtual void connected (PROXY *proxy - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /** * Insert an element into the collection. No errors can be raised @@ -144,14 +144,14 @@ public: * collection. */ virtual void reconnected (PROXY *proxy - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Remove an element from the collection. virtual void disconnected (PROXY *proxy - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// The EC is shutting down, must release all the elements. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual void shutdown (ACE_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 e871ce15a7d..04702e9feed 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp @@ -19,7 +19,7 @@ TAO_ESF_Proxy_List<PROXY>:: template<class PROXY> void TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.insert (proxy); if (r == 0) @@ -40,7 +40,7 @@ TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy template<class PROXY> void TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.insert (proxy); if (r == 0) @@ -65,7 +65,7 @@ TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy template<class PROXY> void TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ESF_Proxy_List<PROXY>::shutdown (ACE_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 85d6d3f9914..4a2410b1a70 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h @@ -50,19 +50,19 @@ public: /// Insert a new element to the collection void connected (PROXY * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Insert a new element that could be there already. void reconnected (PROXY * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Remove an element from the collection void disconnected (PROXY * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Shutdown the collection, i.e. remove all elements and release /// resources - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void shutdown (ACE_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 002cc934635..9e6993882d8 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp @@ -19,7 +19,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>:: template<class PROXY> void TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.bind (proxy, 1); if (r == 0) @@ -40,7 +40,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy template<class PROXY> void TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { int r = this->impl_.rebind (proxy, 1); if (r == 0) @@ -63,7 +63,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy template<class PROXY> void TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (ACE_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 c957b46209a..ccaa98f8010 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h @@ -74,18 +74,18 @@ public: /// Insert a new element to the collection void connected (PROXY * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Insert a new element that could be there already. void reconnected (PROXY * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Remove an element from the collection void disconnected (PROXY * - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Shutdown the collection, i.e. remove all elements and release /// resources - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void shutdown (ACE_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 21627fef89f..6058198ef9e 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp @@ -13,11 +13,11 @@ ACE_RCSID(ESF, ESF_Shutdown_Proxy, "$Id$") template<class PROXY> void TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - proxy->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->shutdown (ACE_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 69b3de4dc73..feffd2ccb3a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h @@ -27,7 +27,7 @@ public: TAO_ESF_Shutdown_Proxy (void); void work (PROXY *proxy - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h index c555be82e53..fe282efe565 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h @@ -35,7 +35,7 @@ public: /// Callback interface. virtual void work (Object *object - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp index 77181c7c351..dd3d08881af 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp @@ -41,7 +41,7 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any) CORBA::TCKind corba_type = CORBA::tk_null; ACE_TRY { - corba_type = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + corba_type = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -59,14 +59,14 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any) this->op_.integer_ = 0; if (corba_type == CORBA::tk_short) - { - CORBA::Short sh; - any_ref >>= sh; - this->op_.integer_ = (CORBA::Long) sh; - } + { + CORBA::Short sh; + any_ref >>= sh; + this->op_.integer_ = (CORBA::Long) sh; + } else { - any_ref >>= this->op_.integer_; + any_ref >>= this->op_.integer_; } break; @@ -74,24 +74,24 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any) this->op_.uinteger_ = 0; if (corba_type == CORBA::tk_ushort) - { - CORBA::UShort sh; - any_ref >>= sh; - this->op_.uinteger_ = (CORBA::ULong) sh; - } + { + CORBA::UShort sh; + any_ref >>= sh; + this->op_.uinteger_ = (CORBA::ULong) sh; + } else { - any_ref >>= this->op_.uinteger_; + any_ref >>= this->op_.uinteger_; } break; case TAO_ETCL_DOUBLE: if (corba_type == CORBA::tk_float) - { - CORBA::Float fl; + { + CORBA::Float fl; (*any) >>= fl; - this->op_.double_ = (CORBA::Double) fl; - } + this->op_.double_ = (CORBA::Double) fl; + } else { (*any) >>= this->op_.double_; @@ -100,15 +100,15 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any) break; case TAO_ETCL_BOOLEAN: { - CORBA_Any::to_boolean tmp (this->op_.bool_); + CORBA_Any::to_boolean tmp (this->op_.bool_); (*any) >>= tmp; } break; case TAO_ETCL_STRING: { - const char* s; - any_ref >>= s; - this->op_.str_ = CORBA::string_dup (s); + const char* s; + any_ref >>= s; + this->op_.str_ = CORBA::string_dup (s); } break; case TAO_ETCL_COMPONENT: @@ -300,17 +300,17 @@ TAO_ETCL_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type) CORBA::TCKind kind = CORBA::tk_null; ACE_TRY { - kind = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_var tmp = CORBA::TypeCode::_duplicate (type); while (kind == CORBA::tk_alias) { - tmp = tmp->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tmp = tmp->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - kind = tmp->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = tmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -510,7 +510,7 @@ TAO_ETCL_Literal_Constraint::operator>= (const TAO_ETCL_Literal_Constraint & rhs switch (widest_type) { case TAO_ETCL_STRING: - return_value = + return_value = (ACE_OS::strcmp ((const char*) *this, (const char*) rhs) >= 0); break; case TAO_ETCL_DOUBLE: @@ -539,19 +539,19 @@ TAO_ETCL_Literal_Constraint::operator+ (const TAO_ETCL_Literal_Constraint & rhs) { case TAO_ETCL_DOUBLE: { - CORBA::Double result = (CORBA::Double) *this + (CORBA::Double) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); + CORBA::Double result = (CORBA::Double) *this + (CORBA::Double) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); } case TAO_ETCL_INTEGER: case TAO_ETCL_SIGNED: { - CORBA::Long result = (CORBA::Long) *this + (CORBA::Long) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); + CORBA::Long result = (CORBA::Long) *this + (CORBA::Long) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); } case TAO_ETCL_UNSIGNED: { - CORBA::ULong result = (CORBA::ULong) *this + (CORBA::ULong) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); + CORBA::ULong result = (CORBA::ULong) *this + (CORBA::ULong) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); } default: return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0); @@ -567,19 +567,19 @@ TAO_ETCL_Literal_Constraint::operator- (const TAO_ETCL_Literal_Constraint & rhs) { case TAO_ETCL_DOUBLE: { - CORBA::Double result = (CORBA::Double) *this - (CORBA::Double) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); + CORBA::Double result = (CORBA::Double) *this - (CORBA::Double) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); } case TAO_ETCL_INTEGER: case TAO_ETCL_SIGNED: { - CORBA::Long result = (CORBA::Long) *this - (CORBA::Long) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); + CORBA::Long result = (CORBA::Long) *this - (CORBA::Long) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); } case TAO_ETCL_UNSIGNED: { - CORBA::ULong result = (CORBA::ULong) *this - (CORBA::ULong) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); + CORBA::ULong result = (CORBA::ULong) *this - (CORBA::ULong) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); } default: return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0); @@ -595,19 +595,19 @@ TAO_ETCL_Literal_Constraint::operator* (const TAO_ETCL_Literal_Constraint & rhs) { case TAO_ETCL_DOUBLE: { - CORBA::Double result = (CORBA::Double) *this * (CORBA::Double) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); + CORBA::Double result = (CORBA::Double) *this * (CORBA::Double) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); } case TAO_ETCL_INTEGER: case TAO_ETCL_SIGNED: { - CORBA::Long result = (CORBA::Long) *this * (CORBA::Long) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); + CORBA::Long result = (CORBA::Long) *this * (CORBA::Long) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); } case TAO_ETCL_UNSIGNED: { - CORBA::ULong result = (CORBA::ULong) *this * (CORBA::ULong) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); + CORBA::ULong result = (CORBA::ULong) *this * (CORBA::ULong) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); } default: return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0); @@ -623,19 +623,19 @@ TAO_ETCL_Literal_Constraint::operator/ (const TAO_ETCL_Literal_Constraint & rhs) { case TAO_ETCL_DOUBLE: { - CORBA::Double result = (CORBA::Double) *this / (CORBA::Double) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); + CORBA::Double result = (CORBA::Double) *this / (CORBA::Double) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); } case TAO_ETCL_INTEGER: case TAO_ETCL_SIGNED: { - CORBA::Long result = (CORBA::Long) *this / (CORBA::Long) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); + CORBA::Long result = (CORBA::Long) *this / (CORBA::Long) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); } case TAO_ETCL_UNSIGNED: { - CORBA::ULong result = (CORBA::ULong) *this / (CORBA::ULong) rhs; - return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); + CORBA::ULong result = (CORBA::ULong) *this / (CORBA::ULong) rhs; + return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result); } default: return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0); @@ -648,12 +648,12 @@ TAO_ETCL_Literal_Constraint::operator- (void) switch (this->type_) { case TAO_ETCL_DOUBLE: - return TAO_ETCL_Literal_Constraint (- this->op_.double_); + return TAO_ETCL_Literal_Constraint (- this->op_.double_); case TAO_ETCL_INTEGER: case TAO_ETCL_SIGNED: - return TAO_ETCL_Literal_Constraint (- this->op_.integer_); + return TAO_ETCL_Literal_Constraint (- this->op_.integer_); case TAO_ETCL_UNSIGNED: - return TAO_ETCL_Literal_Constraint (- (CORBA::Long) this->op_.uinteger_); + return TAO_ETCL_Literal_Constraint (- (CORBA::Long) this->op_.uinteger_); default: return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0); } @@ -661,7 +661,7 @@ TAO_ETCL_Literal_Constraint::operator- (void) TAO_Literal_Type TAO_ETCL_Literal_Constraint::widest_type ( - const TAO_ETCL_Literal_Constraint & rhs + const TAO_ETCL_Literal_Constraint & rhs ) { TAO_Literal_Type rhs_type = rhs.expr_type (); @@ -676,11 +676,11 @@ TAO_ETCL_Literal_Constraint::widest_type ( { if (rhs_type > this->type_) { - return_value = rhs_type; + return_value = rhs_type; } else { - return_value = this->type_; + return_value = this->type_; } } diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp index 62f0d7a8402..21d3100981f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp @@ -152,11 +152,11 @@ int ACE_ES_Dispatching_Base::dispatch_event (ACE_ES_Dispatch_Request *request, u_long &command_action) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Forward the request. - up_->push (request TAO_ENV_ARG_PARAMETER); + up_->push (request ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -241,9 +241,9 @@ ACE_ES_Priority_Dispatching::initialize_queues (void) void ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - down_->connected (consumer TAO_ENV_ARG_PARAMETER); + down_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; // This code does dynamic allocation of channel dispatch threads. @@ -255,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 TAO_ENV_ARG_PARAMETER); + down_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::OS_Priority priority = @@ -338,7 +338,7 @@ ACE_ES_Priority_Dispatching::disconnected (ACE_Push_Consumer_Proxy *consumer) // <request> has been dynamically allocated by the filtering module. void ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PUSH_SOURCE_TYPE_CORRELATION_MODULE); @@ -355,14 +355,14 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request thread_priority, subpriority, preemption_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server ()->priority (request->rt_info (), thread_priority, subpriority, preemption_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PRIORITY_DISPATCHING_PUSH_PRIORITY_OBTAINED); ACE_CHECK; @@ -619,7 +619,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, "ACE_ES_Dispatch_Queue::open_queue"), -1); case 0: { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY {// @@ TODO: Handle exceptions... #if 1 @@ -634,7 +634,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->set (rt_info_, RtecScheduler::VERY_HIGH_CRITICALITY, @@ -646,7 +646,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -686,7 +686,7 @@ ACE_ES_EFD_Dispatching::ACE_ES_EFD_Dispatching (ACE_EventChannel *channel) void ACE_ES_EFD_Dispatching::push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // If it's a request to forward an event, it needs a reference to us // to call dispatch_event. @@ -727,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 ()); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Forward the request. - up_->push (request TAO_ENV_ARG_PARAMETER); + up_->push (request ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -759,10 +759,10 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request, void ACE_ES_RTU_Dispatching::push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // First enqueue the message in the proper queue. - ACE_ES_Priority_Dispatching::push (request TAO_ENV_ARG_PARAMETER); + ACE_ES_Priority_Dispatching::push (request ACE_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 30f14e7fd21..ab82394c9ec 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h @@ -64,11 +64,11 @@ public: // Link to adjacent modules. virtual void connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Forward down_. virtual void disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Forward down_. virtual void disconnected (ACE_Push_Consumer_Proxy *consumer); @@ -79,7 +79,7 @@ public: // void disconnecting (ACE_Push_Supplier_Proxy *supplier); virtual void push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; // Forward up_. virtual int dispatch_event (ACE_ES_Dispatch_Request *request, @@ -386,7 +386,7 @@ public: // Delete queues. void connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Allocate any needed dispatching resources for this consumers // priority. @@ -398,7 +398,7 @@ public: // void disconnecting (ACE_Push_Supplier_Proxy *supplier); virtual void push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Enqueues the request on the appropriate Dispatch Queue. virtual void activate (int threads_per_queue); @@ -471,7 +471,7 @@ public: // the dispatching base constructor. virtual void push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Forward up_. }; @@ -495,7 +495,7 @@ public: // policy. virtual void push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 cc6c5d64243..e2091091c6d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i @@ -156,9 +156,9 @@ ACE_ES_Dispatching_Base::open (ACE_ES_Consumer_Module *up, ACE_INLINE void ACE_ES_Dispatching_Base::connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - down_->connected (consumer TAO_ENV_ARG_PARAMETER); + down_->connected (consumer ACE_ENV_ARG_PARAMETER); } ACE_INLINE void @@ -170,9 +170,9 @@ ACE_ES_Dispatching_Base::disconnected (ACE_Push_Consumer_Proxy *consumer) ACE_INLINE void ACE_ES_Dispatching_Base::disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - down_->disconnecting (consumer TAO_ENV_ARG_PARAMETER); + down_->disconnecting (consumer ACE_ENV_ARG_PARAMETER); } ACE_INLINE void diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 624920c3b4e..a22b6ca2963 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -29,7 +29,7 @@ TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void) int TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ TODO Think about the exception safety (or lack thereof) of // this code, what if the following operations fail? @@ -44,13 +44,13 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec // its lifetime. RtecEventChannelAdmin::Observer_var obs = - this->observer_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->observer_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_TRY { this->handle_ = - this->ec_->append_observer (obs.in () TAO_ENV_ARG_PARAMETER); + this->ec_->append_observer (obs.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } ACE_CATCH(CORBA::SystemException, ex) @@ -60,12 +60,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->observer_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->observer_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&this->observer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_RE_THROW; @@ -77,26 +77,26 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec } int -TAO_ECG_Mcast_EH::close (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_Mcast_EH::close (ACE_ENV_SINGLE_ARG_DECL) { if (this->handle_ == 0) return 0; RtecEventChannelAdmin::Observer_Handle h = this->handle_; this->handle_ = 0; - this->ec_->remove_observer (h TAO_ENV_ARG_PARAMETER); + this->ec_->remove_observer (h ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->observer_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->observer_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&this->observer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -144,7 +144,7 @@ void TAO_ECG_Mcast_EH::compute_required_subscriptions ( const RtecEventChannelAdmin::ConsumerQOS& sub, Address_Set& multicast_addresses - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong count = sub.dependencies.length (); @@ -170,7 +170,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 TAO_ENV_ARG_PARAMETER); + this->receiver_->get_addr (header, addr ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_INET_Addr inet_addr (addr.port, addr.ipaddr); @@ -299,7 +299,7 @@ TAO_ECG_Mcast_EH::add_new_subscriptions ( void TAO_ECG_Mcast_EH::update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ TODO This function turned out to be too long, we need to break @@ -310,7 +310,7 @@ TAO_ECG_Mcast_EH::update_consumer ( Address_Set multicast_addresses; - this->compute_required_subscriptions (sub, multicast_addresses TAO_ENV_ARG_PARAMETER); + this->compute_required_subscriptions (sub, multicast_addresses ACE_ENV_ARG_PARAMETER); ACE_CHECK; // 2) To conserve OS and network resources we first unsubscribe from @@ -329,7 +329,7 @@ TAO_ECG_Mcast_EH::update_consumer ( void TAO_ECG_Mcast_EH::update_supplier (const RtecEventChannelAdmin::SupplierQOS& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -345,19 +345,19 @@ TAO_ECG_Mcast_EH::Observer::Observer (TAO_ECG_Mcast_EH* eh) void TAO_ECG_Mcast_EH::Observer::update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->eh_->update_consumer (sub TAO_ENV_ARG_PARAMETER); + this->eh_->update_consumer (sub ACE_ENV_ARG_PARAMETER); } void TAO_ECG_Mcast_EH::Observer::update_supplier ( const RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->eh_->update_supplier (pub TAO_ENV_ARG_PARAMETER); + this->eh_->update_supplier (pub ACE_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 a4f52be104d..fa9fc0dd703 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -59,24 +59,24 @@ public: * reactor. */ int open (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int close (ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -100,11 +100,11 @@ public: // The Observer methods virtual void update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void update_supplier ( const RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -134,7 +134,7 @@ private: void compute_required_subscriptions ( const RtecEventChannelAdmin::ConsumerQOS& sub, Address_Set& multicast_addresses - TAO_ENV_ARG_DECL) + ACE_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/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index 33a372afecc..eac9230d22c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -61,7 +61,7 @@ void TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, RtecUDPAdmin::AddrServer_ptr addr_server, TAO_ECG_UDP_Out_Endpoint* endpoint - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_duplicate (lcl_ec); @@ -83,23 +83,23 @@ TAO_ECG_UDP_Sender::mtu (CORBA::ULong new_mtu) } void -TAO_ECG_UDP_Sender::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_UDP_Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil (); } void TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (sub.dependencies.length () == 0) @@ -109,15 +109,15 @@ TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub //ACE_SupplierQOS_Factory::debug (pub); RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->lcl_ec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lcl_ec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushConsumer_var consumer_ref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; //ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Consumer ")); @@ -125,35 +125,35 @@ TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub this->supplier_proxy_->connect_push_consumer (consumer_ref.in (), sub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Sender::close (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_UDP_Sender::close (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Sender::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ECG_UDP_Sender::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -163,7 +163,7 @@ TAO_ECG_UDP_Sender::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Sender::push - \n")); @@ -192,11 +192,11 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events RtecUDPAdmin::UDP_Addr udp_addr; this->addr_server_->get_addr (header, udp_addr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->send_event (udp_addr, e - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // That's it, no need to continue... @@ -219,7 +219,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 (e.header, udp_addr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; Destination_Map::ENTRY *entry; @@ -249,11 +249,11 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events ++k) { this->marshal_one_event (events[(*k)], cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } this->send_cdr_stream ((*j).ext_id_, cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -269,7 +269,7 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events void TAO_ECG_UDP_Sender::marshal_one_event (const RtecEventComm::Event& e, TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // We need to modify the TTL field, but copying the entire event // would be wasteful; instead we create a new header and only @@ -285,7 +285,7 @@ TAO_ECG_UDP_Sender::marshal_one_event (const RtecEventComm::Event& e, void TAO_ECG_UDP_Sender::send_event (const RtecUDPAdmin::UDP_Addr& udp_addr, const RtecEventComm::Event& e - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is the CDR stream used to marshal the event... TAO_OutputCDR cdr; @@ -295,17 +295,17 @@ TAO_ECG_UDP_Sender::send_event (const RtecUDPAdmin::UDP_Addr& udp_addr, // marshal without any extra copies. cdr.write_ulong (1); - this->marshal_one_event (e, cdr TAO_ENV_ARG_PARAMETER); + this->marshal_one_event (e, cdr ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->send_cdr_stream (udp_addr, cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ TODO precompute this when the MTU changes... CORBA::ULong max_fragment_payload = this->mtu () - @@ -364,7 +364,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, fragment_count, iov, iovcnt - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += max_fragment_payload; @@ -392,7 +392,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, fragment_count, iov, iovcnt - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += max_fragment_payload; @@ -413,7 +413,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, fragment_count, iov, iovcnt - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += fragment_size; @@ -437,7 +437,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, fragment_count, iov, iovcnt - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += fragment_size; @@ -460,7 +460,7 @@ TAO_ECG_UDP_Sender::send_fragment (const RtecUDPAdmin::UDP_Addr& udp_addr, CORBA::ULong fragment_count, iovec iov[], int iovcnt - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ULong header[TAO_ECG_UDP_Protocol::ECG_HEADER_SIZE / sizeof(CORBA::ULong) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 7757cbce581..a039adeb648 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -59,7 +59,7 @@ public: void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, RtecUDPAdmin::AddrServer_ptr addr_server, TAO_ECG_UDP_Out_Endpoint *endpoint - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * The sender may need to fragment the message, otherwise the @@ -72,20 +72,20 @@ public: /// Disconnect and shutdown the sender, no further connections will /// work unless init() is called again. - void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Connect (or reconnect) to the EC with the given subscriptions. void open (RtecEventChannelAdmin::ConsumerQOS &sub - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect from the EC, but reconnection is still possible. - void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// The PushConsumer methods. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -96,18 +96,18 @@ private: */ void marshal_one_event (const RtecEventComm::Event& e, TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Helper function to marshal and send a single event. void send_event (const RtecUDPAdmin::UDP_Addr& udp_addr, const RtecEventComm::Event& e - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Helper function to send one or more events once they have been /// marshaled into a CDR stream. void send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Send one fragment, the first entry in the iovec is used to send @@ -123,7 +123,7 @@ private: CORBA::ULong fragment_count, iovec iov[], int iovcnt - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Count the number of fragments that will be required to send the diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp index 7efa43f67b9..f9562d11194 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp @@ -59,12 +59,12 @@ TAO_EC_And_Filter::size (void) const int TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter (event, qos_info ACE_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 TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -83,12 +83,12 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter_nocopy (event, qos_info ACE_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 TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -107,14 +107,14 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_And_Filter::push (const RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_And_Filter::push_nocopy (RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -165,7 +165,7 @@ int TAO_EC_And_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 cd510858f4e..631198f7014 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h @@ -51,22 +51,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_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 5725d9bf671..b1b7b1ca222 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -25,7 +25,7 @@ TAO_EC_Filter* TAO_EC_Basic_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) const + ACE_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_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h index 38d4c5fb386..ddbfcfe1bbd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h @@ -47,7 +47,7 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const; + ACE_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 c958f40e5e5..da2d0e66069 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp @@ -45,7 +45,7 @@ TAO_EC_Bitmask_Filter::size (void) const int TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + return this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER); } int TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + return this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Bitmask_Filter::push (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Bitmask_Filter::push_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -117,7 +117,7 @@ int TAO_EC_Bitmask_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 69984a309ef..f617b1a7f53 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h @@ -68,22 +68,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_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 bc5b04a77c1..913e5ce35ce 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp @@ -83,14 +83,14 @@ TAO_EC_Conjunction_Filter::size (void) const int TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + int n = (*this->current_child_)->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -101,14 +101,14 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -119,7 +119,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (this->event_, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Conjunction_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -203,7 +203,7 @@ int TAO_EC_Conjunction_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 bf49e8a52e3..b2788d196a2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h @@ -53,22 +53,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_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 ddcfd4faa5f..90f84370770 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obtain (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_EC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ConsumerAdmin::_default_POA (ACE_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 cac71634fde..7914fc9f6c2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h @@ -38,7 +38,7 @@ class TAO_EC_ProxyPushConsumer; * <H2> Memory Management</H2> * It does not assume ownership of the TAO_EC_Event_Channel object; * but it *does* assume ownership of the TAO_EC_ProxyPushSupplier_Set - * object. + * object. * * <H2>Locking</H2> * No provisions for locking, access must be serialized externally. @@ -60,11 +60,11 @@ public: // = The RtecEventChannelAdmin::ConsumerAdmin methods... virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_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 654bb82e8e8..0d0a8be8ed3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp @@ -30,14 +30,14 @@ TAO_EC_ConsumerControl::shutdown (void) void TAO_EC_ConsumerControl::consumer_not_exist (TAO_EC_ProxyPushSupplier * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ConsumerControl::system_exception (TAO_EC_ProxyPushSupplier *, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h index 1af9cbbfe63..1d39d13cf24 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h @@ -56,12 +56,12 @@ public: * reclaim all the resources attached to that object. */ virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 dce14cd6423..97b182299fe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp @@ -59,14 +59,14 @@ TAO_EC_Disjunction_Filter::size (void) const int TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -77,14 +77,14 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -95,19 +95,19 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Disjunction_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -157,7 +157,7 @@ int TAO_EC_Disjunction_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 02e2752af51..e450d1c4a8c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h @@ -52,22 +52,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_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 b1195799e0e..71f099ef2f3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp @@ -34,9 +34,9 @@ TAO_EC_Reactive_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->reactive_push_to_consumer (consumer, event TAO_ENV_ARG_PARAMETER); + proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER); } void @@ -44,7 +44,7 @@ TAO_EC_Reactive_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->reactive_push_to_consumer (consumer, event TAO_ENV_ARG_PARAMETER); + proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h index 9ed29c5a12d..3aa53499fd4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h @@ -64,12 +64,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; }; // **************************************************************** @@ -96,12 +96,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_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 79303ce3ebb..cb0a9a28d24 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + int result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Message_Block::release (mb); @@ -64,7 +64,7 @@ void TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Shutdown_Task_Command::execute (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL) { this->proxy_->push_to_consumer (this->consumer_.in (), this->event_ - TAO_ENV_ARG_PARAMETER); + ACE_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 dd2cd77fc51..21f03a332c4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -59,7 +59,7 @@ public: virtual void push (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// An per-task allocator @@ -88,7 +88,7 @@ public: virtual ~TAO_EC_Dispatch_Command (void); /// Command callback - virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) = 0; + virtual int execute (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); }; // **************************************************************** @@ -119,7 +119,7 @@ public: virtual ~TAO_EC_Push_Command (void); /// Command callback - virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (ACE_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 94e1737e919..24c4a9ab38a 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Event_Channel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->dispatching_->activate (); this->timeout_generator_->activate (); @@ -110,7 +110,7 @@ TAO_EC_Event_Channel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_EC_Event_Channel::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Event_Channel::shutdown (ACE_ENV_SINGLE_ARG_DECL) { this->dispatching_->shutdown (); this->timeout_generator_->shutdown (); @@ -118,144 +118,144 @@ TAO_EC_Event_Channel::shutdown (TAO_ENV_SINGLE_ARG_DECL) this->consumer_control_->shutdown (); PortableServer::POA_var consumer_poa = - this->consumer_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (this->consumer_admin_ TAO_ENV_ARG_PARAMETER); + consumer_poa->servant_to_id (this->consumer_admin_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER); + consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var supplier_poa = - this->supplier_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var supplier_id = - supplier_poa->servant_to_id (this->supplier_admin_ TAO_ENV_ARG_PARAMETER); + supplier_poa->servant_to_id (this->supplier_admin_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER); + supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->peer_connected (consumer TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->peer_connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->peer_reconnected (consumer TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->peer_reconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->peer_disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->peer_disconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->disconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->peer_connected (supplier TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->peer_connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->peer_reconnected (supplier TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->peer_reconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->peer_disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->peer_disconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->disconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_EC_Event_Channel::for_consumers (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Event_Channel::for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->consumer_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } RtecEventChannelAdmin::SupplierAdmin_ptr -TAO_EC_Event_Channel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Event_Channel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->supplier_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_EC_Event_Channel::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Event_Channel::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } RtecEventChannelAdmin::Observer_Handle TAO_EC_Event_Channel::append_observer ( RtecEventChannelAdmin::Observer_ptr observer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { - return this->observer_strategy_->append_observer (observer TAO_ENV_ARG_PARAMETER); + return this->observer_strategy_->append_observer (observer ACE_ENV_ARG_PARAMETER); } void TAO_EC_Event_Channel::remove_observer ( RtecEventChannelAdmin::Observer_Handle handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { - this->observer_strategy_->remove_observer (handle TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->remove_observer (handle ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h index e731eb6fb4e..b095cfaebe9 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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Shutdown any internal threads, cleanup all the internal /// structures, flush all the messages, etc. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Access the dispatching module.... TAO_EC_Dispatching* dispatching (void) const; @@ -188,20 +188,20 @@ public: /// Used to inform the EC that a Consumer has connected or /// disconnected from it. virtual void connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + /// this->consumer_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (TAO_ENV_SINGLE_ARG_DECL) + for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// The default implementation is: - /// this->supplier_admin ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + /// this->supplier_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (TAO_ENV_SINGLE_ARG_DECL) + for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Commit suicide. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_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 f2e738b5b2b..aebd91da40b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp @@ -38,7 +38,7 @@ TAO_EC_Filter::size (void) const void TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); @@ -49,11 +49,11 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -61,11 +61,11 @@ TAO_EC_Null_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Null_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -73,19 +73,19 @@ TAO_EC_Null_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Null_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Null_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -113,7 +113,7 @@ int TAO_EC_Null_Filter::add_dependencies ( const RtecEventComm::EventHeader &, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 a9d6c03e718..a3cb7a22850 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h @@ -86,10 +86,10 @@ public: */ virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /** * This is called by the children when they accept an event and @@ -99,10 +99,10 @@ public: */ virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Clear any saved state, must reset and assume no events have been /// received. @@ -134,7 +134,7 @@ public: */ virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /** * Obtain the QOS information for this filter, the default @@ -143,7 +143,7 @@ public: * Returns 0 on success and -1 on failure */ virtual void get_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// The parent... @@ -175,22 +175,22 @@ public: // TAO_EC_Filter. virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp index fdb29f3ccbb..8b8cc5ddbe7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp @@ -23,7 +23,7 @@ TAO_EC_Filter* TAO_EC_Null_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *, RtecEventChannelAdmin::ConsumerQOS& - TAO_ENV_ARG_DECL_NOT_USED) const + ACE_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 7a81a583244..d267399000a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h @@ -47,7 +47,7 @@ public: virtual TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const = 0; + ACE_ENV_ARG_DECL) const = 0; }; @@ -72,7 +72,7 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp index 87f78dfc03f..ef141efbfb1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -70,17 +70,17 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - this->init_i (rmt_ec, lcl_ec TAO_ENV_ARG_PARAMETER); + this->init_i (rmt_ec, lcl_ec ACE_ENV_ARG_PARAMETER); } void TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecEventChannelAdmin::EventChannel_ptr lcl_ec - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Gateway_IIOP::close (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Gateway_IIOP::close_i (ACE_ENV_SINGLE_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); @@ -116,7 +116,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) continue; ACE_TRY { - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -132,7 +132,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) if (!CORBA::is_nil (this->default_consumer_proxy_.in ())) { - this->default_consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->default_consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->default_consumer_proxy_ = @@ -141,7 +141,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) if (!CORBA::is_nil (this->supplier_proxy_.in ())) { - this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -152,7 +152,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_EC_Gateway_IIOP::update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& c_qos - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->update_consumer_i (c_qos ACE_ENV_ARG_PARAMETER); } void TAO_EC_Gateway_IIOP::update_consumer_i ( const RtecEventChannelAdmin::ConsumerQOS& c_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close_i (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lcl_ec_->for_suppliers (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy = supplier_admin->obtain_push_consumer (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // For each subscription by source build the set of publications @@ -281,7 +281,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // ACE_SupplierQOS_Factory::debug (pub); (*j).int_id_->connect_push_supplier (supplier_ref.in (), pub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -316,12 +316,12 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // Obtain a reference to our supplier personality... RtecEventComm::PushSupplier_var supplier_ref = - this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Obtain the consumer.... this->default_consumer_proxy_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; pub.publications.length (c); @@ -329,23 +329,23 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // ACE_SupplierQOS_Factory::debug (pub); this->default_consumer_proxy_->connect_push_supplier (supplier_ref.in (), pub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->rmt_ec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->rmt_ec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_is_active_ = 1; RtecEventComm::PushConsumer_var consumer_ref = - this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Consumer ")); @@ -353,7 +353,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( this->supplier_proxy_->connect_push_consumer (consumer_ref.in (), sub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -361,14 +361,14 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( void TAO_EC_Gateway_IIOP::update_supplier ( const RtecEventChannelAdmin::SupplierQOS& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing... } void -TAO_EC_Gateway_IIOP::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Gateway_IIOP::disconnect_push_consumer (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_EC_Gateway_IIOP::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Gateway_IIOP::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { // ACE_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier received " @@ -385,7 +385,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + proxy->push (out ACE_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_ TAO_ENV_ARG_PARAMETER); + this->update_consumer_i (this->c_qos_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -449,22 +449,22 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events } int -TAO_EC_Gateway_IIOP::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Gateway_IIOP::shutdown (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); - this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (this->supplier_is_active_) { PortableServer::POA_var poa = - this->supplier_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->supplier_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&this->supplier_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->supplier_is_active_ = 0; } @@ -472,12 +472,12 @@ TAO_EC_Gateway_IIOP::shutdown (TAO_ENV_SINGLE_ARG_DECL) if (this->consumer_is_active_) { PortableServer::POA_var poa = - this->consumer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->consumer_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&this->consumer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_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 35f630050e1..19f97e9268e 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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0; + virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0; /// Obtain and modify the observer handle. void observer_handle (RtecEventChannelAdmin::Observer_Handle h); @@ -100,42 +100,42 @@ public: /// ECs it will connect to, void init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecEventChannelAdmin::EventChannel_ptr lcl_ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// The channel is disconnecting. - void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// The channel is disconnecting. - void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void disconnect_push_consumer (ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect and shutdown the gateway - int shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // The following methods are documented in the base class. - virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: - void close_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void close_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// Do the real work in init() void init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecEventChannelAdmin::EventChannel_ptr lcl_ec - TAO_ENV_ARG_DECL); + ACE_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 a4baa6b4b42..879701a3ee7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -21,11 +21,11 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecScheduler::Scheduler_ptr lcl_sched, const char* lcl_name, const char* rmt_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - this->init_i (rmt_ec, lcl_ec TAO_ENV_ARG_PARAMETER); + this->init_i (rmt_ec, lcl_ec ACE_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 TAO_ENV_ARG_PARAMETER); + rmt_sched->create (rmt_name ACE_ENV_ARG_PARAMETER); ACE_CHECK; // @@ TODO Many things are hard-coded in the RT_Info here. @@ -54,11 +54,11 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, time, 0, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->lcl_info_ = - lcl_sched->create (lcl_name TAO_ENV_ARG_PARAMETER); + lcl_sched->create (lcl_name ACE_ENV_ARG_PARAMETER); ACE_CHECK; tv = ACE_Time_Value (0, 500); @@ -71,6 +71,6 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, time, 1, RtecScheduler::REMOTE_DEPENDANT - TAO_ENV_ARG_PARAMETER); + ACE_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 d93e98634de..2452c13b8b7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h @@ -48,7 +48,7 @@ public: RtecScheduler::Scheduler_ptr lcl_sched, const char* lcl_name, const char* rmt_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_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 7b447516105..544bf3a1891 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp @@ -197,7 +197,7 @@ TAO_ECG_UDP_Request_Entry::fragment_buffer (CORBA::ULong fragment_offset) void TAO_ECG_UDP_Request_Entry::decode (RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_InputCDR cdr (&this->payload_, ACE_static_cast(int,this->byte_order_)); @@ -234,7 +234,7 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, ACE_Reactor *reactor, const ACE_Time_Value &expire_interval, int max_timeout - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { this->ignore_from_ = ignore_from; @@ -258,13 +258,13 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, void TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (CORBA::is_nil (this->lcl_ec_.in ())) return; if (!CORBA::is_nil (this->consumer_proxy_.in ())) - this->close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (pub.publications.length () == 0) @@ -272,15 +272,15 @@ 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lcl_ec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushSupplier_var supplier_ref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Receiver (%t) Gateway/Supplier ")); @@ -288,35 +288,35 @@ TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub this->consumer_proxy_->connect_push_supplier (supplier_ref.in (), pub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Receiver::close (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_UDP_Receiver::close (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Receiver::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ECG_UDP_Receiver::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -325,9 +325,9 @@ TAO_ECG_UDP_Receiver::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED } void -TAO_ECG_UDP_Receiver::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_UDP_Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil (); @@ -511,14 +511,14 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) return 0; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { RtecEventComm::EventSet event; - entry->int_id_->decode (event TAO_ENV_ARG_PARAMETER); + entry->int_id_->decode (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER); + this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, @@ -539,9 +539,9 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->addr_server_->get_addr (header, addr TAO_ENV_ARG_PARAMETER); + this->addr_server_->get_addr (header, addr ACE_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 ca2b9d534a3..c854a6abbd5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h @@ -201,7 +201,7 @@ public: /// Decode the events, the message must be complete. void decode (RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Increment the timeout counter... void inc_timeout (void); @@ -299,17 +299,17 @@ public: ACE_Reactor *reactor, const ACE_Time_Value &expire_interval, int max_timeout - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect and shutdown the gateway, no further connectsions - void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Connect to the EC using the given publications lists. void open (RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect to the EC. - virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /** * The Event_Handlers call this method when data is available at the @@ -324,13 +324,13 @@ public: const void* act); // The PushSupplier method. - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void disconnect_push_supplier (ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_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_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp index 40323210aa1..5463f77f0c1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp @@ -14,7 +14,7 @@ void TAO_EC_Group_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *, TAO_EC_ProxyPushConsumer * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -22,12 +22,12 @@ void TAO_EC_Group_Scheduling::schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_QOS_Info event_info; // @@ yuck... filter->push_scheduled_event (ACE_const_cast (RtecEventComm::EventSet&, event), event_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h index dc2eeb96d49..0b7b6f318be 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h @@ -37,11 +37,11 @@ public: virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Group_Scheduling diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index 9106c478843..a93cd3cf893 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -68,10 +68,10 @@ TAO_EC_MT_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventComm::EventSet event_copy = event; - this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER); + this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -79,11 +79,11 @@ TAO_EC_MT_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Double checked locking.... if (this->active_ == 0) this->activate (); - this->task_.push (proxy, consumer, event TAO_ENV_ARG_PARAMETER); + this->task_.push (proxy, consumer, event ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h index 97165aecb7b..43d1db1820d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h @@ -52,12 +52,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 627c32801f0..5b9cf65242b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp @@ -45,7 +45,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -65,7 +65,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -85,14 +85,14 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Masked_Type_Filter::push (const RtecEventComm::EventSet &, TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Masked_Type_Filter::push_nocopy (RtecEventComm::EventSet &, TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -122,7 +122,7 @@ int TAO_EC_Masked_Type_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 6a2b6d12317..d28bb93cdcb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h @@ -53,22 +53,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_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 bed3ab7655b..eb79fe48cd5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -41,14 +41,14 @@ TAO_EC_Negation_Filter::size (void) const int TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int n = - this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->parent () != 0 && n == 0) { - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -57,14 +57,14 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int n = - this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->parent () != 0 && n == 0) { - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -73,14 +73,14 @@ TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Negation_Filter::push (const RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Negation_Filter::push_nocopy (RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -107,7 +107,7 @@ int TAO_EC_Negation_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 caee63f3b70..f23700ef739 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h @@ -51,22 +51,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_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 5c78bc13fbf..d99b8ae69ea 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp @@ -14,7 +14,7 @@ void TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *, TAO_EC_ProxyPushConsumer * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -22,7 +22,7 @@ void TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (CORBA::ULong j = 0; j < event.length (); ++j) { @@ -33,7 +33,7 @@ TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info event_info; filter->push_scheduled_event (single_event, event_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h index afcb63f7a0b..6ea335511d0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h @@ -38,11 +38,11 @@ public: virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL); + ACE_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 6ea6950d196..777b034a758 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -25,7 +25,7 @@ TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void) RtecEventChannelAdmin::Observer_Handle TAO_EC_Null_ObserverStrategy::append_observer ( RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -39,7 +39,7 @@ TAO_EC_Null_ObserverStrategy::append_observer ( void TAO_EC_Null_ObserverStrategy::remove_observer ( RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -50,25 +50,25 @@ TAO_EC_Null_ObserverStrategy::remove_observer ( void TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -83,7 +83,7 @@ TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void) RtecEventChannelAdmin::Observer_Handle TAO_EC_Basic_ObserverStrategy::append_observer ( RtecEventChannelAdmin::Observer_ptr obs - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - obs->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + obs->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - obs->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + obs->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->handle_generator_; @@ -124,7 +124,7 @@ TAO_EC_Basic_ObserverStrategy::append_observer ( void TAO_EC_Basic_ObserverStrategy::remove_observer ( RtecEventChannelAdmin::Observer_Handle handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -142,13 +142,13 @@ TAO_EC_Basic_ObserverStrategy::remove_observer ( void TAO_EC_Basic_ObserverStrategy::connected ( TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (consumer->publications ().is_gateway) return; RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -176,7 +176,7 @@ TAO_EC_Basic_ObserverStrategy::connected ( for (int i = 0; i != size; ++i) { - copy[i]->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -184,13 +184,13 @@ TAO_EC_Basic_ObserverStrategy::connected ( void TAO_EC_Basic_ObserverStrategy::disconnected ( TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (consumer->publications ().is_gateway) return; RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -218,7 +218,7 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( for (int i = 0; i != size; ++i) { - copy[i]->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -226,13 +226,13 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( void TAO_EC_Basic_ObserverStrategy::connected ( TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (supplier->subscriptions ().is_gateway) return; RtecEventChannelAdmin::ConsumerQOS c_qos; - this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -260,7 +260,7 @@ TAO_EC_Basic_ObserverStrategy::connected ( for (int i = 0; i != size; ++i) { - copy[i]->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -268,13 +268,13 @@ TAO_EC_Basic_ObserverStrategy::connected ( void TAO_EC_Basic_ObserverStrategy::disconnected ( TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (supplier->subscriptions ().is_gateway) return; RtecEventChannelAdmin::ConsumerQOS c_qos; - this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -302,7 +302,7 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( for (int i = 0; i != size; ++i) { - copy[i]->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -310,12 +310,12 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( void TAO_EC_Basic_ObserverStrategy::fill_qos ( RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Headers headers; TAO_EC_Accumulate_Supplier_Headers worker (headers); - this->event_channel_->consumer_admin ()->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->event_channel_->consumer_admin ()->for_each (&worker ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::DependencySet& dep = qos.dependencies; @@ -337,13 +337,13 @@ TAO_EC_Basic_ObserverStrategy::fill_qos ( void TAO_EC_Basic_ObserverStrategy::fill_qos ( RtecEventChannelAdmin::SupplierQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Headers headers; TAO_EC_Accumulate_Consumer_Headers worker (headers); this->event_channel_->supplier_admin ()->for_each (&worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; qos.publications.length (headers.current_size ()); @@ -359,7 +359,7 @@ TAO_EC_Basic_ObserverStrategy::fill_qos ( void TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { const RtecEventChannelAdmin::ConsumerQOS& sub = supplier->subscriptions (); @@ -381,7 +381,7 @@ TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier void TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 1949b1047e9..c36f80e24a0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h @@ -55,7 +55,7 @@ public: /// The basic methods to support the EC strategies. virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -63,7 +63,7 @@ public: = 0; virtual void remove_observer ( RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -73,16 +73,16 @@ public: /// Used by the EC to inform the ObserverStrategy that a Consumer has /// connected or disconnected from it. virtual void connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; virtual void disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_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* - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; virtual void disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; }; // **************************************************************** @@ -104,26 +104,26 @@ public: // = The TAO_EC_ObserverStrategy methods. virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer ( RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); virtual void connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); }; // **************************************************************** @@ -156,26 +156,26 @@ public: // = The TAO_EC_ObserverStrategy methods. virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer ( RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); virtual void connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); struct Observer_Entry @@ -223,9 +223,9 @@ public: protected: /// Helper functions to compute the consumer and supplier QOS. void fill_qos (RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void fill_qos (RtecEventChannelAdmin::SupplierQOS &qos - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// The event channel. @@ -251,7 +251,7 @@ public: TAO_EC_Accumulate_Supplier_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers); virtual void work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_EC_Basic_ObserverStrategy::Headers &headers_; @@ -266,7 +266,7 @@ public: TAO_EC_Accumulate_Consumer_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers); virtual void work (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_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 59415cd120a..2b7fa9d3bba 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -72,7 +72,7 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer) void TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->collection_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; return; } @@ -110,7 +110,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier void TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -131,47 +131,47 @@ 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 TAO_ENV_ARG_PARAMETER); + this->collection_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; return; } } - this->collection_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->collection_->disconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->collection_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->collection_->disconnected (supplier ACE_ENV_ARG_PARAMETER); } void -TAO_EC_Per_Supplier_Filter::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Per_Supplier_Filter::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->collection_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } void TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy* scheduling_strategy = this->event_channel_->scheduling_strategy (); scheduling_strategy->schedule_event (event, consumer, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_EC_Per_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Filter_Worker worker (event, event_info); - this->collection_->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER); } CORBA::ULong diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h index 3c66a711b74..cc6d6f8f785 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h @@ -51,18 +51,18 @@ public: virtual void bind (TAO_EC_ProxyPushConsumer* consumer); virtual void unbind (TAO_EC_ProxyPushConsumer* consumer); virtual void connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); 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 4a4296b9e19..ed97744f809 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -25,7 +25,7 @@ TAO_EC_Filter* TAO_EC_Prefix_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) const + ACE_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 9622fb15350..8532908b13b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h @@ -46,7 +46,7 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const; + ACE_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 6f31edc67ae..2d7a359b555 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); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_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 TAO_ENV_ARG_PARAMETER); + this->scheduler_->create (buf ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->scheduler_->set (rt_info, @@ -64,7 +64,7 @@ TAO_EC_Priority_Dispatching::activate (void) 0, // quantum 1, // threads RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -113,10 +113,10 @@ TAO_EC_Priority_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventComm::EventSet event_copy = event; - this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER); + this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -124,7 +124,7 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->tasks_[i]->push (proxy, consumer, event ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h index f8b78ed2c78..ab0b8acf7e0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h @@ -60,12 +60,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 68aab6c9f9c..d57458dac62 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -20,7 +20,7 @@ void TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "add_proxy_supplier_dependencies - %x %x\n", supplier, consumer)); @@ -40,11 +40,11 @@ TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies ( os_priority, p_subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; qos_info.preemption_priority = p_priority; - supplier->add_dependencies (header, qos_info TAO_ENV_ARG_PARAMETER); + supplier->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -53,7 +53,7 @@ void TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierQOS qos = consumer->publications (); @@ -84,13 +84,13 @@ TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event os_priority, p_subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; qos_info.preemption_priority = p_priority; } filter->push_scheduled_event (single_event, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h index 1bce35148a8..c0ac5d9668d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h @@ -45,11 +45,11 @@ public: virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Priority_Scheduling @@ -58,7 +58,7 @@ private: (const TAO_EC_Priority_Scheduling&)) /// Initialize our RT_Info handle and dependencies - void init_rt_info (TAO_ENV_SINGLE_ARG_DECL); + void init_rt_info (ACE_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 e8ac866557a..15c63c16b4c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp @@ -39,7 +39,7 @@ TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer (void) CORBA::Boolean TAO_EC_ProxyPushConsumer::supplier_non_existent ( CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var supplier; { @@ -62,7 +62,7 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return supplier->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -70,7 +70,7 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent ( void TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + ace_mon.filter->connected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + ace_mon.filter->reconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + ace_mon.filter->disconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) { RtecEventComm::PushSupplier_var supplier; @@ -144,14 +144,14 @@ TAO_EC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) if (this->filter_ != 0) { - this->filter_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->cleanup_i (); } } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -159,7 +159,7 @@ TAO_EC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect_push_supplier (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushConsumer::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_var result; ACE_TRY { result = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -205,17 +205,17 @@ TAO_EC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_EC_ProxyPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -254,7 +254,7 @@ void TAO_EC_ProxyPushConsumer::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -311,12 +311,12 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier ( } // Notify the event channel... - this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_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, this TAO_ENV_ARG_PARAMETER); + ace_mon.filter->push (event, this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_ProxyPushConsumer::disconnect_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect_push_supplier (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_EC_ProxyPushConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_EC_ProxyPushConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushConsumer::_remove_ref (ACE_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 902912a2183..10159ac8bd6 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 (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - void deactivate (TAO_ENV_SINGLE_ARG_DECL); + void deactivate (ACE_ENV_SINGLE_ARG_DECL); /// Return 0 if no supplier is connected... CORBA::Boolean is_connected (void) const; @@ -83,28 +83,28 @@ public: * <disconnected> flag. */ CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Usually implemented as no-ops, but some configurations may /// require this methods. virtual void connected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); /// The QoS (subscription) used to connect to the EC, assumes the /// locks are held, use with care! @@ -118,19 +118,19 @@ public: virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)); virtual void push (const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The Servant methods - 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); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (ACE_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 6ceb4cf2028..be322c6c6a7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -39,54 +39,54 @@ TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void) void TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy *s = this->event_channel_->scheduling_strategy (); s->add_proxy_supplier_dependencies (this, consumer - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy *s = this->event_channel_->scheduling_strategy (); s->add_proxy_supplier_dependencies (this, consumer - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushSupplier::shutdown (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) this->cleanup_i (); } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer.in ())) @@ -114,7 +114,7 @@ TAO_EC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushSupplier::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushSupplier_var result; ACE_TRY { result = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -157,17 +157,17 @@ TAO_EC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_EC_ProxyPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()) +TAO_EC_ProxyPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -206,7 +206,7 @@ void TAO_EC_ProxyPushSupplier::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)) @@ -236,7 +236,7 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer ( this->child_ = this->event_channel_->filter_builder ()->build (this, this->qos_ - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -272,19 +272,19 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer ( this->child_ = this->event_channel_->filter_builder ()->build (this, this->qos_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->adopt_child (this->child_); } // Notify the event channel... - this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushSupplier::disconnect_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!connected) @@ -317,7 +317,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier ( { ACE_TRY { - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX ( @@ -345,7 +345,7 @@ TAO_EC_ProxyPushSupplier::suspend_connection (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_EC_ProxyPushSupplier::resume_connection (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX ( @@ -362,7 +362,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return result; @@ -388,7 +388,7 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event, int TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return result; @@ -414,7 +414,7 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // The mutex is already held by the caller (usually the filter() // method) @@ -450,7 +450,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, consumer.in (), event, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -461,7 +461,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, void TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // The mutex is already held by the caller (usually the filter() // method) @@ -496,7 +496,7 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event, consumer.in (), event, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -508,7 +508,7 @@ void TAO_EC_ProxyPushSupplier::push_to_consumer ( RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { { ACE_GUARD_THROW_EX ( @@ -525,7 +525,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer ( ACE_TRY { - consumer->push (event TAO_ENV_ARG_PARAMETER); + consumer->push (event ACE_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 TAO_ENV_ARG_PARAMETER); + control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -562,7 +562,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer ( control->system_exception (this, sysex - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -577,11 +577,11 @@ void TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - consumer->push (event TAO_ENV_ARG_PARAMETER); + consumer->push (event ACE_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 TAO_ENV_ARG_PARAMETER); + control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -599,7 +599,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( control->system_exception (this, sysex - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_CATCHANY @@ -612,7 +612,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( CORBA::Boolean TAO_EC_ProxyPushSupplier::consumer_non_existent ( CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + return consumer->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -670,7 +670,7 @@ int TAO_EC_ProxyPushSupplier::add_dependencies ( const RtecEventComm::EventHeader &header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -679,23 +679,23 @@ TAO_EC_ProxyPushSupplier::add_dependencies ( return this->child_->add_dependencies (header, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_EC_ProxyPushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_EC_ProxyPushSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_EC_ProxyPushSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushSupplier::_remove_ref (ACE_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 7a74c6c5c83..13c6b12a2d5 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 (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()); + virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()); /// Return 0 if no consumer is connected... CORBA::Boolean is_connected (void) const; @@ -85,32 +85,32 @@ public: /// Concrete implementations can use this methods to keep track of /// the suppliers that publish its events. virtual void connected (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Usually implemented as no-ops, but some configurations may /// require this methods. virtual void connected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void reactive_push_to_consumer (RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Invoke the _non_existent() pseudo-operation on the consumer. If @@ -118,21 +118,21 @@ public: * <disconnected> flag. */ CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // = The RtecEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Increment and decrement the reference count. @@ -142,27 +142,27 @@ public: // = The TAO_EC_Filter methods, only push() is implemented... virtual int filter (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // = The Servant methods - 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); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL); protected: /// Set the consumer, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp index 8599a2632bc..7ab7c5e6e20 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp @@ -72,10 +72,10 @@ TAO_EC_RTCORBA_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventComm::EventSet event_copy = event; - this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER); + this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -83,10 +83,10 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RTCORBA::Priority current_priority = - this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; i != this->lanes_.length (); ++i) @@ -98,7 +98,7 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, // some... this->tasks_[i].push (proxy, consumer, event - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; break; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h index ab75cb13e33..e5d4508c2b6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h @@ -51,12 +51,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// The thread pools... diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp index ffeaf1d754f..28e88b335ec 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp @@ -49,17 +49,17 @@ TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel *) int argc = 0; CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + CORBA::Object_var obj = orb->resolve_initial_references ("PriorityMappingManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMappingManager_var priority_mapping_manager = RTCORBA::PriorityMappingManager::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMapping *priority_mapping = @@ -67,10 +67,10 @@ TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel *) obj = orb->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); RTCORBA::Current_var current = RTCORBA::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_NEW_RETURN (dispatching, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index f7e4467928a..659e6f0250b 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 ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { TAO_EC_Ping_Consumer worker (this); this->event_channel_->consumer_admin ()->for_each (&worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -56,26 +56,26 @@ TAO_EC_Reactive_ConsumerControl::handle_timeout ( CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Query the state of the consumers... - this->query_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -102,12 +102,12 @@ TAO_EC_Reactive_ConsumerControl::activate (void) // Get the PolicyCurrent object CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -122,7 +122,7 @@ TAO_EC_Reactive_ConsumerControl::activate (void) this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -145,14 +145,14 @@ TAO_EC_Reactive_ConsumerControl::shutdown (void) void TAO_EC_Reactive_ConsumerControl::consumer_not_exist ( TAO_EC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { //ACE_DEBUG ((LM_DEBUG, // "EC_Reactive_ConsumerControl(%P|%t) - " // "Consumer %x does not exists\n", long(proxy))); - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -168,7 +168,7 @@ void TAO_EC_Reactive_ConsumerControl::system_exception ( TAO_EC_ProxyPushSupplier *proxy, CORBA::SystemException & /* exception */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -182,7 +182,7 @@ TAO_EC_Reactive_ConsumerControl::system_exception ( // return; // Anything else is serious, including timeouts... - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -213,24 +213,24 @@ TAO_EC_ConsumerControl_Adapter::handle_timeout ( void TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = supplier->consumer_non_existent (disconnected - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -238,7 +238,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 TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_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 eddff6b86c9..7c363bf9876 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h @@ -81,15 +81,15 @@ public: virtual int activate (void); virtual int shutdown (void); virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + void query_consumers (ACE_ENV_SINGLE_ARG_DECL); private: /// The polling rate @@ -122,7 +122,7 @@ public: TAO_EC_Ping_Consumer (TAO_EC_ConsumerControl *control); virtual void work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_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 4104bcca997..bfb106ef3e3 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 ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { TAO_EC_Ping_Supplier worker (this); this->event_channel_->supplier_admin ()->for_each (&worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -56,26 +56,26 @@ TAO_EC_Reactive_SupplierControl::handle_timeout ( CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Query the state of the suppliers... - this->query_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -102,12 +102,12 @@ TAO_EC_Reactive_SupplierControl::activate (void) // Get the PolicyCurrent object CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -122,7 +122,7 @@ TAO_EC_Reactive_SupplierControl::activate (void) this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -145,14 +145,14 @@ TAO_EC_Reactive_SupplierControl::shutdown (void) void TAO_EC_Reactive_SupplierControl::supplier_not_exist ( TAO_EC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { //ACE_DEBUG ((LM_DEBUG, // "EC_Reactive_SupplierControl(%P|%t) - " // "Consumer %x does not exists\n", long(proxy))); - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -166,7 +166,7 @@ void TAO_EC_Reactive_SupplierControl::system_exception ( TAO_EC_ProxyPushConsumer *proxy, CORBA::SystemException & /* exception */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -180,7 +180,7 @@ TAO_EC_Reactive_SupplierControl::system_exception ( // return; // Anything else is serious, including timeouts... - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -211,24 +211,24 @@ TAO_EC_SupplierControl_Adapter::handle_timeout ( void TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = consumer->supplier_non_existent (disconnected - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -236,7 +236,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 TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_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 ef97e4677df..3eafb702595 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h @@ -81,15 +81,15 @@ public: virtual int activate (void); virtual int shutdown (void); virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void system_exception (TAO_EC_ProxyPushConsumer *proxy, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + void query_suppliers (ACE_ENV_SINGLE_ARG_DECL); private: /// The polling rate @@ -122,7 +122,7 @@ public: TAO_EC_Ping_Supplier (TAO_EC_SupplierControl *control); virtual void work (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_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 6306943ef3f..7391d41bd8c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -56,25 +56,25 @@ TAO_EC_Sched_Filter::size (void) const int TAO_EC_Sched_Filter::filter (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - return this->body_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->body_->filter (event, qos_info ACE_ENV_ARG_PARAMETER); } int TAO_EC_Sched_Filter::filter_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - return this->body_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->body_->filter_nocopy (event, qos_info ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; qos_info.rt_info = this->rt_info_; @@ -94,7 +94,7 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info os_priority, p_subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; qos_info.preemption_priority = p_priority; } @@ -104,14 +104,14 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) { - this->compute_qos_info (qos_info TAO_ENV_ARG_PARAMETER); + this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -119,14 +119,14 @@ TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event, void TAO_EC_Sched_Filter::push_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) { - this->compute_qos_info (qos_info TAO_ENV_ARG_PARAMETER); + this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -152,25 +152,25 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); int matches = this->body_->add_dependencies (header, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::RT_Info_var info = - this->scheduler_->get (qos_info.rt_info TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (qos_info.rt_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), @@ -180,7 +180,7 @@ 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 TAO_ENV_ARG_PARAMETER); + (*i)->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 0; @@ -188,16 +188,16 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header, void TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; qos_info.rt_info = this->rt_info_; } void -TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL) { if (this->rt_info_computed_) return; @@ -214,7 +214,7 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) 0, // quantum 0, // threads this->info_type_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; #if 0 @@ -224,17 +224,17 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) TAO_EC_Filter* filter = *i; TAO_EC_QOS_Info child; - filter->get_qos_info (child TAO_ENV_ARG_PARAMETER); + filter->get_qos_info (child ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->scheduler_->add_dependency (this->rt_info_, child.rt_info, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (child.rt_info TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (child.rt_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), @@ -250,11 +250,11 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) this->body_info_, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (this->body_info_ TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (this->body_info_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), @@ -267,11 +267,11 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) this->rt_info_, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (this->parent_info_ TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (this->parent_info_ ACE_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 69accbb1460..79c214263cf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h @@ -64,24 +64,24 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void get_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + void init_rt_info (ACE_ENV_SINGLE_ARG_DECL); /// Compute a new qos_info to push up. void compute_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 5f81a9b265a..593fdc01afd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -23,25 +23,25 @@ TAO_EC_Filter* TAO_EC_Sched_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const + ACE_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 () TAO_ENV_ARG_PARAMETER); + RtecScheduler::Scheduler::_narrow (tmp.in () ACE_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" TAO_ENV_ARG_PARAMETER); + scheduler->lookup ("Dispatching_Task-250000.us" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->recursive_build (supplier, qos, pos, scheduler.in (), parent_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_EC_Filter* @@ -51,7 +51,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, RtecScheduler::handle_t parent_info - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { const RtecEventComm::Event& e = qos.dependencies[pos].event; @@ -61,11 +61,11 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( ACE_CString name; this->recursive_name (qos, npos, scheduler, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::handle_t rt_info = - scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); + scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); pos++; // Consume the designator @@ -78,7 +78,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( children[i] = this->recursive_build (supplier, qos, pos, scheduler, rt_info - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_PARAMETER); + filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER); // @@ ACE_CHECK_RETURN (0); return filter; @@ -106,11 +106,11 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( ACE_CString name; this->recursive_name (qos, npos, scheduler, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::handle_t rt_info = - scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); + scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); pos++; // Consume the designator @@ -123,7 +123,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( children[i] = this->recursive_build (supplier, qos, pos, scheduler, rt_info - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_PARAMETER); + filter->get_qos_info (qos_info ACE_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 () TAO_ENV_ARG_PARAMETER); + scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Convert the time to the proper units.... @@ -179,14 +179,14 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( 0, // quantum 1, // threads RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); scheduler->add_dependency (qos_info.rt_info, parent_info, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_PARAMETER); + scheduler->get (body_info ACE_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 () TAO_ENV_ARG_PARAMETER); + scheduler->create (name.c_str () ACE_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 TAO_ENV_ARG_PARAMETER); + filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER); // @@ ACE_CHECK_RETURN (0); return filter; @@ -234,7 +234,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, ACE_CString& name - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { const RtecEventComm::Event& e = qos.dependencies[pos].event; @@ -249,7 +249,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( this->recursive_name (qos, pos, scheduler, child_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (i == 0) @@ -274,7 +274,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( this->recursive_name (qos, pos, scheduler, child_name - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_PARAMETER); + scheduler->get (body_info ACE_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 138c02e7d04..6a3f89b5922 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h @@ -48,7 +48,7 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; private: /// Recursively build the filter tree. @@ -57,14 +57,14 @@ private: CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, RtecScheduler::handle_t parent_info - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; /// Build the name recursively... void recursive_name (RtecEventChannelAdmin::ConsumerQOS& qos, CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, ACE_CString &name - TAO_ENV_ARG_DECL) const; + ACE_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 041b592542c..6cf200b1d79 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h @@ -49,14 +49,14 @@ public: virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Schedule an event set and deliver them to the filter in the /// desired order and grouping. virtual void schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; }; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index b58780478d0..f01244e6b09 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obtain (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_EC_SupplierAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_SupplierAdmin::_default_POA (ACE_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 73e32e18315..a2258add619 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_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 f80673b22f0..5e93d9f680b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp @@ -30,7 +30,7 @@ TAO_EC_SupplierControl::shutdown (void) void TAO_EC_SupplierControl::supplier_not_exist (TAO_EC_ProxyPushConsumer * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h index 8c1594f11c5..67ee778ea2f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h @@ -56,7 +56,7 @@ public: * CORBA::OBJECT_NOT_EXIST exception has been raised). */ virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 180cf20432c..9267b8c4bbd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp @@ -18,8 +18,8 @@ TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void) void TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_QOS_Info qos_info = this->event_info_; - supplier->filter (this->event_, qos_info TAO_ENV_ARG_PARAMETER); + supplier->filter (this->event_, qos_info ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h index 890f916d85d..0454161f24d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h @@ -90,26 +90,26 @@ public: /// Concrete implementations can use this methods to keep track of /// the consumers interested in this events. virtual void connected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// The event channel is shutting down. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0; /// The ProxyPushConsumer delegates on this class to actually send /// the event. virtual void push (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Events are first scheduled by the TAO_EC_Scheduling_Strategy, /// and then pushed through this class again. virtual void push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Increment and decrement the reference count, locking must be /// provided by the user. @@ -126,7 +126,7 @@ public: const TAO_EC_QOS_Info &event_info); virtual void work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_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 0753bd74bcc..1a356171387 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -66,25 +66,25 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { qos_info.timer_id_ = this->id_; if (this->supplier_ != 0) this->supplier_->filter (event, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } int TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (qos_info.timer_id_ == this->id_ && this->parent () != 0) { - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -94,12 +94,12 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (qos_info.timer_id_ == this->id_ && this->parent () != 0) { - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -109,14 +109,14 @@ TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event, void TAO_EC_Timeout_Filter::push (const RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Timeout_Filter::push_nocopy (RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -159,7 +159,7 @@ int TAO_EC_Timeout_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 a0cb386b195..9240db0d29b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h @@ -57,28 +57,28 @@ public: /// Callback from the Timeout_Generator void push_to_proxy (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_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 8ee6be22be4..40552d214d2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -42,7 +42,7 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_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 f4182620759..5e8f5a789bb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp @@ -34,48 +34,48 @@ TAO_EC_Trivial_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer*) void TAO_EC_Trivial_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Trivial_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_Trivial_Supplier_Filter::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Trivial_Supplier_Filter::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } void TAO_EC_Trivial_Supplier_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy* scheduling_strategy = this->event_channel_->scheduling_strategy (); scheduling_strategy->schedule_event (event, consumer, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_EC_Trivial_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Filter_Worker worker (event, event_info); this->event_channel_->consumer_admin ()->for_each (&worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::ULong diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h index b39fe982298..e0534b2f37a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h @@ -48,18 +48,18 @@ public: virtual void bind (TAO_EC_ProxyPushConsumer* consumer); virtual void unbind (TAO_EC_ProxyPushConsumer* consumer); virtual void connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); 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 5ea4a8cd2b2..04db9a3eb61 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -16,14 +16,14 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (event.length () != 1) - return this->filter_set (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->filter_set (event, qos_info ACE_ENV_ARG_PARAMETER); if (this->can_match (event[0].header)) { - this->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -33,14 +33,14 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (event.length () != 1) - return this->filter_set (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->filter_set (event, qos_info ACE_ENV_ARG_PARAMETER); if (this->can_match (event[0].header)) { - this->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -50,19 +50,19 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Type_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -116,7 +116,7 @@ int TAO_EC_Type_Filter::add_dependencies ( const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return this->can_match (header); } @@ -124,7 +124,7 @@ TAO_EC_Type_Filter::add_dependencies ( int TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ULong maximum = event.length (); if (event.maximum () == 0) @@ -143,7 +143,7 @@ TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event, if (matched.length () == 0) return 0; - this->push (matched, qos_info TAO_ENV_ARG_PARAMETER); + this->push (matched, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h index 9780fab0fd6..cde1c5a8326 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h @@ -41,22 +41,22 @@ public: // TAO_EC_Filter. virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Type_Filter @@ -67,7 +67,7 @@ private: /// Filter an EventSet that contains more than one event. int filter_set (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// Encapsulate the type/source that we must match. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index 06f5cf18acb..ad193b971af 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp @@ -16,7 +16,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 e59d2951f33..b272d2218ab 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h @@ -44,7 +44,7 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr_out addr - TAO_ENV_ARG_DECL) + ACE_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 4d3a5f3bdde..b8a4f3184a8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp @@ -160,7 +160,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Event_Channel_Timeprobe_Description, static RtecScheduler::Preemption_Priority_t Preemption_Priority (RtecScheduler::Scheduler_ptr scheduler, RtecScheduler::handle_t rtinfo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecScheduler::OS_Priority thread_priority; RtecScheduler::Preemption_Subpriority_t subpriority; @@ -174,14 +174,14 @@ Preemption_Priority (RtecScheduler::Scheduler_ptr scheduler, thread_priority, subpriority, preemption_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server ()->priority (rtinfo, thread_priority, subpriority, preemption_priority - TAO_ENV_ARG_PARAMETER); + ACE_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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { RtecEventComm::EventType &type = (*iter).event.header.type; @@ -242,7 +242,7 @@ public: { RtecScheduler::Preemption_Priority_t q = ::Preemption_Priority (scheduler, (*iter).rt_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (rt_info_ == 0 || q < p) { @@ -324,11 +324,11 @@ public: virtual int execute (void* /* arg = 0 */) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { ACE_ES_Dispatch_Request *request = request_; - dispatching_module_->push (request TAO_ENV_ARG_PARAMETER); + dispatching_module_->push (request ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; delete this; } @@ -368,7 +368,7 @@ void ACE_Push_Supplier_Proxy::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS &qos - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + supplier_module_->connected (this ACE_ENV_ARG_PARAMETER); } void ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->supplier_module_->push (this, copy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { RtecEventComm::EventSet copy = event; this->time_stamp (copy); - this->supplier_module_->push (this, copy TAO_ENV_ARG_PARAMETER); + this->supplier_module_->push (this, copy ACE_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 ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TIMEPROBE_PRINT; if (this->connected ()) { this->push_supplier_ = 0; - this->supplier_module_->disconnecting (this TAO_ENV_ARG_PARAMETER); + this->supplier_module_->disconnecting (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -457,10 +457,10 @@ ACE_Push_Supplier_Proxy::disconnect_push_consumer ( void ACE_Push_Supplier_Proxy::shutdown (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - push_supplier_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + push_supplier_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -483,7 +483,7 @@ ACE_Push_Consumer_Proxy::~ACE_Push_Consumer_Proxy (void) void ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_EVENT_TO_CONSUMER_PROXY); @@ -494,7 +494,7 @@ ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events return; } - push_consumer_->push (events TAO_ENV_ARG_PARAMETER); + push_consumer_->push (events ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -502,7 +502,7 @@ void ACE_Push_Consumer_Proxy::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->consumer_module_->connected (this ACE_ENV_ARG_PARAMETER); } void ACE_Push_Consumer_Proxy::disconnect_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TIMEPROBE_PRINT; this->push_consumer_ = RtecEventComm::PushConsumer::_nil (); - this->consumer_module_->disconnecting (this TAO_ENV_ARG_PARAMETER); + this->consumer_module_->disconnecting (this ACE_ENV_ARG_PARAMETER); } void -ACE_Push_Consumer_Proxy::suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ACE_Push_Consumer_Proxy::suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { correlation_.suspend (); } void -ACE_Push_Consumer_Proxy::resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ACE_Push_Consumer_Proxy::resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { correlation_.resume (); @@ -553,10 +553,10 @@ ACE_Push_Consumer_Proxy::resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void ACE_Push_Consumer_Proxy::shutdown (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->push_consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->push_consumer_->disconnect_push_consumer (ACE_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. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -674,7 +674,7 @@ ACE_EventChannel::~ACE_EventChannel (void) } void -ACE_EventChannel::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ACE_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { { @@ -767,27 +767,27 @@ ACE_EventChannel::report_disconnect_i (u_long event) void ACE_EventChannel::add_gateway (TAO_EC_Gateway* gw - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - RtecEventChannelAdmin::Observer_var observer = gw->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + RtecEventChannelAdmin::Observer_var observer = gw->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - gw->observer_handle (this->append_observer (observer.in () TAO_ENV_ARG_PARAMETER)); + gw->observer_handle (this->append_observer (observer.in () ACE_ENV_ARG_PARAMETER)); ACE_CHECK; } void ACE_EventChannel::del_gateway (TAO_EC_Gateway* gw - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->remove_observer (gw->observer_handle () TAO_ENV_ARG_PARAMETER); + this->remove_observer (gw->observer_handle () ACE_ENV_ARG_PARAMETER); ACE_CHECK; gw->observer_handle (0); } void -ACE_EventChannel::update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::update_consumer_gwys (ACE_ENV_SINGLE_ARG_DECL) { Observer_Map observers; { @@ -818,13 +818,13 @@ ACE_EventChannel::update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL) i != observers.end (); ++i) { - (*i).int_id_.observer->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + (*i).int_id_.observer->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void -ACE_EventChannel::update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::update_supplier_gwys (ACE_ENV_SINGLE_ARG_DECL) { Observer_Map observers; { @@ -854,14 +854,14 @@ ACE_EventChannel::update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL) i != observers.end (); ++i) { - (*i).int_id_.observer->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + (*i).int_id_.observer->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } RtecEventChannelAdmin::Observer_Handle ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -882,12 +882,12 @@ ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs RtecEventChannelAdmin::ConsumerQOS c_qos; this->consumer_module_->fill_qos (c_qos); - obs->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + obs->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecEventChannelAdmin::SupplierQOS s_qos; this->supplier_module_->fill_qos (s_qos); - obs->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + obs->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return entry.handle; @@ -895,7 +895,7 @@ ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs void ACE_EventChannel::remove_observer (RtecEventChannelAdmin::Observer_Handle h - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -932,7 +932,7 @@ ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info, RtecScheduler::handle_t timer_rtinfo = this->timer_module ()->rt_info (preemption_priority); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -940,14 +940,14 @@ ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info, timer_rtinfo, 1, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency (rt_info, timer_rtinfo, 1, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -1252,18 +1252,18 @@ ACE_ES_Consumer_Module::open (ACE_ES_Dispatching_Module *down) void ACE_ES_Consumer_Module::connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->down_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!consumer->qos ().is_gateway) - this->channel_->update_consumer_gwys (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_->update_consumer_gwys (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + sc->consumer ()->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (sc->consumer () TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (sc->consumer () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_->update_consumer_gwys (ACE_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); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + (*proxy)->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (*proxy TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (*proxy ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Remove the consumer from our list. @@ -1394,7 +1394,7 @@ DONE: void ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + down_->disconnecting (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Send a shutdown message through the system. When this is @@ -1459,7 +1459,7 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer // can read the set we allocated off the stack. void ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + request->consumer ()->push (event_set ACE_ENV_ARG_PARAMETER); } RtecEventChannelAdmin::ProxyPushSupplier_ptr ACE_ES_Consumer_Module::obtain_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy = new_consumer->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxy); // Give away ownership to the POA.... @@ -1622,7 +1622,7 @@ ACE_ES_Correlation_Module::open (ACE_ES_Dispatching_Module *up, void ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the consumer correlation filter. if (consumer->correlation ().connected (consumer, this) == -1) @@ -1631,7 +1631,7 @@ ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer void ACE_ES_Correlation_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (consumer->correlation ().disconnecting () == -1) ACE_ERROR ((LM_ERROR, @@ -1653,7 +1653,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + up_->push (request ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ACE_ES_Consumer_Correlation::disconnect_push_supplier (ACE_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_) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - channel_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + channel_->disconnect_push_consumer (ACE_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 ()) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_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_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2385,7 +2385,7 @@ ACE_ES_Subscription_Module::~ACE_ES_Subscription_Module (void) // global type collection. void ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventComm::EventSourceID sid = 0; // We will record the source_id for later usage. @@ -2463,14 +2463,14 @@ ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier new_subscribers->dependency_info_->rt_info, new_subscribers->dependency_info_->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_CHECK; @@ -2538,7 +2538,7 @@ ACE_ES_Subscription_Module::reregister_consumers (RtecEventComm::EventSourceID s void ACE_ES_Subscription_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_WRITE_GUARD_THROW_EX ( ACE_ES_RW_LOCK, ace_mon, this->lock_, @@ -2592,7 +2592,7 @@ ACE_ES_Subscription_Module::subscribe_all (ACE_ES_Consumer_Rep *) int ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + up_->push (*consumer, event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } // If the consumer has disconnected, schedule it for @@ -2675,7 +2675,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + up_->push (*consumer, event ACE_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 ()) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -2846,14 +2846,14 @@ ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer, temp->int_id_->dependency_info_->rt_info, temp->int_id_->dependency_info_->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_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. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -2925,14 +2925,14 @@ ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer, dependency_info->rt_info, dependency_info->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_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. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -2998,14 +2998,14 @@ ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer dependency_info->rt_info, dependency_info->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -3232,13 +3232,13 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + int result = this->push_source (source, event ACE_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 TAO_ENV_ARG_PARAMETER); + result = this->push_source_type (source, event ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (result == -1) @@ -3321,19 +3321,19 @@ ACE_ES_Supplier_Module::open (ACE_ES_Subscription_Module *up) void ACE_ES_Supplier_Module::connected (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { channel_->report_connect (ACE_EventChannel::SUPPLIER); - up_->connected (supplier TAO_ENV_ARG_PARAMETER); + up_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!supplier->qos ().is_gateway) - this->channel_->update_supplier_gwys (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_->update_supplier_gwys (ACE_ENV_SINGLE_ARG_PARAMETER); } void ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + up_->disconnecting (supplier ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_->update_supplier_gwys (ACE_ENV_SINGLE_ARG_PARAMETER); } void @@ -3381,14 +3381,14 @@ ACE_ES_Supplier_Module::shutdown (void) { Supplier_Iterator iter (copy); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; for (ACE_Push_Supplier_Proxy **proxy = 0; iter.next (proxy) != 0; iter.advance ()) { (*proxy)->shutdown (); - this->disconnecting (*proxy TAO_ENV_ARG_PARAMETER); + this->disconnecting (*proxy ACE_ENV_ARG_PARAMETER); } } @@ -3396,7 +3396,7 @@ ACE_ES_Supplier_Module::shutdown (void) } RtecEventChannelAdmin::ProxyPushConsumer_ptr -ACE_ES_Supplier_Module::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +ACE_ES_Supplier_Module::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy = @@ -3418,7 +3418,7 @@ ACE_ES_Supplier_Module::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_ERROR ((LM_ERROR, "ACE_ES_Supplier_Module insert failed.\n")); } - proxy = new_supplier->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy = new_supplier->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxy); // Give ownership to the POA @@ -3430,7 +3430,7 @@ ACE_ES_Supplier_Module::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) void ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy, RtecEventComm::EventSet &event_set - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + up_->push (proxy, event_copy ACE_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 955838fae77..efd24b5d442 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + RtecEventChannelAdmin::EventChannel_ptr get_ref (ACE_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 TAO_ENV_ARG_DECL); - void del_gateway (TAO_EC_Gateway* gw TAO_ENV_ARG_DECL); + void add_gateway (TAO_EC_Gateway* gw ACE_ENV_ARG_DECL); + void del_gateway (TAO_EC_Gateway* gw ACE_ENV_ARG_DECL); // Add and remove gateways from the EC. - void update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL); - void update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL); + void update_consumer_gwys (ACE_ENV_SINGLE_ARG_DECL); + void update_supplier_gwys (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + for_consumers (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return an interface to the Supplier_Module. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void destroy (ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Factory method for push consumer proxies. void connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Unregister the consumer from the Event Service. virtual void push (const ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); - RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Allow transformations to RtecEventChannelAdmin::ConsumerAdmin. void shutdown_request (ACE_ES_Dispatch_Request *request); @@ -1011,16 +1011,16 @@ public: // Link to adjacent modules. void connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Create the consumers filter object. void disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Release the consumers filter object. void push (ACE_ES_Consumer_Rep *consumer, const TAO_EC_Event &event - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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. @@ -1099,13 +1099,13 @@ public: // Removes the -consumer- from any subscription lists. void connected (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); void disconnecting (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); void push (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Takes in an event and pushes subscriber sets to the // Correlation Module. @@ -1160,18 +1160,18 @@ private: int push_source (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_consumer (ACE_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 - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Unregister the consumer from the Event Service. - RtecEventChannelAdmin::SupplierAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + RtecEventChannelAdmin::SupplierAdmin_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Allow transformations to RtecEventComm::PushConsumer. void shutdown (void); @@ -1290,7 +1290,7 @@ public: virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)); // Suppliers connect via this interface. <push_supplier> is a @@ -1298,12 +1298,12 @@ public: // the supplier. virtual void push (const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnect the supplier from the channel. @@ -1374,29 +1374,29 @@ public: virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The consumer is disconnecting. - virtual void suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Stop forwarding events to the calling consumer. - virtual void resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void resume_connection (ACE_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 - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 395b70bc70b..d0fbf3acda3 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 (TAO_ENV_SINGLE_ARG_DECL) +ACE_ES_Consumer_Module::get_ref (ACE_ENV_SINGLE_ARG_DECL) { - return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr -ACE_ES_Supplier_Module::get_ref (TAO_ENV_SINGLE_ARG_DECL) +ACE_ES_Supplier_Module::get_ref (ACE_ENV_SINGLE_ARG_DECL) { - return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } // ************************************************** ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr -ACE_EventChannel::get_ref (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::get_ref (ACE_ENV_SINGLE_ARG_DECL) { - return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr -ACE_EventChannel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return supplier_module_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return supplier_module_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr -ACE_EventChannel::for_consumers (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return consumer_module_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return consumer_module_->get_ref (ACE_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 2582e74ee2e..a312c4302f1 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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_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, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif @@ -120,14 +120,14 @@ ACE_RT_Task::svc (void) (this->rt_info_, thread_priority, subpriority, - preemption_priority TAO_ENV_ARG_PARAMETER); + preemption_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else ACE_Scheduler_Factory::server ()->priority (this->rt_info_, thread_priority, subpriority, - preemption_priority TAO_ENV_ARG_PARAMETER); + preemption_priority ACE_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; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 rt_info_ = - this->scheduler_->create (tempname TAO_ENV_ARG_PARAMETER); + this->scheduler_->create (tempname ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else rt_info_ = ACE_Scheduler_Factory::server()->create (tempname - TAO_ENV_ARG_PARAMETER); + ACE_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; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { { @@ -325,14 +325,14 @@ ACE_RT_Task::synch_threads (size_t threads) (rt_info_, thread_priority, subpriority, - preemption_priority TAO_ENV_ARG_PARAMETER); + preemption_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else ACE_Scheduler_Factory::server ()->priority (rt_info_, thread_priority, subpriority, - preemption_priority TAO_ENV_ARG_PARAMETER); + preemption_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif } diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp index 826009f8d12..8ea1e243627 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 { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -90,7 +90,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period) ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->set (rt_info_, @@ -103,7 +103,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period) ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_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 7363d0956f9..1ea17bc1001 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp @@ -20,7 +20,7 @@ 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 * - TAO_ENV_ARG_DECL) + ACE_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 6cb35899442..e178d6a9661 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h @@ -53,7 +53,7 @@ public: /// initialize the endpoint selection state instance. virtual TAO_Invocation_Endpoint_Selector *get_selector ( TAO_GIOP_Invocation * - TAO_ENV_ARG_DECL); + ACE_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 ec979f5a1cb..aaed1b9240a 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -14,7 +14,7 @@ ACE_RCSID(FaultTolerance, TAO_FT_IOGR_Property, "$Id$") CORBA::Boolean TAO_FT_IOGR_Property::set_property ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) + ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException, TAO_IOP::Invalid_IOR)) { @@ -63,7 +63,7 @@ TAO_FT_IOGR_Property::set_property ( CORBA::Boolean TAO_FT_IOGR_Property::is_primary_set ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) + ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -78,7 +78,7 @@ TAO_FT_IOGR_Property::is_primary_set ( CORBA::Object_ptr TAO_FT_IOGR_Property::get_primary ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, TAO_IOP::NotFound @@ -151,7 +151,7 @@ CORBA::Boolean TAO_FT_IOGR_Property::set_primary ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL) + ACE_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 eb94a073989..3fe6434051e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h @@ -76,7 +76,7 @@ public: virtual CORBA::Boolean set_property ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -87,7 +87,7 @@ public: virtual CORBA::Boolean set_primary ( CORBA::Object_ptr ior1, CORBA::Object_ptr ior2 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -98,7 +98,7 @@ public: virtual CORBA::Object_ptr get_primary ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException, @@ -108,7 +108,7 @@ public: virtual CORBA::Boolean is_primary_set ( CORBA::Object_ptr ior - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 2f07b99f486..a45f0cf0efd 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp @@ -32,11 +32,11 @@ TAO_FT_Invocation_Endpoint_Selector::~TAO_FT_Invocation_Endpoint_Selector (void) void TAO_FT_Invocation_Endpoint_Selector::select_endpoint ( TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int retval = this->select_endpoint_i (invocation - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (retval == 0) @@ -47,7 +47,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint ( "Falling back on the default selection routines \n")); TAO_Default_Endpoint_Selector::select_endpoint (invocation - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -57,7 +57,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint ( // @@ RTCORBA_Subsetting - next should be deprecated... void TAO_FT_Invocation_Endpoint_Selector::next (TAO_GIOP_Invocation * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("This method is DEPRECATED!\n"))); // if (invocation->stub_->next_profile_retry () == 0) @@ -69,7 +69,7 @@ void TAO_FT_Invocation_Endpoint_Selector::forward (TAO_GIOP_Invocation *invocation, const TAO_MProfile &mprofile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { invocation->stub ()->add_forward_profiles (mprofile); // This has to be and is thread safe. @@ -106,11 +106,11 @@ TAO_FT_Invocation_Endpoint_Selector::close_connection (TAO_GIOP_Invocation *invo int TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i( TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int retval = this->select_primary (invocation - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -166,7 +166,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i( int status = this->endpoint_from_profile (invocation - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (status == 1) @@ -185,7 +185,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i( int TAO_FT_Invocation_Endpoint_Selector::select_primary ( TAO_GIOP_Invocation *invoc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Get the current profile TAO_Profile *temp_profile = @@ -199,7 +199,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary ( retval = this->check_profile_for_primary (invoc, temp_profile - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } else @@ -255,7 +255,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary ( retval = this->check_profile_for_primary (invoc, temp_profile - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (retval == 1 || retval == -1) @@ -287,7 +287,7 @@ int TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary ( TAO_GIOP_Invocation *invocation, TAO_Profile*pfile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { IOP::TaggedComponent tagged_component; tagged_component.tag = IOP::TAG_FT_PRIMARY; @@ -310,7 +310,7 @@ TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary ( int status = this->endpoint_from_profile (invocation - TAO_ENV_ARG_PARAMETER); + ACE_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 62e82e2a09e..805921e967e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h @@ -55,27 +55,27 @@ public: /// $TAO_ROOT/tao/Invocation_Endpoint_Selectors.h for details of /// documentation. virtual void select_endpoint (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void next (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void forward (TAO_GIOP_Invocation *invocation, const TAO_MProfile &mprofile - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int select_primary (TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int check_profile_for_primary (TAO_GIOP_Invocation *, TAO_Profile * - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp index 02570b50932..51a9d535a22 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp @@ -12,7 +12,7 @@ ACE_RCSID (FaultTolerance, FT_ORBInitializer, "$Id$") void TAO_FT_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -21,18 +21,18 @@ TAO_FT_ORBInitializer::pre_init ( void TAO_FT_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_FT_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Register the FTCORBA policy factories. @@ -60,19 +60,19 @@ TAO_FT_ORBInitializer::register_policy_factories ( CORBA::PolicyType type = FT::REQUEST_DURATION_POLICY; info->register_policy_factory (type, policy_factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = FT::HEARTBEAT_POLICY; info->register_policy_factory (type, policy_factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = FT::HEARTBEAT_ENABLED_POLICY; info->register_policy_factory (type, policy_factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Transfer ownership of the policy factory to the registry. diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h index eba0417afd6..3918193b6f3 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h @@ -47,18 +47,18 @@ class TAO_FT_Export TAO_FT_ORBInitializer : public: virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); ///< Register FTCORBA policy factories. }; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp index 534e396bfc9..2072fe7bbd1 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp @@ -17,20 +17,20 @@ CORBA::Policy_ptr TAO_FT_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &val - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { if (type == FT::REQUEST_DURATION_POLICY) return TAO_FT_Request_Duration_Policy::create (val - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else if (type == FT::HEARTBEAT_POLICY) return TAO_FT_Heart_Beat_Policy::create (val - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else if (type == FT::HEARTBEAT_ENABLED_POLICY) return TAO_FT_Heart_Beat_Enabled_Policy::create (val - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), CORBA::Policy::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h index f96d8dc4617..f8dae1bc5cb 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h @@ -50,7 +50,7 @@ public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any &value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); }; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp index 0fe68876e0e..3328034a0cb 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp @@ -10,14 +10,14 @@ ACE_RCSID(FaultTolerance, FT_Policy_i, "$Id$") TimeBase::TimeT -TAO_FT_Request_Duration_Policy::request_duration_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Request_Duration_Policy::request_duration_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->request_duration_; } CORBA::PolicyType -TAO_FT_Request_Duration_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Request_Duration_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return FT::REQUEST_DURATION_POLICY; @@ -25,7 +25,7 @@ TAO_FT_Request_Duration_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Policy_ptr TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_FT_Request_Duration_Policy::copy (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_FT_Request_Duration_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Request_Duration_Policy::destroy (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { FT::HeartbeatPolicyValue val; @@ -108,7 +108,7 @@ TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (TAO_ENV_SINGLE_ARG_DECL_NOT_US CORBA::Policy_ptr TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Heart_Beat_Policy::policy_type (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Policy_ptr -TAO_FT_Heart_Beat_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_FT_Heart_Beat_Policy::copy (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Heart_Beat_Policy::destroy (ACE_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 ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->heartbeat_enabled_value_; @@ -198,7 +198,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value ( CORBA::Policy_ptr TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Heart_Beat_Enabled_Policy::policy_type (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Policy_ptr -TAO_FT_Heart_Beat_Enabled_Policy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_FT_Heart_Beat_Enabled_Policy::copy (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_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 be1e5de9406..fe9a8bebd12 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h @@ -61,7 +61,7 @@ public: // Copy constructor. static CORBA::Policy_ptr create (const CORBA::Any& val - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual TimeBase::TimeT request_duration_value (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Policy_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void set_time_value (ACE_Time_Value &time_value); @@ -115,7 +115,7 @@ public: // Copy constructor. static CORBA::Policy_ptr create (const CORBA::Any& val - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Helper method for the implementation of // CORBA::ORB::create_policy. @@ -124,19 +124,19 @@ public: // Returns a copy of <this>. // = The FT::HeartBeatPolicy methods - virtual FT::HeartbeatPolicyValue heartbeat_policy_value (TAO_ENV_SINGLE_ARG_DECL) + virtual FT::HeartbeatPolicyValue heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Policy_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void set_time_value (ACE_Time_Value &time_value, @@ -179,7 +179,7 @@ public: // Copy constructor. static CORBA::Policy_ptr create (const CORBA::Any& val - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Helper method for the implementation of // CORBA::ORB::create_policy. @@ -189,19 +189,19 @@ public: // = The FT::HeartBeatPolicy methods virtual CORBA::Boolean heartbeat_enabled_policy_value ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Policy_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_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 7d75ef8a98b..07a925ee980 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -159,7 +159,7 @@ TAO_FT_Service_Callbacks::service_context_list ( TAO_Stub *&stub, IOP::ServiceContextList &service_list, CORBA::Boolean restart - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -171,13 +171,13 @@ TAO_FT_Service_Callbacks::service_context_list ( // Pack the group version service context this->group_version_service_context (stub, service_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Pack the request service context this->request_service_context (stub, service_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -188,7 +188,7 @@ void TAO_FT_Service_Callbacks::request_service_context ( TAO_Stub *&stub, IOP::ServiceContextList &service_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_OutputCDR cdr; @@ -211,7 +211,7 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + duration_policy->request_duration_value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else @@ -289,7 +289,7 @@ void TAO_FT_Service_Callbacks::group_version_service_context ( TAO_Stub *&stub, IOP::ServiceContextList &service_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_OutputCDR cdr; @@ -369,7 +369,7 @@ int TAO_FT_Service_Callbacks::raise_comm_failure ( TAO_GIOP_Invocation *invoke, TAO_Profile *profile - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->restart_policy_check ( invoke->request_service_context ().service_info (), @@ -403,7 +403,7 @@ int TAO_FT_Service_Callbacks::raise_transient_failure ( TAO_GIOP_Invocation *invoke, TAO_Profile *profile - TAO_ENV_ARG_DECL) + ACE_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 9254b4e8482..a984f5368ed 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h @@ -76,7 +76,7 @@ public: virtual void service_context_list (TAO_Stub *&stub, IOP::ServiceContextList &service_list, CORBA::Boolean restart - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Add relevant stuff to the service context list @@ -84,14 +84,14 @@ public: virtual int raise_comm_failure ( TAO_GIOP_Invocation *invoke, TAO_Profile *profile - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Check whether we need to raise an exception or go for a // reinvocaton. @@ -110,13 +110,13 @@ private: void request_service_context (TAO_Stub *&stub, IOP::ServiceContextList &service_list - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 af98cb7e372..66515a35186 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp @@ -30,7 +30,7 @@ TAO_LB_LoadBalancer::~TAO_LB_LoadBalancer (void) LoadBalancing::ReplicaProxy_ptr TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + proxy->connect (this, control, replica ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (LoadBalancing::ReplicaProxy::_nil ()); if (this->strategy_->insert (proxy) == -1) @@ -56,11 +56,11 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, LoadBalancing::ReplicaProxy::_nil ()); } - return proxy->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return proxy->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Object_ptr -TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_LB_LoadBalancer::group_identity (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Object::_duplicate (this->group_identity_.in ()); @@ -68,9 +68,9 @@ TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_LB_LoadBalancer::load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->strategy_->load_changed (proxy TAO_ENV_ARG_PARAMETER); + this->strategy_->load_changed (proxy ACE_ENV_ARG_PARAMETER); } int @@ -85,13 +85,13 @@ TAO_LB_LoadBalancer::init (const char * repository_id, PortableServer::RequestProcessingPolicy_var request = root_poa->create_request_processing_policy ( PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ServantRetentionPolicy_var retention = root_poa->create_servant_retention_policy ( PortableServer::NON_RETAIN - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_ = root_poa->create_POA ("TAO_LB_ReplicaLocator_POA", poa_manager.in (), policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the child POA. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - request->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + request->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - retention->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + retention->destroy (ACE_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_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ What ObjectId should be used? @@ -138,7 +138,7 @@ TAO_LB_LoadBalancer::init (const char * repository_id, this->group_identity_ = this->poa_->create_reference_with_id (oid.in (), repository_id - TAO_ENV_ARG_PARAMETER); + ACE_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 a410c01cdec..7437c529fab 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h @@ -59,17 +59,17 @@ public: // things) pre-computed. // void load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnect proxy from the Load Balancer. - CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return a reference to the Replica to which client requests should // be redirected next. @@ -78,11 +78,11 @@ public: virtual LoadBalancing::ReplicaProxy_ptr connect ( LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)); - virtual CORBA::Object_ptr group_identity (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Object_ptr group_identity (ACE_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 f667e95a552..a806f7dfead 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i +++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i @@ -5,7 +5,7 @@ ACE_INLINE void TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_LoadBalancer::replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->strategy_->replica (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->strategy_->replica (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp index af98cb7e372..66515a35186 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp @@ -30,7 +30,7 @@ TAO_LB_LoadBalancer::~TAO_LB_LoadBalancer (void) LoadBalancing::ReplicaProxy_ptr TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + proxy->connect (this, control, replica ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (LoadBalancing::ReplicaProxy::_nil ()); if (this->strategy_->insert (proxy) == -1) @@ -56,11 +56,11 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control, LoadBalancing::ReplicaProxy::_nil ()); } - return proxy->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return proxy->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Object_ptr -TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_LB_LoadBalancer::group_identity (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Object::_duplicate (this->group_identity_.in ()); @@ -68,9 +68,9 @@ TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_LB_LoadBalancer::load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->strategy_->load_changed (proxy TAO_ENV_ARG_PARAMETER); + this->strategy_->load_changed (proxy ACE_ENV_ARG_PARAMETER); } int @@ -85,13 +85,13 @@ TAO_LB_LoadBalancer::init (const char * repository_id, PortableServer::RequestProcessingPolicy_var request = root_poa->create_request_processing_policy ( PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ServantRetentionPolicy_var retention = root_poa->create_servant_retention_policy ( PortableServer::NON_RETAIN - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_ = root_poa->create_POA ("TAO_LB_ReplicaLocator_POA", poa_manager.in (), policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the child POA. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - request->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + request->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - retention->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + retention->destroy (ACE_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_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ What ObjectId should be used? @@ -138,7 +138,7 @@ TAO_LB_LoadBalancer::init (const char * repository_id, this->group_identity_ = this->poa_->create_reference_with_id (oid.in (), repository_id - TAO_ENV_ARG_PARAMETER); + ACE_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 a410c01cdec..7437c529fab 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h @@ -59,17 +59,17 @@ public: // things) pre-computed. // void load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnect proxy from the Load Balancer. - CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return a reference to the Replica to which client requests should // be redirected next. @@ -78,11 +78,11 @@ public: virtual LoadBalancing::ReplicaProxy_ptr connect ( LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl, LoadBalancing::ReplicaProxy::NilReplica, CORBA::SystemException)); - virtual CORBA::Object_ptr group_identity (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Object_ptr group_identity (ACE_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 f667e95a552..a806f7dfead 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i @@ -5,7 +5,7 @@ ACE_INLINE void TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_LoadBalancer::replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->strategy_->replica (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->strategy_->replica (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp index f0b9d4f00f7..55d9e4ae6fb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp @@ -18,7 +18,7 @@ TAO_LB_LoadBalancing_Strategy::~TAO_LB_LoadBalancing_Strategy (void) void TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h index 946325788d9..0e197de508f 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 (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Return the object reference to the Replica to which requests should // be redirected. @@ -60,7 +60,7 @@ public: // Remove ReplicaProxy servant from the set of replica proxies. virtual void load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL); + ACE_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 06d74819fb2..c3e9ae40930 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_Minimum_Dispersion_Strategy::replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { for ( ; ; ) @@ -84,7 +84,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { CORBA::Boolean non_existent = - object->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + object->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (!non_existent) { @@ -130,7 +130,7 @@ TAO_LB_Minimum_Dispersion_Strategy::remove (TAO_LB_ReplicaProxy *proxy) void TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->control_->high_load_advisory (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->control_->nominal_load_advisory (ACE_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 df4e679543c..938b7ba0ecc 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 (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Object_ptr replica (ACE_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 * - TAO_ENV_ARG_DECL); + ACE_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 66a03582d03..e42168ee991 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp @@ -19,7 +19,7 @@ TAO_LB_ReplicaLocator::preinvoke ( PortableServer::POA_ptr /* adapter */, const char * /* operation */, PortableServer::ServantLocator::Cookie & /* the_cookie */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -27,7 +27,7 @@ TAO_LB_ReplicaLocator::preinvoke ( ACE_THROW_RETURN (CORBA::INTERNAL (), 0); CORBA::Object_var replica = - this->load_balancer_->replica (TAO_ENV_SINGLE_ARG_PARAMETER); + this->load_balancer_->replica (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Throw a forward exception to force the client to redirect its @@ -44,7 +44,7 @@ TAO_LB_ReplicaLocator::postinvoke ( const char * /* operation */, PortableServer::ServantLocator::Cookie /* the_cookie */, PortableServer::Servant /* the_servant */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // No-op diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h index 9031dbb51fc..0507fd23d50 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h @@ -50,7 +50,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie & the_cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -60,7 +60,7 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp index bfc9d025ba7..f111819e7f8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp @@ -23,7 +23,7 @@ TAO_LB_ReplicaProxy::TAO_LB_ReplicaProxy (void) void TAO_LB_ReplicaProxy::current_load (CORBA::Float load - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->balancer_->load_changed (this ACE_ENV_ARG_PARAMETER); } void -TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_ReplicaProxy::disconnect (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected, CORBA::SystemException)) { @@ -49,7 +49,7 @@ TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL) if (this->connected_) { - this->balancer_->disconnect (this TAO_ENV_ARG_PARAMETER); + this->balancer_->disconnect (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->connected_ = 0; @@ -64,7 +64,7 @@ void TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer, LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_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 9eb629ea29f..8f29e644a6d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h @@ -55,7 +55,7 @@ public: // Return a reference to the Replica. virtual void current_load (CORBA::Float load - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected, CORBA::SystemException)); // Send a request to disconnect from the LoadBalancer. @@ -93,7 +93,7 @@ private: void connect (TAO_LB_LoadBalancer *balancer, LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_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 4da47b060d7..d587a309dfa 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_Round_Robin_Strategy::replica (ACE_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 93887fc6ac0..988e18ea25e 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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Object_ptr replica (ACE_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 f0b9d4f00f7..55d9e4ae6fb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp @@ -18,7 +18,7 @@ TAO_LB_LoadBalancing_Strategy::~TAO_LB_LoadBalancing_Strategy (void) void TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h index 946325788d9..0e197de508f 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 (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // Return the object reference to the Replica to which requests should // be redirected. @@ -60,7 +60,7 @@ public: // Remove ReplicaProxy servant from the set of replica proxies. virtual void load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL); + ACE_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 f121cfc75f3..bad0af39eea 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -15,29 +15,29 @@ BasicLogFactory_i::~BasicLogFactory_i() DsLogAdmin::BasicLogFactory_ptr BasicLogFactory_i::activate (PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { DsLogAdmin::BasicLogFactory_var v_return; PortableServer::ObjectId_var oid = poa->activate_object (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (v_return._retn ()); CORBA::Object_var obj = poa->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (v_return._retn ()); // narrow and store the result.. this->log_mgr_ = DsLogAdmin::LogMgr::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (v_return._retn ()); v_return = DsLogAdmin::BasicLogFactory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ()); return v_return._retn (); @@ -47,7 +47,7 @@ DsLogAdmin::BasicLog_ptr BasicLogFactory_i::create (DsLogAdmin::LogFullAction full_action, CORBA::ULongLong max_rec_size, DsLogAdmin::LogId_out id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::NoResources )) @@ -59,7 +59,7 @@ BasicLogFactory_i::create (DsLogAdmin::LogFullAction full_action, this->create_with_id (this->max_id_, full_action, max_rec_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ()); // Set the id to return.. @@ -71,7 +71,7 @@ DsLogAdmin::BasicLog_ptr BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id, DsLogAdmin::LogFullAction full_action, CORBA::ULongLong max_size - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + basic_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (basic_log._retn ()); // Register with the poa - basic_log = basic_log_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + basic_log = basic_log_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (basic_log._retn ()); - basic_log_i->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + basic_log_i->_remove_ref (ACE_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 58c6c556192..355c599ae36 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h @@ -51,14 +51,14 @@ public: DsLogAdmin::BasicLogFactory_ptr activate (PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::NoResources )); @@ -69,7 +69,7 @@ public: create_with_id (DsLogAdmin::LogId id, DsLogAdmin::LogFullAction full_action, CORBA::ULongLong max_size - TAO_ENV_ARG_DECL) + ACE_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 4c242a8c376..d5cb57712cd 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 (TAO_ENV_SINGLE_ARG_DECL) +BasicLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove ourselves from the list of logs. @@ -29,15 +29,15 @@ BasicLog_i::destroy (TAO_ENV_SINGLE_ARG_DECL) // Deregister with POA. PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index 483db1f88c6..3ac2e12b5f7 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 (TAO_ENV_SINGLE_ARG_DECL) + destroy (ACE_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 8483089c925..6dcc28fc61c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -31,21 +31,21 @@ Iterator_i::~Iterator_i (void) } void -Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableServer::POA_ptr poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_ptr poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Goodbye cruel world... // deactivate from the poa. poa->deactivate_object (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; return; } @@ -53,7 +53,7 @@ Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL) DsLogAdmin::RecordList* Iterator_i::get (CORBA::ULong position, CORBA::ULong how_many - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)) { @@ -73,7 +73,7 @@ Iterator_i::get (CORBA::ULong position, // Use an Interpreter to build an expression tree. TAO_Log_Constraint_Interpreter interpreter (constraint_ - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy (ACE_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 f20c1e7980b..4655da02a4d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h @@ -58,12 +58,12 @@ public: DsLogAdmin::RecordList* get (CORBA::ULong position, CORBA::ULong how_many - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)); // Gets a list of LogRecords. - void destroy (TAO_ENV_SINGLE_ARG_DECL) + void destroy (ACE_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 eef4349d9ff..fae15c930bd 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 (TAO_ENV_SINGLE_ARG_DECL) +LogMgr_i::list_logs (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -51,7 +51,7 @@ LogMgr_i::list_logs (TAO_ENV_SINGLE_ARG_DECL) DsLogAdmin::Log_ptr LogMgr_i::find_log (DsLogAdmin::LogId id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +LogMgr_i::list_logs_by_id (ACE_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 8b6455b0fef..537e794f3b3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h @@ -40,7 +40,7 @@ public: // Destructor. DsLogAdmin::LogList * - list_logs (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + list_logs (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -48,14 +48,14 @@ public: DsLogAdmin::Log_ptr find_log (DsLogAdmin::LogId id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + list_logs_by_id (ACE_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 d87f5406087..fab4cc4fd1c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp @@ -5,7 +5,7 @@ TAO_Log_Constraint_Interpreter:: TAO_Log_Constraint_Interpreter(const char* constraints - TAO_ENV_ARG_DECL) + ACE_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 a68ab3deedb..40d89d023cd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h @@ -37,7 +37,7 @@ class TAO_Log_Export TAO_Log_Constraint_Interpreter : public TAO_Interpreter public: // = Initialization and termination methods. TAO_Log_Constraint_Interpreter (const char* constraints - TAO_ENV_ARG_DECL) + ACE_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 c9c9aeae5a0..eb42cad258d 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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_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 TAO_ENV_ARG_PARAMETER); + // value = this->prop_eval_.property_value (prop_index ACE_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 8136149246a..439e0ed46c5 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 (TAO_ENV_SINGLE_ARG_DECL) +Log_i::init (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::my_factory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return DsLogAdmin::LogMgr::_duplicate (factory_.in ()); } DsLogAdmin::LogId -Log_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return logid_; } DsLogAdmin::QoSList* -Log_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) +Log_i::get_qos (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { DsLogAdmin::QoSList* ret_val; @@ -73,7 +73,7 @@ Log_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) void Log_i::set_qos (const DsLogAdmin::QoSList &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)) { @@ -100,7 +100,7 @@ Log_i::set_qos (const DsLogAdmin::QoSList &qos } CORBA::ULong -Log_i::get_max_record_life (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_max_record_life (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return max_record_life_; @@ -108,7 +108,7 @@ Log_i::get_max_record_life (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Log_i::set_max_record_life (CORBA::ULong life - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // life is in seconds. @@ -119,7 +119,7 @@ Log_i::set_max_record_life (CORBA::ULong life } CORBA::ULongLong -Log_i::get_max_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_max_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return recordstore_.get_max_size (); @@ -127,7 +127,7 @@ Log_i::get_max_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Log_i::set_max_size (CORBA::ULongLong size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)) { @@ -146,21 +146,21 @@ Log_i::set_max_size (CORBA::ULongLong size } CORBA::ULongLong -Log_i::get_current_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_current_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->recordstore_.get_current_size (); } CORBA::ULongLong -Log_i::get_n_records (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_n_records (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_log_full_action (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return log_full_action_; @@ -168,14 +168,14 @@ Log_i::get_log_full_action (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Log_i::set_log_full_action (DsLogAdmin::LogFullAction action - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { log_full_action_ = action; } DsLogAdmin::AdministrativeState -Log_i::get_administrative_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_administrative_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return admin_state_; @@ -183,14 +183,14 @@ Log_i::get_administrative_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->admin_state_ = state; } DsLogAdmin::ForwardingState -Log_i::get_forwarding_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->forward_state_; @@ -198,21 +198,21 @@ Log_i::get_forwarding_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->forward_state_ = state; } DsLogAdmin::OperationalState -Log_i::get_operational_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_operational_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->op_state_; } DsLogAdmin::TimeInterval -Log_i::get_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_interval (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->interval_; @@ -220,7 +220,7 @@ Log_i::get_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Log_i::set_interval (const DsLogAdmin::TimeInterval &interval - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_i::get_availability_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // TODO: @@ -249,7 +249,7 @@ Log_i::get_availability_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } DsLogAdmin::CapacityAlarmThresholdList* -Log_i::get_capacity_alarm_thresholds (TAO_ENV_SINGLE_ARG_DECL) +Log_i::get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { DsLogAdmin::CapacityAlarmThresholdList* ret_val; @@ -265,7 +265,7 @@ void Log_i::set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList &threshs - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Log_i::get_week_mask (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { DsLogAdmin::WeekMask* ret_val; @@ -291,7 +291,7 @@ Log_i::get_week_mask (TAO_ENV_SINGLE_ARG_DECL) void Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval, @@ -306,13 +306,13 @@ DsLogAdmin::RecordList* Log_i::query_i (const char *constraint, DsLogAdmin::Iterator_out &iter_out, CORBA::ULong how_many - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidConstraint)) { // Use an Interpreter to build an expression tree. TAO_Log_Constraint_Interpreter interpreter (constraint - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + iter_out = iter_query->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (rec_list); // Give ownership to the POA. - this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (rec_list); } @@ -408,19 +408,19 @@ DsLogAdmin::RecordList* Log_i::query (const char *grammar, const char *constraint, DsLogAdmin::Iterator_out iter_out - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { - this->check_grammar (grammar TAO_ENV_ARG_PARAMETER); + this->check_grammar (grammar ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); DsLogAdmin::RecordList* rec_list = this->query_i (constraint, iter_out, this->max_rec_list_len_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (rec_list); return rec_list; @@ -430,7 +430,7 @@ DsLogAdmin::RecordList* Log_i::retrieve (DsLogAdmin::TimeT from_time, CORBA::Long how_many, DsLogAdmin::Iterator_out iter_out - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Decide between forward vs backward retrieval. @@ -454,7 +454,7 @@ Log_i::retrieve (DsLogAdmin::TimeT from_time, this->query_i (constraint, iter_out, how_many - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (rec_list); return rec_list; @@ -463,13 +463,13 @@ Log_i::retrieve (DsLogAdmin::TimeT from_time, CORBA::ULong Log_i::match_i (const char *constraint, CORBA::Boolean delete_rec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidConstraint)) { // Use an Interpreter to build an expression tree. TAO_Log_Constraint_Interpreter interpreter (constraint - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Get the underlying storage. @@ -515,16 +515,16 @@ Log_i::match_i (const char *constraint, CORBA::ULong Log_i::match (const char* grammar, const char *constraint - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { - this->check_grammar (grammar TAO_ENV_ARG_PARAMETER); + this->check_grammar (grammar ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong count = - this->match_i (constraint, 0 TAO_ENV_ARG_PARAMETER); + this->match_i (constraint, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (count); return count; @@ -533,16 +533,16 @@ Log_i::match (const char* grammar, CORBA::ULong Log_i::delete_records (const char *grammar, const char *constraint - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)) { - this->check_grammar (grammar TAO_ENV_ARG_PARAMETER); + this->check_grammar (grammar ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::ULong count = - this->match_i (constraint, 1 TAO_ENV_ARG_PARAMETER); + this->match_i (constraint, 1 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (count); return count; @@ -551,7 +551,7 @@ Log_i::delete_records (const char *grammar, CORBA::ULong Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong numdone (0); @@ -569,7 +569,7 @@ Log_i::delete_records_by_id (const void Log_i::write_records (const DsLogAdmin::Anys &records - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->write_recordlist (reclist ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_availability_status (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (avail_stat.off_duty == 1) @@ -661,7 +661,7 @@ Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist void Log_i::set_record_attribute (DsLogAdmin::RecordId id, const DsLogAdmin::NVList &attr_list - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_DECL) + &attr_list ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint, @@ -701,7 +701,7 @@ Log_i::set_records_attribute (const char *grammar, DsLogAdmin::NVList* Log_i::get_record_attribute (DsLogAdmin::RecordId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidRecordId)) { @@ -724,7 +724,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (id); @@ -733,7 +733,7 @@ Log_i::copy (DsLogAdmin::LogId_out id DsLogAdmin::Log_ptr Log_i::copy_with_id (DsLogAdmin::LogId id - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Log_i::flush (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)) { @@ -769,7 +769,7 @@ Log_i::scheduled (void) void Log_i::check_grammar (const char* grammar - TAO_ENV_ARG_DECL) + ACE_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 79c5a90aae1..8bc620fc876 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 (TAO_ENV_SINGLE_ARG_DECL); + void init (ACE_ENV_SINGLE_ARG_DECL); // Initlialize the Log. // = DsLogAdmin::Log methods - DsLogAdmin::LogMgr_ptr my_factory (TAO_ENV_SINGLE_ARG_DECL) + DsLogAdmin::LogMgr_ptr my_factory (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the factory of the log - DsLogAdmin::LogId id (TAO_ENV_SINGLE_ARG_DECL) + DsLogAdmin::LogId id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the id of the log DsLogAdmin::QoSList* - get_qos (TAO_ENV_SINGLE_ARG_DECL) + get_qos (ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + get_max_record_life (ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Set the record life in seconds (0 infinite) CORBA::ULongLong - get_max_size (TAO_ENV_SINGLE_ARG_DECL) + get_max_size (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the maximum size in octets void set_max_size (CORBA::ULongLong size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidParam)); // Set the maximum size in octets. CORBA::ULongLong - get_current_size (TAO_ENV_SINGLE_ARG_DECL) + get_current_size (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the current size of the log in octets. CORBA::ULongLong - get_n_records (TAO_ENV_SINGLE_ARG_DECL) + get_n_records (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the number of records in the log DsLogAdmin::LogFullAction - get_log_full_action (TAO_ENV_SINGLE_ARG_DECL) + get_log_full_action (ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + get_administrative_state (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the administrative state of the log. void set_administrative_state (DsLogAdmin::AdministrativeState state - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Set the administrative state of the log. virtual DsLogAdmin::ForwardingState - get_forwarding_state (TAO_ENV_SINGLE_ARG_DECL) + get_forwarding_state (ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + get_operational_state (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the operational state of the log. DsLogAdmin::TimeInterval - get_interval (TAO_ENV_SINGLE_ARG_DECL) + get_interval (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the log duration void set_interval (const DsLogAdmin::TimeInterval & interval - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval)); // Set the log duration. DsLogAdmin::AvailabilityStatus - get_availability_status (TAO_ENV_SINGLE_ARG_DECL) + get_availability_status (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the availability status DsLogAdmin::CapacityAlarmThresholdList* - get_capacity_alarm_thresholds (TAO_ENV_SINGLE_ARG_DECL) + get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the capacity alarm threshold void set_capacity_alarm_thresholds (const DsLogAdmin::CapacityAlarmThresholdList & threshs - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + get_week_mask (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the weekly scheduling parameters void set_week_mask (const DsLogAdmin::WeekMask & masks - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidTime, DsLogAdmin::InvalidTimeInterval, @@ -206,7 +206,7 @@ public: query (const char * grammar, const char * c, DsLogAdmin::Iterator_out i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)); @@ -217,7 +217,7 @@ public: retrieve (DsLogAdmin::TimeT from_time, CORBA::Long how_many, DsLogAdmin::Iterator_out i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Retrieve <how_many> records from time <from_time> using iterator // <i>. @@ -225,7 +225,7 @@ public: CORBA::ULong match (const char * grammar, const char * c - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)); @@ -234,7 +234,7 @@ public: CORBA::ULong delete_records (const char * grammar, const char * c - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint)); @@ -242,14 +242,14 @@ public: CORBA::ULong delete_records_by_id (const DsLogAdmin::RecordIdList & ids - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Delete records matching ids in <ids> void write_records (const DsLogAdmin::Anys & records - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogFull, DsLogAdmin::LogLocked)); @@ -257,7 +257,7 @@ public: void write_recordlist (const DsLogAdmin::RecordList & list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::LogFull, DsLogAdmin::LogLocked)); @@ -267,7 +267,7 @@ public: void set_record_attribute (DsLogAdmin::RecordId id, const DsLogAdmin::NVList & attr_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidRecordId, DsLogAdmin::InvalidAttribute)); @@ -277,7 +277,7 @@ public: set_records_attribute (const char * grammar, const char * c, const DsLogAdmin::NVList & attr_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidGrammar, DsLogAdmin::InvalidConstraint, @@ -287,7 +287,7 @@ public: DsLogAdmin::NVList* get_record_attribute (DsLogAdmin::RecordId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidRecordId)); // Get the attributes of the record with id <id>. Raises @@ -295,21 +295,21 @@ public: DsLogAdmin::Log_ptr copy (DsLogAdmin::LogId_out id - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + flush (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::UnsupportedQoS)); // Causes all pending events to be written to storage. Raises @@ -321,17 +321,17 @@ protected: DsLogAdmin::RecordList* query_i (const char *constraint, DsLogAdmin::Iterator_out &iter_out, CORBA::ULong how_many - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidConstraint)); CORBA::ULong match_i (const char *constraint, CORBA::Boolean delete_rec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, DsLogAdmin::InvalidConstraint)); - void check_grammar (const char* grammar TAO_ENV_ARG_DECL) + void check_grammar (const char* grammar ACE_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 06d74819fb2..c3e9ae40930 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_Minimum_Dispersion_Strategy::replica (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { for ( ; ; ) @@ -84,7 +84,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { CORBA::Boolean non_existent = - object->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + object->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (!non_existent) { @@ -130,7 +130,7 @@ TAO_LB_Minimum_Dispersion_Strategy::remove (TAO_LB_ReplicaProxy *proxy) void TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->control_->high_load_advisory (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->control_->nominal_load_advisory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h index df4e679543c..938b7ba0ecc 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 (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Object_ptr replica (ACE_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 * - TAO_ENV_ARG_DECL); + ACE_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 1349a07e442..48c9d4c5713 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + context_->interface ()->_remove_ref (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); @@ -101,7 +101,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + destroy (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, @@ -185,11 +185,11 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var id = poa_->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa_->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 8881a030306..887fc9c034d 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 (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); // Returns the Default POA of this Servant object // = Idl methods. CORBA::Boolean next_one (CosNaming::Binding_out b - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + void destroy (ACE_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 98a689c88f7..9294d35a9ad 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp @@ -50,7 +50,7 @@ TAO_Hash_Naming_Context::_default_POA (void) CosNaming::NamingContext_ptr TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Naming context we will return. CosNaming::NamingContext_var result = @@ -69,12 +69,12 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name { // Resolve the name. CORBA::Object_var context = resolve (comp_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try narrowing object reference to the NamingContext type. result = CosNaming::NamingContext::_narrow (context.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::NotFound, ex) @@ -109,7 +109,7 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name void TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->get_context (n ACE_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 TAO_ENV_ARG_PARAMETER); + context->bind (simple_name, obj ACE_ENV_ARG_PARAMETER); ACE_CHECK; } // If we received a simple name, we need to bind it in this context. @@ -163,7 +163,7 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n, void TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + get_context (n ACE_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 TAO_ENV_ARG_PARAMETER); + context->rebind (simple_name, obj ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -219,7 +219,7 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n, void TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + get_context (n ACE_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 TAO_ENV_ARG_PARAMETER); + context->bind_context (simple_name, nc ACE_ENV_ARG_PARAMETER); ACE_CHECK; } // If we received a simple name, we need to bind it in this context. @@ -277,7 +277,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + get_context (n ACE_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 TAO_ENV_ARG_PARAMETER); + context->rebind_context (simple_name, nc ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -332,7 +332,7 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n, CORBA::Object_ptr TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -382,7 +382,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n { // Narrow to NamingContext. context = CosNaming::NamingContext::_narrow (result.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result._retn ()); } else @@ -416,7 +416,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n // If there are any exceptions, they will propagate up. return context->resolve (rest_of_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } } // If the name we had to resolve was simple, we just need to return @@ -426,7 +426,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n void TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + get_context (n ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name simple_name; simple_name.length (1); simple_name[0] = n[name_len - 1]; - context->unbind (simple_name TAO_ENV_ARG_PARAMETER); + context->unbind (simple_name ACE_ENV_ARG_PARAMETER); ACE_CHECK; } // If we received a simple name, we need to unbind it in this @@ -472,7 +472,7 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n CosNaming::NamingContext_ptr TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, @@ -491,7 +491,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n CosNaming::NamingContext::_nil (); // Create new context. - result = new_context (TAO_ENV_SINGLE_ARG_PARAMETER); + result = new_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); // Bind the new context to the name. @@ -499,7 +499,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n { bind_context (n, result.in () - TAO_ENV_ARG_PARAMETER); + ACE_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. { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY_EX(DESTROY) { - result->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + result->destroy (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Hash_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, @@ -563,7 +563,7 @@ TAO_Hash_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 c98b13d2b1a..448fff05a99 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -123,7 +123,7 @@ public: virtual void bind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL); + ACE_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>, @@ -134,7 +134,7 @@ public: virtual void rebind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL); + ACE_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 @@ -142,20 +142,20 @@ public: virtual void bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_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 @@ -163,19 +163,19 @@ public: // for "narrowing" the object to the appropriate type. virtual void unbind (const CosNaming::Name &n - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + virtual void destroy (ACE_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. @@ -190,7 +190,7 @@ protected: // = Helper method used by other methods. CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name - TAO_ENV_ARG_DECL); + ACE_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 ef214adf61c..7b83b34e9b3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -26,7 +26,7 @@ TAO_Naming_Context::~TAO_Naming_Context (void) } PortableServer::POA_ptr -TAO_Naming_Context::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) +TAO_Naming_Context::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) { return impl_->_default_POA (); } @@ -34,110 +34,110 @@ TAO_Naming_Context::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) void TAO_Naming_Context::bind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName, CosNaming::NamingContext::AlreadyBound)) { - impl_->bind (n, obj TAO_ENV_ARG_PARAMETER); + impl_->bind (n, obj ACE_ENV_ARG_PARAMETER); } void TAO_Naming_Context::rebind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - impl_->rebind (n, obj TAO_ENV_ARG_PARAMETER); + impl_->rebind (n, obj ACE_ENV_ARG_PARAMETER); } void TAO_Naming_Context::bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + impl_->bind_context (n, nc ACE_ENV_ARG_PARAMETER); } void TAO_Naming_Context::rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - impl_->rebind_context (n, nc TAO_ENV_ARG_PARAMETER); + impl_->rebind_context (n, nc ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr TAO_Naming_Context::resolve (const CosNaming::Name &n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - return impl_->resolve (n TAO_ENV_ARG_PARAMETER); + return impl_->resolve (n ACE_ENV_ARG_PARAMETER); } void TAO_Naming_Context::unbind (const CosNaming::Name &n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, CosNaming::NamingContext::InvalidName)) { - impl_->unbind (n TAO_ENV_ARG_PARAMETER); + impl_->unbind (n ACE_ENV_ARG_PARAMETER); } CosNaming::NamingContext_ptr -TAO_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL) +TAO_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return impl_->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl_->new_context (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNaming::NamingContext_ptr TAO_Naming_Context::bind_new_context (const CosNaming::Name &n - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + return impl_->bind_new_context (n ACE_ENV_ARG_PARAMETER); } void -TAO_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotEmpty)) { - impl_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); } void TAO_Naming_Context::list (CORBA::ULong how_many, CosNaming::BindingList_out bl, CosNaming::BindingIterator_out bi - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - impl_->list (how_many, bl, bi TAO_ENV_ARG_PARAMETER); + impl_->list (how_many, bl, bi ACE_ENV_ARG_PARAMETER); } void @@ -173,7 +173,7 @@ to_string_helper_assign (char * &k, const char * &src) char * TAO_Naming_Context::to_string (const CosNaming::Name &n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)) { @@ -289,7 +289,7 @@ to_name_helper (char *dest, const char*& src) CosNaming::Name * TAO_Naming_Context::to_name (const char *sn - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)) { @@ -408,7 +408,7 @@ size_t TAO_Naming_Context::to_url_validate_and_compute_size ( const char *addr, const char *sn - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { size_t addr_len = ACE_OS_String::strlen (addr); @@ -439,7 +439,7 @@ TAO_Naming_Context::to_url_validate_and_compute_size ( char * TAO_Naming_Context::to_url (const char * addr, const char * sn - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContextExt::InvalidAddress, CosNaming::NamingContext::InvalidName)) @@ -447,7 +447,7 @@ TAO_Naming_Context::to_url (const char * addr, /// 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -510,7 +510,7 @@ TAO_Naming_Context::to_url (const char * addr, CORBA::Object_ptr TAO_Naming_Context::resolve_str (const char * n - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -521,11 +521,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 TAO_ENV_ARG_PARAMETER); + CosNaming::Name_var name = this->to_name (n ACE_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 () TAO_ENV_ARG_PARAMETER); + return this->resolve (name.in () ACE_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 7168ed8deb4..e7ffff27984 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -55,7 +55,7 @@ public: virtual void bind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -72,7 +72,7 @@ public: virtual void rebind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -85,7 +85,7 @@ public: virtual void bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -98,7 +98,7 @@ public: virtual void rebind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -108,7 +108,7 @@ public: // names are passed. virtual CORBA::Object_ptr resolve (const CosNaming::Name &n - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -120,7 +120,7 @@ public: // for "narrowing" the object to the appropriate type. virtual void unbind (const CosNaming::Name &n - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::CannotProceed, @@ -131,7 +131,7 @@ public: // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>) virtual CosNaming::NamingContext_ptr new_context ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation returns a new naming context implemented by the @@ -140,7 +140,7 @@ public: virtual CosNaming::NamingContext_ptr bind_new_context ( const CosNaming::Name &n - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::NotFound, CosNaming::NamingContext::AlreadyBound, @@ -153,7 +153,7 @@ public: // bound (the name argument excluding the last component). - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_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 @@ -166,7 +166,7 @@ public: virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out bl, CosNaming::BindingIterator_out bi - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns at most the requested number of bindings <how_many> in @@ -175,7 +175,7 @@ public: // not contain any additional bindings <bi> returned as null. virtual char * to_string (const CosNaming::Name &n - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)); // Stringify the name using '\' as the escape character. The @@ -184,7 +184,7 @@ public: // an InvalidName exception is to be raised. virtual CosNaming::Name * to_name (const char *sn - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosNaming::NamingContext::InvalidName)); // The in parameter is an stringified name. This function removes the @@ -193,7 +193,7 @@ public: virtual char * to_url ( const char * addr, const char * sn - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -206,7 +206,7 @@ public: // iiopname://1.1@myhost.555xyz.com:9999/a/b/c virtual CORBA::Object_ptr resolve_str (const char * n - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -220,7 +220,7 @@ public: // It accepts a strigified name as an argument instead of a Name. - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Returns the Default POA of this Servant object private: @@ -252,7 +252,7 @@ private: static size_t to_url_validate_and_compute_size (const char *add, const char *sn - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Validate the to_url() method input, and compute the size of the // returned URL address. @@ -281,7 +281,7 @@ public: virtual void bind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) = 0; + ACE_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>, @@ -292,7 +292,7 @@ public: virtual void rebind (const CosNaming::Name &n, CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) = 0; + ACE_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 @@ -300,20 +300,20 @@ public: virtual void bind_context (const CosNaming::Name &n, CosNaming::NamingContext_ptr nc - TAO_ENV_ARG_DECL) = 0; + ACE_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 - TAO_ENV_ARG_DECL) = 0; + ACE_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 - TAO_ENV_ARG_DECL) = 0; + ACE_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 @@ -321,24 +321,24 @@ public: // for "narrowing" the object to the appropriate type. virtual void unbind (const CosNaming::Name &n - TAO_ENV_ARG_DECL) = 0; + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual CosNaming::NamingContext_ptr new_context (ACE_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 - TAO_ENV_ARG_DECL) = 0; + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual void destroy (ACE_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. @@ -349,7 +349,7 @@ public: virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, CosNaming::BindingIterator_out &bi - TAO_ENV_ARG_DECL) = 0; + ACE_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 1e12d7b1383..9f39cd79c65 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[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This function call initializes the Naming Service CORBA::Object_var object = - this->create_object (orb.in (), argc, argv TAO_ENV_ARG_PARAMETER); + this->create_object (orb.in (), argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -63,7 +63,7 @@ TAO_Naming_Loader::fini (void) CORBA::Object_ptr TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, int argc, char *argv[] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 61e0066a192..1f1730bf81e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h @@ -46,7 +46,7 @@ public: // ORB and the command line parameters. CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_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 63ad2be955f..f3c19c757ee 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp @@ -77,14 +77,14 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb, { if (resolve_for_existing_naming_service) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Try to find an existing Naming Service. CORBA::Object_var naming_obj = orb->resolve_initial_references ("NameService", timeout - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (naming_obj.in ())) @@ -98,12 +98,12 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb, this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->naming_service_ior_ = orb->object_to_string (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -202,7 +202,7 @@ TAO_Naming_Server::init_with_orb (int argc, { int result; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Duplicate the ORB @@ -210,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" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -222,15 +222,15 @@ TAO_Naming_Server::init_with_orb (int argc, // Get the POA object. this->root_poa_ = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_Manager. PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies (2); @@ -239,13 +239,13 @@ TAO_Naming_Server::init_with_orb (int argc, // Id Assignment policy policies[0] = this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan policy policies[1] = this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We use a different POA, otherwise the user would have to change @@ -253,7 +253,7 @@ TAO_Naming_Server::init_with_orb (int argc, this->ns_poa_ = this->root_poa_->create_POA ("NameService", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_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; @@ -264,7 +264,7 @@ TAO_Naming_Server::init_with_orb (int argc, ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -328,7 +328,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, size_t context_size, int enable_multicast) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (persistence_location != 0) @@ -364,7 +364,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, TAO_Transient_Naming_Context::make_new_context (poa, TAO_ROOT_NAMING_CONTEXT, context_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -372,15 +372,15 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, // Set the ior of the root Naming Context. this->naming_service_ior_= orb->object_to_string (this->naming_context_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var table_object = - orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { @@ -390,9 +390,9 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, { CORBA::String_var ior = orb->object_to_string (this->naming_context_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - adapter->bind ("NameService", ior.in () TAO_ENV_ARG_PARAMETER); + adapter->bind ("NameService", ior.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -492,17 +492,17 @@ TAO_Naming_Server::fini (void) // the Naming Service ACE_TRY_NEW_ENV { - this->ns_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + this->ns_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var table_object = this->orb_->resolve_initial_references ("IORTable" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); + IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { @@ -510,7 +510,7 @@ TAO_Naming_Server::fini (void) } else { - adapter->unbind ("NameService" TAO_ENV_ARG_PARAMETER); + adapter->unbind ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -564,11 +564,11 @@ int TAO_Naming_Client::init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService", timeout TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService", timeout ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -577,7 +577,7 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb, -1); this->naming_context_ = CosNaming::NamingContext::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 1fe01ea657a..4f14bdb4697 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. { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; this->root_context_ = TAO_Persistent_Naming_Context::make_new_context (poa_.in (), TAO_ROOT_NAMING_CONTEXT, context_size, this - TAO_ENV_ARG_PARAMETER); + ACE_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. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId (entry->ext_id_.poa_id_); this->poa_->activate_object_with_id (id.in (), context - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - CosNaming::NamingContext_var result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + CosNaming::NamingContext_var result = context->_this (ACE_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 43567878765..ce6379ec9b3 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 { - TAO_ENV_DECLARE_NEW_ENV; - obj = orb_->string_to_object (entry.ref_ TAO_ENV_ARG_PARAMETER); + ACE_DECLARE_NEW_CORBA_ENV; + obj = orb_->string_to_object (entry.ref_ ACE_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). - TAO_ENV_DECLARE_NEW_ENV; - CORBA::String_var ref = orb_->object_to_string (obj TAO_ENV_ARG_PARAMETER); + ACE_DECLARE_NEW_CORBA_ENV; + CORBA::String_var ref = orb_->object_to_string (obj ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Calculate and allocate the memory we need to store this name to @@ -323,7 +323,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa, const char *poa_id, size_t context_size, TAO_Persistent_Context_Index * ind - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Store the stub we will return here. CosNaming::NamingContext_var result; @@ -377,10 +377,10 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa, poa->activate_object_with_id (id.in (), context - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result._retn ()); - result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + result = context->_this (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Persistent_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, @@ -416,7 +416,7 @@ TAO_Persistent_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL) poa_id, this->persistent_context_->total_size (), this->index_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); return result._retn (); @@ -426,7 +426,7 @@ void TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, CosNaming::BindingIterator_out &bi - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + interface_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Register with the POA. @@ -529,10 +529,10 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, this->poa_->activate_object_with_id (id.in (), bind_iter - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - bi = bind_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + bi = bind_iter->_this (ACE_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 80be98ec6e5..970c52cad66 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h @@ -180,7 +180,7 @@ public: const char *poa_id, size_t context_size, TAO_Persistent_Context_Index *ind - TAO_ENV_ARG_DECL); + ACE_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,7 +189,7 @@ public: // = Methods not implemented in TAO_Hash_Naming_Context. - virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL); + virtual CosNaming::NamingContext_ptr new_context (ACE_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. @@ -197,7 +197,7 @@ public: virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, CosNaming::BindingIterator_out &bi - TAO_ENV_ARG_DECL); + ACE_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 14a4cf459a7..10c23a9165c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -142,7 +142,7 @@ CosNaming::NamingContext_ptr TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa, const char *poa_id, size_t context_size - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Store the stub we will return here. CosNaming::NamingContext_var result; @@ -181,17 +181,17 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa, poa->activate_object_with_id (id.in (), context - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (result._retn ()); - result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); return result._retn (); } CosNaming::NamingContext_ptr -TAO_Transient_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL) +TAO_Transient_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, @@ -217,7 +217,7 @@ TAO_Transient_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL) make_new_context (this->poa_.in (), poa_id, this->transient_context_->total_size () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); return result._retn (); @@ -227,7 +227,7 @@ void TAO_Transient_Naming_Context::list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, CosNaming::BindingIterator_out &bi - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + interface_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Register with the POA. @@ -330,10 +330,10 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, this->poa_->activate_object_with_id (id.in (), bind_iter - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - bi = bind_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + bi = bind_iter->_this (ACE_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 31912db4da8..3af69ee0ec8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h @@ -140,7 +140,7 @@ public: static CosNaming::NamingContext_ptr make_new_context (PortableServer::POA_ptr poa, const char *poa_id, size_t context_size - TAO_ENV_ARG_DECL); + ACE_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,7 +149,7 @@ public: // = Methods not implemented in TAO_Hash_Naming_Context. - virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL); + virtual CosNaming::NamingContext_ptr new_context (ACE_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. @@ -157,7 +157,7 @@ public: virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, CosNaming::BindingIterator_out &bi - TAO_ENV_ARG_DECL); + ACE_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 f9c8e8a468f..727cd0d066a 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_AdminProperties::get_admin (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -55,7 +55,7 @@ TAO_Notify_AdminProperties::get_admin (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_AdminProperties::set_admin (const CosNotification::AdminProperties & admin TAO_ENV_ARG_DECL) +TAO_Notify_AdminProperties::set_admin (const CosNotification::AdminProperties & admin ACE_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 cd6ae6339b3..eb6345201b1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h @@ -46,7 +46,7 @@ public: virtual ~TAO_Notify_AdminProperties (); virtual CosNotification::AdminProperties * get_admin ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -54,7 +54,7 @@ public: virtual void set_admin ( const CosNotification::AdminProperties & admin - TAO_ENV_ARG_DECL + ACE_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 36df545efc1..16db407d876 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp @@ -27,7 +27,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 TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/, ACE_Time_Value *tv) +TAO_Notify_Buffering_Strategy::execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/, ACE_Time_Value *tv) { // use_max_queue_ may be set to 0. If max_events_per_consumer_ is // 0, then we are going to use the maximum queue length regardless. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h index a5cfba96459..2ad9e86908d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h @@ -47,7 +47,7 @@ public: virtual ~TAO_Notify_Buffering_Strategy (); - virtual void execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv); + virtual void execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb ACE_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 b8df19fd784..8aba476a6d2 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 TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent ACE_ENV_ARG_DECL)=0; // Create an Event Channel. - virtual TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL)=0; // Create a Consumer Admin. - virtual TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL)=0; // Create a Supplier Admin. - virtual TAO_Notify_FilterFactory_i* create_filter_factory (TAO_ENV_SINGLE_ARG_DECL)=0; + virtual TAO_Notify_FilterFactory_i* create_filter_factory (ACE_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 TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL)=0; // Create a Structured ProxyPushSupplier. - virtual TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL)=0; // Create a Sequence ProxyPushSupplier. - virtual TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL)=0; // Create a ProxyPushSupplier. - virtual TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL)=0; // Create a Structured ProxyPushConsumer. - virtual TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL)=0; // Create a Sequence ProxyPushConsumer. - virtual TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0; + virtual TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL)=0; // Create a ProxyPushConsumer. //= Locks // = Methods to create locks. - virtual ACE_Lock* create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL)=0; + virtual ACE_Lock* create_channel_factory_lock (ACE_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by channel factory. - virtual ACE_Lock* create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL)=0; + virtual ACE_Lock* create_event_channel_lock (ACE_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by EC's. - virtual ACE_Lock* create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL)=0; + virtual ACE_Lock* create_consumer_admin_lock (ACE_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by Consumer Admin's. - virtual ACE_Lock* create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL)=0; + virtual ACE_Lock* create_supplier_admin_lock (ACE_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by Supplier Admin's. - virtual ACE_Lock* create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL)=0; + virtual ACE_Lock* create_proxy_supplier_lock (ACE_ENV_SINGLE_ARG_DECL)=0; // Create lock type used by proxy supplier. - virtual ACE_Lock* create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL)=0; + virtual ACE_Lock* create_proxy_consumer_lock (ACE_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 ee8f631d50b..ccd18699281 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 TAO_ENV_ARG_DECL) +TAO_Notify_Shutdown_Worker::work (TAO_Notify_EventListener* listener ACE_ENV_ARG_DECL) { - listener->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + listener->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } /********************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h index 046ed275efd..1b2717ecb17 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 TAO_ENV_ARG_DECL); + void work (TAO_Notify_EventListener* listener ACE_ENV_ARG_DECL); }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h index 54fa37c4495..4a2b0664811 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 (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual TAO_Notify_EventListener_List* create_event_listener_list (ACE_ENV_SINGLE_ARG_DECL) = 0; // Create the event listener list. - virtual TAO_Notify_UpdateListener_List* create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual TAO_Notify_UpdateListener_List* create_update_listener_list (ACE_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 ec7cca5e588..21e24ff0f50 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h @@ -50,7 +50,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 (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual int execute (ACE_ENV_SINGLE_ARG_DECL) = 0; // Command callback virtual CORBA::Short priority (void) const; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp index 55ecf32f9aa..70cca1e06f0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp @@ -16,7 +16,7 @@ TAO_Notify_Constraint_Interpreter::~TAO_Notify_Constraint_Interpreter (void) void TAO_Notify_Constraint_Interpreter::build_tree ( const char *constraints - TAO_ENV_ARG_DECL + ACE_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 ca8274732b5..31e4eb5c4e5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h @@ -32,7 +32,7 @@ class TAO_Notify_Constraint_Visitor; -class TAO_Notify_Export TAO_Notify_Constraint_Interpreter +class TAO_Notify_Export TAO_Notify_Constraint_Interpreter : public TAO_ETCL_Interpreter { // @@ -49,7 +49,7 @@ public: // Destructor void build_tree (const char* constraints - TAO_ENV_ARG_DECL) + ACE_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_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index 19bb5ca02ef..bc1882ea915 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -15,7 +15,7 @@ TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void) { } -int +int TAO_Notify_Constraint_Visitor::bind_structured_event ( const CosNotification::StructuredEvent &s_event ) @@ -29,14 +29,14 @@ TAO_Notify_Constraint_Visitor::bind_structured_event ( int status = this->property_lookup_.bind ( name_str, - ACE_const_cast (CORBA::Any *, + ACE_const_cast (CORBA::Any *, &s_event.filterable_data[index].value) ); if (status != 0) { return 1; - } + } } return 0; @@ -75,7 +75,7 @@ TAO_Notify_Constraint_Visitor::visit_literal ( return 0; } -int +int TAO_Notify_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident) { int return_value = -1; @@ -96,7 +96,7 @@ TAO_Notify_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident) return return_value; } -int +int TAO_Notify_Constraint_Visitor::visit_union_value ( TAO_ETCL_Union_Value *union_value ) @@ -119,7 +119,7 @@ TAO_Notify_Constraint_Visitor::visit_union_value ( return 0; } -int +int TAO_Notify_Constraint_Visitor::visit_union_pos ( TAO_ETCL_Union_Pos *union_pos ) @@ -134,7 +134,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( TAO_DynUnion_i dyn_union; dyn_union.init (this->current_member_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_var tc = this->current_member_->type (); @@ -146,12 +146,12 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( case TAO_ETCL_UNSIGNED: { CORBA::Any disc_any; - CORBA::TypeCode_var disc_tc = - tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var disc_tc = + tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::TCKind disc_kind = + CORBA::TCKind disc_kind = TAO_DynAnyFactory::unalias (disc_tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; switch (disc_kind) @@ -194,16 +194,16 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( DynamicAny::DynAny_var dyn_any = TAO_DynAnyFactory::make_dyn_any (disc_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; dyn_union.set_discriminator (dyn_any.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAny_var u_member = - dyn_union.member (TAO_ENV_SINGLE_ARG_PARAMETER); + dyn_union.member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->current_member_ = - u_member->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_member_ = + u_member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -211,8 +211,8 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( case TAO_ETCL_STRING: { const char *name = (const char *) disc_val; - CORBA::ULong count = - tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong count = + tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; const char *member_name = 0; @@ -221,7 +221,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( for (i = 0; i < count; ++i) { member_name = tc->member_name (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (name, member_name) == 0) @@ -230,16 +230,16 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( } } - // If there's no match, member_label will throw + // If there's no match, member_label will throw // CORBA::TypeCode::Bounds and the catch block will // return -1; - this->current_member_ = tc->member_label (i - TAO_ENV_ARG_PARAMETER); + this->current_member_ = tc->member_label (i + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; } - // The TAO_ETCL_Union_Value that was put on the queue + // The TAO_ETCL_Union_Value that was put on the queue // shouldn't have any other type. default: return -1; @@ -274,7 +274,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( ACE_ENDTRY; } -int +int TAO_Notify_Constraint_Visitor::visit_component_pos ( TAO_ETCL_Component_Pos *pos ) @@ -286,7 +286,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( // component as found in property_lookup_ will be in current_member_. CORBA::TypeCode_var tc = this->current_member_->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAny_var member; @@ -299,11 +299,11 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( { TAO_DynEnum_i dyn_enum; dyn_enum.init (this->current_member_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; success = dyn_enum.seek (slot - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (success == 0) @@ -311,8 +311,8 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( return -1; } - member = - dyn_enum.current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + member = + dyn_enum.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -321,11 +321,11 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( { TAO_DynStruct_i dyn_struct; dyn_struct.init (this->current_member_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; success = dyn_struct.seek (slot - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (success == 0) @@ -333,7 +333,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( return -1; } - member = dyn_struct.current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + member = dyn_struct.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -345,7 +345,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( return -1; } - CORBA::Any_var value = member->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_ETCL_Constraint *comp = pos->component (); @@ -369,7 +369,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( ACE_ENDTRY; } -int +int TAO_Notify_Constraint_Visitor::visit_component_assoc ( TAO_ETCL_Component_Assoc *assoc ) @@ -379,7 +379,7 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc ( // no way that TAO can put one into the event's filterable data. // However, from the looks of the ETCL grammar, I believe that a // contruct like 'exist $(foo)' is legal, and is in effect using - // the event's filterable data as one big NVList. It is + // the event's filterable data as one big NVList. It is // equivalent to '$.foo'. I've implemented this method on that // basis, while keeping in mind that a clearer interpretation of // the spec may come along someday. @@ -413,7 +413,7 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc ( } } -int +int TAO_Notify_Constraint_Visitor::visit_component_array ( TAO_ETCL_Component_Array *array ) @@ -425,7 +425,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array ( // component as found in property_lookup_ will be in current_member_. CORBA::TypeCode_var tc = this->current_member_->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAny_var member; @@ -438,11 +438,11 @@ TAO_Notify_Constraint_Visitor::visit_component_array ( { TAO_DynEnum_i dyn_array; dyn_array.init (this->current_member_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; success = dyn_array.seek (slot - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (success == 0) @@ -450,7 +450,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array ( return -1; } - member = dyn_array.current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + member = dyn_array.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -459,11 +459,11 @@ TAO_Notify_Constraint_Visitor::visit_component_array ( { TAO_DynStruct_i dyn_sequence; dyn_sequence.init (this->current_member_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; success = dyn_sequence.seek (slot - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (success == 0) @@ -471,8 +471,8 @@ TAO_Notify_Constraint_Visitor::visit_component_array ( return -1; } - member = - dyn_sequence.current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + member = + dyn_sequence.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -483,7 +483,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array ( return -1; } - CORBA::Any_var value = member->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_ETCL_Constraint *comp = array->component (); @@ -507,7 +507,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array ( ACE_ENDTRY; } -int +int TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) { ACE_DECLARE_NEW_CORBA_ENV; @@ -522,7 +522,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) // If the TCKind is not a sequence or an array, the // call to length() will raise an exception, and the // catch block will return -1; - CORBA::ULong length = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_ETCL_Literal_Constraint lit (length); @@ -536,14 +536,14 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) // catch block will return -1; TAO_DynUnion_i dyn_union; dyn_union.init (this->current_member_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::DynAny_var disc = - dyn_union.get_discriminator (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var disc = + dyn_union.get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Any_var disc_any = disc->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_ETCL_Literal_Constraint lit (disc_any); @@ -552,7 +552,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) } case TAO_ETCL_TYPE_ID: { - const char *name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_ETCL_Literal_Constraint lit (name); @@ -561,7 +561,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) } case TAO_ETCL_REPOS_ID: { - const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); + const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_ETCL_Literal_Constraint lit (id); @@ -579,7 +579,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) ACE_ENDTRY; } -int +int TAO_Notify_Constraint_Visitor::visit_component ( TAO_ETCL_Component *component ) @@ -611,7 +611,7 @@ TAO_Notify_Constraint_Visitor::visit_component ( } } -int +int TAO_Notify_Constraint_Visitor::visit_dot (TAO_ETCL_Dot *dot) { // If we are here, we know we're headed for a more nested @@ -620,7 +620,7 @@ TAO_Notify_Constraint_Visitor::visit_dot (TAO_ETCL_Dot *dot) return dot->component ()->accept (this); } -int +int TAO_Notify_Constraint_Visitor::visit_eval (TAO_ETCL_Eval *eval) { // Nothing to do but visit the contained component. @@ -649,7 +649,7 @@ TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def) // If the current member is not a union, this call will // throw BadKind and the catch block will return -1. - CORBA::Long default_index = tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long default_index = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // No default index. @@ -674,11 +674,11 @@ TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def) ACE_ENDTRY; } -int +int TAO_Notify_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist) { TAO_ETCL_Constraint *component = exist->component (); - + if (component->accept (this) == 0) { TAO_ETCL_Literal_Constraint top; @@ -698,7 +698,7 @@ TAO_Notify_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist) return -1; } -int +int TAO_Notify_Constraint_Visitor::visit_unary_expr ( TAO_ETCL_Unary_Expr *unary_expr ) @@ -739,7 +739,7 @@ TAO_Notify_Constraint_Visitor::visit_unary_expr ( return -1; } -int +int TAO_Notify_Constraint_Visitor::visit_binary_expr ( TAO_ETCL_Binary_Expr *binary_expr ) @@ -773,7 +773,7 @@ TAO_Notify_Constraint_Visitor::visit_binary_expr ( } } -int +int TAO_Notify_Constraint_Visitor::visit_or ( TAO_ETCL_Binary_Expr *binary ) @@ -815,7 +815,7 @@ TAO_Notify_Constraint_Visitor::visit_or ( return return_value; } -int +int TAO_Notify_Constraint_Visitor::visit_and ( TAO_ETCL_Binary_Expr *binary ) @@ -928,7 +928,7 @@ TAO_Notify_Constraint_Visitor::visit_binary_op ( return return_value; } -int +int TAO_Notify_Constraint_Visitor::visit_twiddle ( TAO_ETCL_Binary_Expr *binary ) @@ -958,7 +958,7 @@ TAO_Notify_Constraint_Visitor::visit_twiddle ( return return_value; } -int +int TAO_Notify_Constraint_Visitor::visit_in ( TAO_ETCL_Binary_Expr *binary ) @@ -990,7 +990,7 @@ TAO_Notify_Constraint_Visitor::visit_in ( { CORBA::TypeCode_var tc = component->type (); kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1004,23 +1004,23 @@ TAO_Notify_Constraint_Visitor::visit_in ( switch (kind) { case CORBA::tk_sequence: - result = this->sequence_does_contain (component, + result = this->sequence_does_contain (component, left); break; case CORBA::tk_array: - result = this->array_does_contain (component, + result = this->array_does_contain (component, left); break; case CORBA::tk_struct: - result = this->struct_does_contain (component, + result = this->struct_does_contain (component, left); break; case CORBA::tk_union: - result = this->union_does_contain (component, + result = this->union_does_contain (component, left); break; case CORBA::tk_any: - result = this->any_does_contain (component, + result = this->any_does_contain (component, left); break; default: @@ -1036,7 +1036,7 @@ TAO_Notify_Constraint_Visitor::visit_in ( return return_value; } -int +int TAO_Notify_Constraint_Visitor::visit_preference ( TAO_ETCL_Preference * ) @@ -1059,7 +1059,7 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain ( { CORBA::TypeCode_var type = any->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The literal and the array elements must be @@ -1073,12 +1073,12 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain ( } TAO_DynSequence_i dyn_seq; - dyn_seq.init (*any - TAO_ENV_ARG_PARAMETER); + dyn_seq.init (*any + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::AnySeq_var any_seq = - dyn_seq.get_elements (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::AnySeq_var any_seq = + dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong length = any_seq->length (); @@ -1100,7 +1100,7 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain ( ACE_ENDTRY; return 0; -} +} CORBA::Boolean TAO_Notify_Constraint_Visitor::array_does_contain ( @@ -1113,7 +1113,7 @@ TAO_Notify_Constraint_Visitor::array_does_contain ( { CORBA::TypeCode_var type = any->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The literal and the array elements must be @@ -1127,12 +1127,12 @@ TAO_Notify_Constraint_Visitor::array_does_contain ( } TAO_DynArray_i dyn_array; - dyn_array.init (*any - TAO_ENV_ARG_PARAMETER); + dyn_array.init (*any + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::AnySeq_var any_seq = - dyn_array.get_elements (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::AnySeq_var any_seq = + dyn_array.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong length = any_seq->length (); @@ -1167,11 +1167,11 @@ TAO_Notify_Constraint_Visitor::struct_does_contain ( { TAO_DynStruct_i dyn_struct; dyn_struct.init (*any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::NameValuePairSeq_var members = - dyn_struct.get_members (TAO_ENV_SINGLE_ARG_PARAMETER); + dyn_struct.get_members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong length = members->length (); @@ -1182,7 +1182,7 @@ TAO_Notify_Constraint_Visitor::struct_does_contain ( { tc = members[i].value.type (); kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The literal and the struct member must be @@ -1222,20 +1222,20 @@ TAO_Notify_Constraint_Visitor::union_does_contain ( ACE_TRY { TAO_DynUnion_i dyn_union; - dyn_union.init (*any - TAO_ENV_ARG_PARAMETER); + dyn_union.init (*any + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::DynAny_var cc = - dyn_union.current_component (TAO_ENV_SINGLE_ARG_PARAMETER); + DynamicAny::DynAny_var cc = + dyn_union.current_component (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - - CORBA::Any_var member = cc->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + + CORBA::Any_var member = cc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::TypeCode_var tc = member->type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The literal and the union member must be @@ -1287,21 +1287,21 @@ TAO_Notify_Constraint_Visitor::simple_type_match (int expr_type, return 0; } case TAO_ETCL_DOUBLE: - if (tc_kind != CORBA::tk_double + if (tc_kind != CORBA::tk_double && tc_kind != CORBA::tk_float) { return 0; } case TAO_ETCL_INTEGER: case TAO_ETCL_SIGNED: - if (tc_kind != CORBA::tk_short + if (tc_kind != CORBA::tk_short && tc_kind != CORBA::tk_long && tc_kind != CORBA::tk_longlong) { return 0; } case TAO_ETCL_UNSIGNED: - if (tc_kind != CORBA::tk_ushort + if (tc_kind != CORBA::tk_ushort && tc_kind != CORBA::tk_ulong && tc_kind != CORBA::tk_ulonglong) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp index 5653d01839a..d73d7d209e8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp @@ -87,32 +87,32 @@ TAO_Notify_ConsumerAdmin_i::_decr_refcnt (void) } void -TAO_Notify_ConsumerAdmin_i::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_ConsumerAdmin_i::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) { this->_incr_refcnt (); } void -TAO_Notify_ConsumerAdmin_i::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_ConsumerAdmin_i::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) { this->_decr_refcnt (); } void -TAO_Notify_ConsumerAdmin_i::dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::dispatch_event (TAO_Notify_Event &event ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->for_each (&worker ACE_ENV_ARG_PARAMETER); } CORBA::Boolean -TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean /*eval_parent*/ TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean /*eval_parent*/ ACE_ENV_ARG_DECL) { CORBA::Boolean bval = - this->get_filter_admin ().match (event TAO_ENV_ARG_PARAMETER); + this->get_filter_admin ().match (event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if ((bval == 1 && this->filter_operator_ == CosNotifyChannelAdmin::AND_OP) || @@ -125,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 TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->for_each (&worker ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Propogate the filter command. @@ -138,7 +138,7 @@ TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boo // OR we could instead do: // - // this->dispatch_event (event TAO_ENV_ARG_PARAMETER); + // this->dispatch_event (event ACE_ENV_ARG_PARAMETER); // return 0; // // This will short circuit a few steps, because the event processor is going to @@ -160,24 +160,24 @@ void TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator, PortableServer::POA_ptr my_POA - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { my_POA_ = PortableServer::POA::_duplicate (my_POA); this->lock_ = - this->channel_objects_factory_->create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_objects_factory_->create_consumer_admin_lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_pushsupplier_POA_ = this->poa_factory_-> create_proxy_pushsupplier_POA (this->my_POA_.in (), my_id - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_factory_->create_event_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the task to forward filtering/dispatching commands to: @@ -185,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + /*this->event_manager_objects_factory_->create_dispatching_task (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; */ this->filter_eval_task_ = new TAO_Notify_Worker_Task (); - // this->event_manager_objects_factory_->create_listener_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER); + // this->event_manager_objects_factory_->create_listener_eval_task (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -221,7 +221,7 @@ TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, } void -TAO_Notify_ConsumerAdmin_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) { CosNotification::EventTypeSeq removed; @@ -234,50 +234,50 @@ TAO_Notify_ConsumerAdmin_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL) this->subscription_list_.populate (removed); this->event_manager_->subscribe_for_events (this, - added, removed TAO_ENV_ARG_PARAMETER); + added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate ourselves this->poa_factory_->deactivate_object (this, this->my_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // shutdown proxy's. TAO_Notify_Shutdown_Worker shutdown_worker; - this->event_listener_list_->for_each (&shutdown_worker TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->for_each (&shutdown_worker ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->event_listener_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_listener_list_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->poa_factory_->destroy_POA (this->proxy_pushsupplier_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->dispatching_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_eval_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_ConsumerAdmin_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // unregister from EC - this->event_channel_->unregister_listener (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->unregister_listener (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_ConsumerAdmin_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER); } TAO_Notify_Worker_Task* @@ -293,14 +293,14 @@ TAO_Notify_ConsumerAdmin_i::filter_eval_task (void) } void -TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType )) { this->event_manager_->subscribe_for_events (this, //*this->event_listener_list_, - added, removed TAO_ENV_ARG_PARAMETER); + added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, @@ -314,15 +314,15 @@ TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTyp } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_ConsumerAdmin_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::get_ref (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var obj = this->poa_factory_-> - servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER); + servant_to_reference (this->my_POA_.in (), this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_Notify_Event_Manager* @@ -338,30 +338,30 @@ TAO_Notify_ConsumerAdmin_i::get_filter_admin (void) } void -TAO_Notify_ConsumerAdmin_i::register_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::register_listener (TAO_Notify_EventListener *listener ACE_ENV_ARG_DECL) { // register it. - this->event_listener_list_->connected (listener TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->connected (listener ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_ConsumerAdmin_i::unregister_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::unregister_listener (TAO_Notify_EventListener *listener ACE_ENV_ARG_DECL) { - this->event_listener_list_->disconnected (listener TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->disconnected (listener ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_ConsumerAdmin_i::deactivate_proxy_pushsupplier (PortableServer::Servant servant TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::deactivate_proxy_pushsupplier (PortableServer::Servant servant ACE_ENV_ARG_DECL) { this->poa_factory_-> deactivate_object (servant, this->proxy_pushsupplier_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::AdminID -TAO_Notify_ConsumerAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_ConsumerAdmin_i::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -370,16 +370,16 @@ TAO_Notify_ConsumerAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SING } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_ConsumerAdmin_i::MyChannel (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::MyChannel (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return event_channel_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return event_channel_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_ConsumerAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_ConsumerAdmin_i::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -388,16 +388,16 @@ TAO_Notify_ConsumerAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_EN } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_ConsumerAdmin_i::push_suppliers (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::push_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->proxy_pushsupplier_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->proxy_pushsupplier_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::ProxySupplier_ptr -TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ProxyNotFound @@ -406,73 +406,73 @@ 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 () - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { TAO_Notify_StructuredProxyPushSupplier_i* struct_proxy_pushsupplier = this->channel_objects_factory_->create_struct_proxy_pushsupplier (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushsupplier_var (struct_proxy_pushsupplier); - struct_proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER); + struct_proxy_pushsupplier->init (proxy_id ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_ConsumerAdmin_i::obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { TAO_Notify_SequenceProxyPushSupplier_i* seq_proxy_pushsupplier = this->channel_objects_factory_->create_seq_proxy_pushsupplier (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushsupplier_var (seq_proxy_pushsupplier); - seq_proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER); + seq_proxy_pushsupplier->init (proxy_id ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_ConsumerAdmin_i::obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { TAO_Notify_ProxyPushSupplier_i* proxy_pushsupplier = - this->channel_objects_factory_->create_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER); + this->channel_objects_factory_->create_proxy_pushsupplier (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushsupplier_var (proxy_pushsupplier); - proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER); + proxy_pushsupplier->init (proxy_id ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::ProxySupplier_ptr -TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminLimitExceeded @@ -492,13 +492,13 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelA { case CosNotifyChannelAdmin::ANY_EVENT: { - obj = this->obtain_proxy_pushsupplier_i (proxy_id TAO_ENV_ARG_PARAMETER); + obj = this->obtain_proxy_pushsupplier_i (proxy_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); } break; case CosNotifyChannelAdmin::STRUCTURED_EVENT: { - obj = this->obtain_struct_proxy_pushsupplier_i (proxy_id TAO_ENV_ARG_PARAMETER); + obj = this->obtain_struct_proxy_pushsupplier_i (proxy_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); } break; @@ -506,7 +506,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelA case CosNotifyChannelAdmin::SEQUENCE_EVENT: { obj = this->obtain_sequence_proxy_pushsupplier_i (proxy_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ()); } break; @@ -518,26 +518,26 @@ 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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosNotification::QoSProperties* -TAO_Notify_ConsumerAdmin_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::get_qos (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->qos_admin_.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_ConsumerAdmin_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.set_qos (qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Then update our task's qos @@ -552,64 +552,64 @@ TAO_Notify_ConsumerAdmin_i::set_qos (const CosNotification::QoSProperties & qos } void -TAO_Notify_ConsumerAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterID -TAO_Notify_ConsumerAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER); + return this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_ConsumerAdmin_i::remove_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER); + this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::Filter_ptr -TAO_Notify_ConsumerAdmin_i::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER); + return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterIDSeq* -TAO_Notify_ConsumerAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::get_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_ConsumerAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -622,21 +622,21 @@ TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ServantBase_var proxy_var (cosec_proxy); - cosec_proxy->init (TAO_ENV_SINGLE_ARG_PARAMETER); + cosec_proxy->init (ACE_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 TAO_ENV_ARG_PARAMETER); + activate_object (def_poa.in (), cosec_proxy ACE_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*/ TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminLimitExceeded @@ -647,7 +647,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelA } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -658,7 +658,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL) CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ConsumerAdmin_i::priority_filter (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::priority_filter (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -668,7 +668,7 @@ TAO_Notify_ConsumerAdmin_i::priority_filter (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -677,7 +677,7 @@ TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr } CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ConsumerAdmin_i::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -687,7 +687,7 @@ TAO_Notify_ConsumerAdmin_i::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ TAO_ENV_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -696,7 +696,7 @@ TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_ConsumerAdmin_i::pull_suppliers (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ConsumerAdmin_i::pull_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -714,10 +714,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 TAO_ENV_ARG_DECL) +TAO_Notify_Filter_Command_Worker::work (TAO_Notify_EventListener* event_listener ACE_ENV_ARG_DECL) { this->event_processor_->evaluate_listener_filter (this->event_, event_listener, - this->eval_parent_ TAO_ENV_ARG_PARAMETER); + this->eval_parent_ ACE_ENV_ARG_PARAMETER); } /****************************************************************************************************/ @@ -733,9 +733,9 @@ TAO_Notify_Dispatch_Command_Worker::~TAO_Notify_Dispatch_Command_Worker () } void -TAO_Notify_Dispatch_Command_Worker::work (TAO_Notify_EventListener* event_listener TAO_ENV_ARG_DECL) +TAO_Notify_Dispatch_Command_Worker::work (TAO_Notify_EventListener* event_listener ACE_ENV_ARG_DECL) { - this->event_processor_->dispatch_event (this->event_, event_listener TAO_ENV_ARG_PARAMETER); + this->event_processor_->dispatch_event (this->event_, event_listener ACE_ENV_ARG_PARAMETER); } /****************************************************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h index 1e7aa09ff50..a4e272b46fa 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 (TAO_ENV_SINGLE_ARG_DECL); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL); //= TAO_Notify_EventListener methods - virtual void dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL); + virtual void dispatch_event (TAO_Notify_Event &event ACE_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 TAO_ENV_ARG_DECL); + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent ACE_ENV_ARG_DECL); // Evaluates true if this event is acceptable by the listener. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_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); @@ -92,10 +92,10 @@ 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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Consumer Admin. - CosNotifyChannelAdmin::ConsumerAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL); + CosNotifyChannelAdmin::ConsumerAdmin_ptr get_ref (ACE_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 TAO_ENV_ARG_DECL); + void deactivate_proxy_pushsupplier (PortableServer::Servant servant ACE_ENV_ARG_DECL); // Deactivate servant from <proxy_pushsupplier_POA_>. - void register_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL); + void register_listener (TAO_Notify_EventListener *listener ACE_ENV_ARG_DECL); // Register with parent for subscription updates. - void unregister_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL); + void unregister_listener (TAO_Notify_EventListener *listener ACE_ENV_ARG_DECL); // Unregister with parent from subscription updates. void proxy_pushsupplier_destroyed (CosNotifyChannelAdmin::ProxyID proxyID); @@ -118,28 +118,28 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList // = Interface methods virtual CosNotifyChannelAdmin::AdminID MyID ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::EventChannel_ptr MyChannel ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyFilter::MappingFilter_ptr priority_filter ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -147,14 +147,14 @@ virtual CosNotifyFilter::MappingFilter_ptr priority_filter ( virtual void priority_filter ( CosNotifyFilter::MappingFilter_ptr priority_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -162,21 +162,21 @@ virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter ( virtual void lifetime_filter ( CosNotifyFilter::MappingFilter_ptr lifetime_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -184,7 +184,7 @@ virtual CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers ( virtual CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier ( CosNotifyChannelAdmin::ProxyID proxy_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -194,7 +194,7 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier ( virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_supplier ( CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -204,7 +204,7 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_suppli virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_supplier ( CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -212,14 +212,14 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_suppli )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotification::QoSProperties * get_qos ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -227,7 +227,7 @@ virtual CosNotification::QoSProperties * get_qos ( virtual void set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -237,7 +237,7 @@ virtual void set_qos ( virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -247,7 +247,7 @@ virtual void validate_qos ( virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -256,7 +256,7 @@ virtual void subscription_change ( virtual CosNotifyFilter::FilterID add_filter ( CosNotifyFilter::Filter_ptr new_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -264,7 +264,7 @@ virtual CosNotifyFilter::FilterID add_filter ( virtual void remove_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -273,7 +273,7 @@ virtual void remove_filter ( virtual CosNotifyFilter::Filter_ptr get_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -281,28 +281,28 @@ virtual CosNotifyFilter::Filter_ptr get_filter ( )); virtual CosNotifyFilter::FilterIDSeq * get_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier ( - TAO_ENV_SINGLE_ARG_DECL + ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + void destroy_i (ACE_ENV_SINGLE_ARG_DECL); // Destroy CA - CORBA::Object_ptr obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); + CORBA::Object_ptr obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL); // Obtain a proxy pushsupplier object - CORBA::Object_ptr obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); + CORBA::Object_ptr obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL); // Obtain a structured proxy pushsupplier object. - CORBA::Object_ptr obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); + CORBA::Object_ptr obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_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 TAO_ENV_ARG_DECL); + void work (TAO_Notify_EventListener* listener ACE_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 TAO_ENV_ARG_DECL); + void work (TAO_Notify_EventListener* listener ACE_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 f827f9e389f..83869d678f5 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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_event_channel (TAO_Notify_EventChannelFactory_i* parent ACE_ENV_ARG_DECL) { TAO_Notify_EventChannel_i* channel; ACE_NEW_THROW_EX (channel, @@ -57,7 +57,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Notify_ConsumerAdmin_i* consumer_admin_i; ACE_NEW_THROW_EX (consumer_admin_i, @@ -67,11 +67,11 @@ TAO_Notify_Default_CO_Factory::create_consumer_admin (TAO_Notify_EventChannel_i* { // Propagate the event channels qos to the consumer CosNotification::QoSProperties_var qos = - event_channel->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; consumer_admin_i->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -86,7 +86,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Notify_SupplierAdmin_i* supplier_admin_i; @@ -97,11 +97,11 @@ TAO_Notify_Default_CO_Factory::create_supplier_admin (TAO_Notify_EventChannel_i* { // Propagate the event channels qos to the supplier CosNotification::QoSProperties_var qos = - event_channel->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; supplier_admin_i->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -116,7 +116,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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_filter_factory (ACE_ENV_SINGLE_ARG_DECL) { TAO_Notify_FilterFactory_i* filterfactory; ACE_NEW_THROW_EX (filterfactory, @@ -127,7 +127,7 @@ TAO_Notify_Default_CO_Factory::create_filter_factory (TAO_ENV_SINGLE_ARG_DECL) TAO_Notify_StructuredProxyPushSupplier_i* -TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL) { TAO_Notify_StructuredProxyPushSupplier_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -137,11 +137,11 @@ TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_Cons { // Propagate the parent qos to the supplier CosNotification::QoSProperties_var qos = - parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; proxy->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -155,7 +155,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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL) { TAO_Notify_SequenceProxyPushSupplier_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -165,11 +165,11 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_Consume { // Propagate the parent qos to the supplier CosNotification::QoSProperties_var qos = - parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; proxy->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -183,7 +183,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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL) { TAO_Notify_ProxyPushSupplier_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -193,11 +193,11 @@ TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdm { // Propagate the parent qos to the supplier CosNotification::QoSProperties_var qos = - parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; proxy->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -212,7 +212,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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL) { TAO_Notify_StructuredProxyPushConsumer_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -222,11 +222,11 @@ TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_Supp { // Propagate the parent qos to the consumer CosNotification::QoSProperties_var qos = - parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; proxy->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -240,7 +240,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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL) { TAO_Notify_ProxyPushConsumer_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -250,11 +250,11 @@ TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdm { // Propagate the parent qos to the consumer CosNotification::QoSProperties_var qos = - parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; proxy->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -268,7 +268,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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL) { TAO_Notify_SequenceProxyPushConsumer_i* proxy; ACE_NEW_THROW_EX (proxy, @@ -278,11 +278,11 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_Supplie { // Propagate the parent qos to the consumer CosNotification::QoSProperties_var qos = - parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; proxy->set_qos (qos.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -297,13 +297,13 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_Supplie ACE_Lock* -TAO_Notify_Default_CO_Factory::create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_channel_factory_lock (ACE_ENV_SINGLE_ARG_DECL) { - return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + return create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_event_channel_lock (ACE_ENV_SINGLE_ARG_DECL) { ACE_Lock* lock; ACE_NEW_THROW_EX (lock, @@ -313,31 +313,31 @@ TAO_Notify_Default_CO_Factory::create_event_channel_lock (TAO_ENV_SINGLE_ARG_DEC } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_consumer_admin_lock (ACE_ENV_SINGLE_ARG_DECL) { // Later: - return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + return create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_supplier_admin_lock (ACE_ENV_SINGLE_ARG_DECL) { // Later: - return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + return create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_proxy_supplier_lock (ACE_ENV_SINGLE_ARG_DECL) { // Later: - return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + return create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_Lock* -TAO_Notify_Default_CO_Factory::create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_CO_Factory::create_proxy_consumer_lock (ACE_ENV_SINGLE_ARG_DECL) { // Later: - return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + return create_event_channel_lock (ACE_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 8dd11836a7b..dda4365bfbf 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 TAO_ENV_ARG_DECL); + TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent ACE_ENV_ARG_DECL); // Create an Event Channel. - TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL); + TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL); // Create a Consumer Admin. - TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL); + TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL); // Create a Supplier Admin. - TAO_Notify_FilterFactory_i* create_filter_factory (TAO_ENV_SINGLE_ARG_DECL); + TAO_Notify_FilterFactory_i* create_filter_factory (ACE_ENV_SINGLE_ARG_DECL); // Create the Filter Factory. // = Proxy Creation methods. - TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL); + TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL); // Create a Structured ProxyPushSupplier. - TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL); + TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL); // Create a Sequence ProxyPushSupplier. - TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL); + TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL); // Create a ProxyPushSupplier. - TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL); + TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL); // Create a Structured ProxyPushConsumer. - TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL); + TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL); // Create a Sequence ProxyPushConsumer. - TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL); + TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL); // Create a ProxyPushConsumer. //= Locks // = Methods to create locks. - ACE_Lock* create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL); + ACE_Lock* create_channel_factory_lock (ACE_ENV_SINGLE_ARG_DECL); // Create lock type used by channel factory. - ACE_Lock* create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL); + ACE_Lock* create_event_channel_lock (ACE_ENV_SINGLE_ARG_DECL); // Create lock type used by EC's. - ACE_Lock* create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL); + ACE_Lock* create_consumer_admin_lock (ACE_ENV_SINGLE_ARG_DECL); // Create lock type used by Consumer Admin's. - ACE_Lock* create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL); + ACE_Lock* create_supplier_admin_lock (ACE_ENV_SINGLE_ARG_DECL); // Create lock type used by Supplier Admin's. - ACE_Lock* create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL); + ACE_Lock* create_proxy_supplier_lock (ACE_ENV_SINGLE_ARG_DECL); // Create lock type used by proxy supplier. - ACE_Lock* create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL); + ACE_Lock* create_proxy_consumer_lock (ACE_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 da83f014891..a5a3eaf53de 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_Default_Collection_Factory::create_event_listener_list (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_Default_Collection_Factory::create_update_listener_list (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_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 78c621a790d..1d8dca43561 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 (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_EventListener_List* create_event_listener_list (ACE_ENV_SINGLE_ARG_DECL); // Create the event listener list. - virtual TAO_Notify_UpdateListener_List* create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_UpdateListener_List* create_update_listener_list (ACE_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 8504fedf3a2..82bf4ee4b74 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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_task (int mt, int tp_size ACE_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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; this->prealloc_source_eval_task_ = create_task (EMO_OPTIONS::instance ()->mt_source_eval_, EMO_OPTIONS::instance ()->source_threads_ - TAO_ENV_ARG_PARAMETER); + ACE_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_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->prealloc_dispatching_task_ = create_task (EMO_OPTIONS::instance ()->mt_dispatching_, EMO_OPTIONS::instance ()->dispatching_threads_ - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i* channel ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_event_map (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) } TAO_Notify_Event_Processor* -TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager* event_manager ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_source_eval_task (ACE_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_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else return prealloc_source_eval_task_; } TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_lookup_task (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_lookup_task (ACE_ENV_SINGLE_ARG_DECL) { return create_task (EMO_OPTIONS::instance ()->mt_lookup_, - EMO_OPTIONS::instance ()->lookup_threads_ TAO_ENV_ARG_PARAMETER); + EMO_OPTIONS::instance ()->lookup_threads_ ACE_ENV_ARG_PARAMETER); } TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_listener_eval_task (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_listener_eval_task (ACE_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_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else return prealloc_listener_eval_task_; } TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_dispatching_task (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_dispatching_task (ACE_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_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else return prealloc_dispatching_task_; } TAO_Notify_Worker_Task* -TAO_Notify_Default_EMO_Factory::create_updates_task (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Default_EMO_Factory::create_updates_task (ACE_ENV_SINGLE_ARG_DECL) { - return create_task (EMO_OPTIONS::instance ()->asynch_updates_, ASYNCH_UPDATES_THREADS TAO_ENV_ARG_PARAMETER); + return create_task (EMO_OPTIONS::instance ()->asynch_updates_, ASYNCH_UPDATES_THREADS ACE_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 18ada3e25f0..0157a74f071 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 TAO_ENV_ARG_DECL); + virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL); // Create an event manager. - virtual TAO_Notify_Event_Map* create_event_map (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Event_Map* create_event_map (ACE_ENV_SINGLE_ARG_DECL); // Create the event map. - virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL); + virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager ACE_ENV_ARG_DECL); // Create event processor. // = Create processing tasks. - 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 TAO_Notify_Worker_Task* create_source_eval_task (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Worker_Task* create_lookup_task (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Worker_Task* create_listener_eval_task ( ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Worker_Task* create_dispatching_task (ACE_ENV_SINGLE_ARG_DECL); + virtual TAO_Notify_Worker_Task* create_updates_task (ACE_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 TAO_ENV_ARG_DECL); + TAO_Notify_Worker_Task* create_task (int mt, int tp_size ACE_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 6db78cedef9..578a10b5878 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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::create_event_channel_POA (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL) { return this->create_generic_childPOA_i (EC_POA_NAME, - parent_poa TAO_ENV_ARG_PARAMETER); + parent_poa ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_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 TAO_ENV_ARG_PARAMETER); + parent_poa ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_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 TAO_ENV_ARG_PARAMETER); + parent_poa ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_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 TAO_ENV_ARG_PARAMETER); + parent_poa ACE_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) { // @@ Pradeep: if the Notification service is ever going to be // persistent or fault tolerant you may need to create this stuff @@ -100,16 +100,16 @@ TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa // to detect duplicates for us. PortableServer::IdUniquenessPolicy_var idpolicy = poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil()); PortableServer::IdAssignmentPolicy_var assignpolicy = poa->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); PortableServer::POAManager_var manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Create a PolicyList @@ -126,10 +126,10 @@ TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa PortableServer::POA_var poa_ret = poa->create_POA (child_poa_name, manager.in (), policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil()); - idpolicy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + idpolicy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil()); assignpolicy->destroy (); @@ -169,7 +169,7 @@ 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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa, PortableServer::Servant servant ACE_ENV_ARG_DECL) { // Convert CORBA::Long to ObjectId PortableServer::ObjectId_var oid = @@ -177,75 +177,75 @@ TAO_Notify_Default_POA_Factory::activate_object_with_id (CORBA::Long id, Portabl poa->activate_object_with_id (oid.in (), servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); return poa->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_Default_POA_Factory::activate_object (PortableServer::POA_ptr poa, PortableServer::Servant servant TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::activate_object (PortableServer::POA_ptr poa, PortableServer::Servant servant ACE_ENV_ARG_DECL) { - PortableServer::ObjectId_var oid = poa->activate_object (servant TAO_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var oid = poa->activate_object (servant ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return poa->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER); + return poa->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_Default_POA_Factory::servant_to_reference (PortableServer::POA_ptr poa, PortableServer::Servant servant TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::servant_to_reference (PortableServer::POA_ptr poa, PortableServer::Servant servant ACE_ENV_ARG_DECL) { - PortableServer::ObjectId_var oid = poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var oid = poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return poa->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER); + return poa->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_Default_POA_Factory::id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) { // Convert CORBA::Long to ObjectId PortableServer::ObjectId_var oid = this->long_to_ObjectId (id); return poa->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_Default_POA_Factory::destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::destroy_POA (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) { if (!CORBA::is_nil (poa)) - poa->destroy (1,0 TAO_ENV_ARG_PARAMETER); + poa->destroy (1,0 ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) { if (CORBA::is_nil (poa) || CORBA::is_nil (obj)) return; PortableServer::ObjectId_var id = - poa->reference_to_id (obj TAO_ENV_ARG_PARAMETER); + poa->reference_to_id (obj ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_Default_POA_Factory::deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) +TAO_Notify_Default_POA_Factory::deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) { if (CORBA::is_nil (poa) || servant == 0) return; PortableServer::ObjectId_var id = - poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_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 44b314cfdf0..0d327a128b2 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 TAO_ENV_ARG_DECL); + PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa ACE_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 TAO_ENV_ARG_DECL); + PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_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 TAO_ENV_ARG_DECL); + PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_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 TAO_ENV_ARG_DECL); + PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_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 TAO_ENV_ARG_DECL); + PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_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 TAO_ENV_ARG_DECL); + CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_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 TAO_ENV_ARG_DECL); + CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL); // Registers with the POA <poa>. - CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL); + CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL); // Registers with the POA <poa>. - CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); + CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL); // Look for the Object with id <id> in <poa>. - void destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); + void destroy_POA (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL); // Destroy the <poa> - void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); + void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL); // Deactivate the object. - void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr TAO_ENV_ARG_DECL); + void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr ACE_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 TAO_ENV_ARG_DECL); + PortableServer::POA_ptr create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr parent_poa ACE_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 32a2f1f4798..c4ea39c8e9a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp @@ -246,30 +246,30 @@ TAO_Notify_Any::event_type (void) const CORBA::Boolean TAO_Notify_Any::do_match (CosNotifyFilter::Filter_ptr filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_Any::do_match ()\n")); - return filter->match (*this->data_ TAO_ENV_ARG_PARAMETER); + return filter->match (*this->data_ ACE_ENV_ARG_PARAMETER); } void TAO_Notify_Any::do_push (CosEventComm::PushConsumer_ptr consumer - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_Any::do_push (" "CosEventComm::PushConsumer_ptr)\n")); - consumer->push (*this->data_ TAO_ENV_ARG_PARAMETER); + consumer->push (*this->data_ ACE_ENV_ARG_PARAMETER); } void TAO_Notify_Any::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " @@ -282,7 +282,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 TAO_ENV_ARG_PARAMETER); + consumer->push_structured_event (event ACE_ENV_ARG_PARAMETER); } void @@ -290,7 +290,7 @@ TAO_Notify_Any::do_push (CosNotifyComm::SequencePushConsumer_ptr consumer, const TAO_Notify_QoSAdmin_i& /*qos_admin*/, CosNotification::EventBatch& /*unsent*/, int /*flush_queue*/ - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " @@ -307,7 +307,7 @@ TAO_Notify_Any::do_push (CosNotifyComm::SequencePushConsumer_ptr consumer, events.length (1); events[0] = event; - consumer->push_structured_events (events TAO_ENV_ARG_PARAMETER); + consumer->push_structured_events (events ACE_ENV_ARG_PARAMETER); } // **************************************************************** @@ -420,18 +420,18 @@ TAO_Notify_StructuredEvent::event_type (void) const CORBA::Boolean TAO_Notify_StructuredEvent::do_match (CosNotifyFilter::Filter_ptr filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_StructuredEvent::do_match ()\n")); - return filter->match_structured (*this->data_ TAO_ENV_ARG_PARAMETER); + return filter->match_structured (*this->data_ ACE_ENV_ARG_PARAMETER); } void TAO_Notify_StructuredEvent::do_push (CosEventComm::PushConsumer_ptr consumer - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " @@ -443,18 +443,18 @@ TAO_Notify_StructuredEvent::do_push (CosEventComm::PushConsumer_ptr consumer any <<= *this->data_; // is the typecode set by this operation or do we need to set it explicity. - consumer->push (any TAO_ENV_ARG_PARAMETER); + consumer->push (any ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_StructuredEvent::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const +TAO_Notify_StructuredEvent::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "TAO_Notify_StructuredEvent::do_push (" "CosNotifyComm::StructuredPushConsumer_ptr)\n")); - consumer->push_structured_event (*this->data_ TAO_ENV_ARG_PARAMETER); + consumer->push_structured_event (*this->data_ ACE_ENV_ARG_PARAMETER); } void @@ -462,7 +462,7 @@ TAO_Notify_StructuredEvent::do_push (CosNotifyComm::SequencePushConsumer_ptr con const TAO_Notify_QoSAdmin_i& /*qos_admin*/, CosNotification::EventBatch& /*unsent*/, int /*flush_queue*/ - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " @@ -473,5 +473,5 @@ TAO_Notify_StructuredEvent::do_push (CosNotifyComm::SequencePushConsumer_ptr con events.length (1); events[0] = *this->data_; - consumer->push_structured_events (events TAO_ENV_ARG_PARAMETER); + consumer->push_structured_events (events ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h index a659e89a038..524c4d2ef37 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h @@ -126,16 +126,16 @@ 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 TAO_ENV_ARG_DECL) = 0; + virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) = 0; // Returns true if the filter matches. - 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; + virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const = 0; + virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const = 0; virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer, const TAO_Notify_QoSAdmin_i& qos_admin, CosNotification::EventBatch& unsent, int flush_queue - TAO_ENV_ARG_DECL) const = 0; + ACE_ENV_ARG_DECL) const = 0; // Push self to <consumer> // = QoS Properties. @@ -206,14 +206,14 @@ 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 TAO_ENV_ARG_DECL); - 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; + virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL); + virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const; + virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const; virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer, const TAO_Notify_QoSAdmin_i& qos_admin, CosNotification::EventBatch& unsent, int flush_queue - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; protected: CORBA::Any* data_; @@ -243,14 +243,14 @@ 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 TAO_ENV_ARG_DECL); - 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; + virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL); + virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const; + virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const; virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer, const TAO_Notify_QoSAdmin_i& qos_admin, CosNotification::EventBatch& unsent, int flush_queue - TAO_ENV_ARG_DECL) const; + ACE_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 708164dc121..6e98a60de08 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 TAO_ENV_ARG_DECL) +TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA ACE_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 TA PortableServer::ServantBase_var channelfactory_var (channelfactory); - channelfactory->init_i (default_POA TAO_ENV_ARG_PARAMETER); + channelfactory->init_i (default_POA ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ()); CORBA::Object_var obj = channelfactory->poa_factory_-> activate_object (channelfactory->my_POA_.in (), - channelfactory TAO_ENV_ARG_PARAMETER); + channelfactory ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ()); return CosNotifyChannelAdmin::EventChannelFactory - ::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + ::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL) +TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL) { - TAO_Notify_Factory::init (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Notify_Factory::init (ACE_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 TA // The POA that we should activate the Event Channels in. this->ec_POA_ = this->poa_factory_-> - create_event_channel_POA (this->my_POA_.in () TAO_ENV_ARG_PARAMETER); + create_event_channel_POA (this->my_POA_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->lock_ = - this->channel_objects_factory_->create_channel_factory_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_objects_factory_->create_channel_factory_lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->default_filter_factory_ = - this->create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->create_default_filter_factory_i (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_EventChannelFactory_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannelFactory_i::get_ref (ACE_ENV_SINGLE_ARG_DECL) { return CosNotifyChannelAdmin::EventChannelFactory ::_narrow (this->poa_factory_-> - servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER)); + servant_to_reference (this->my_POA_.in (), this ACE_ENV_ARG_PARAMETER)); } void @@ -88,33 +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 (TAO_ENV_SINGLE_ARG_DECL -#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) +void TAO_Notify_EventChannelFactory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL +#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) , #endif CORBA::Boolean destroy_children) { if (destroy_children == 1) { - this->poa_factory_->destroy_POA (this->ec_POA_.in () TAO_ENV_ARG_PARAMETER); + this->poa_factory_->destroy_POA (this->ec_POA_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->poa_factory_->deactivate_object(this->default_filter_factory_.in (), this->my_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } // Deactivate ourselves. this->poa_factory_->deactivate_object (this, this->my_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -124,7 +124,7 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope { TAO_Notify_EventChannel_i* channel = this->channel_objects_factory_->create_event_channel (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); PortableServer::ServantBase_var channel_var (channel); @@ -140,12 +140,12 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope } channel->init (ec_id, initial_qos, initial_admin, this->my_POA_.in (), this->ec_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); this->ec_ids_.next (); @@ -153,18 +153,18 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope } CosNotifyChannelAdmin::ChannelIDSeq* -TAO_Notify_EventChannelFactory_i::get_all_channels (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannelFactory_i::get_all_channels (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->ec_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::ChannelID id TAO_ENV_ARG_DECL) +TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::ChannelID id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ChannelNotFound @@ -175,7 +175,7 @@ TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::Chan ACE_TRY { obj = this->poa_factory_->id_to_reference (id, this->ec_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY // Translate any exception to "not found" @@ -185,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 () TAO_ENV_ARG_PARAMETER); + return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterFactory_ptr -TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (ACE_ENV_SINGLE_ARG_DECL) { TAO_Notify_FilterFactory_i* filterfactory = - this->channel_objects_factory_->create_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_objects_factory_->create_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ()); PortableServer::ServantBase_var filterfactory_var (filterfactory); @@ -202,7 +202,7 @@ TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (TAO_ENV_SINGL CORBA::Object_var obj = this->poa_factory_->activate_object (this->my_POA_.in (), - filterfactory TAO_ENV_ARG_PARAMETER); + filterfactory ACE_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 243a60aa35d..7bbde23e510 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h @@ -61,15 +61,15 @@ public: virtual ~TAO_Notify_EventChannelFactory_i (void); // Destructor - static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL); + static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + CosNotifyChannelAdmin::EventChannelFactory_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL); // Get the CORBA object. - void shutdown (TAO_ENV_SINGLE_ARG_DECL -#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT) + void shutdown (ACE_ENV_SINGLE_ARG_DECL +#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) , // This is ugly -- destroy_children should come BEFORE the env arg. #endif CORBA::Boolean destroy_children = 0); @@ -89,7 +89,7 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr create_channel ( const CosNotification::QoSProperties & initial_qos, const CosNotification::AdminProperties & initial_admin, CosNotifyChannelAdmin::ChannelID_out id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -98,7 +98,7 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr create_channel ( )); virtual CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -106,7 +106,7 @@ virtual CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels ( virtual CosNotifyChannelAdmin::EventChannel_ptr get_event_channel ( CosNotifyChannelAdmin::ChannelID id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -117,10 +117,10 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr get_event_channel ( TAO_Notify_EventChannelFactory_i (void); // Constructor - void init_i (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL); + void init_i (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL); // Initializes this object. - CosNotifyFilter::FilterFactory_ptr create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_DECL); + CosNotifyFilter::FilterFactory_ptr create_default_filter_factory_i (ACE_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 721f1e02010..628b37fc18e 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 TAO_ENV_ARG_DECL) +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 ACE_ENV_ARG_DECL) { this->channel_id_ = channel_id; @@ -58,40 +58,40 @@ 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_objects_factory_->create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->event_manager_ = - this->event_manager_objects_factory_->create_event_manager (this TAO_ENV_ARG_PARAMETER); + this->event_manager_objects_factory_->create_event_manager (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Set these before initializing the event manger. - this->set_qos (initial_qos TAO_ENV_ARG_PARAMETER); + this->set_qos (initial_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->event_manager_->init (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_manager_->init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // try to set initial admin params // This must be set after initializing the event manager // since it is the one that owns the admin properties. - this->set_admin (initial_admin TAO_ENV_ARG_PARAMETER); + this->set_admin (initial_admin ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->event_listener_list_ = - TAO_Notify_Factory::get_collection_factory ()->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_Notify_Factory::get_collection_factory ()->create_event_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the default Consumer Admin. Because the ID_Pool is being used @@ -99,11 +99,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 TAO_ENV_ARG_PARAMETER); + this->new_for_consumers (default_op_, id_unused ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::SupplierAdmin_var def_supplier_admin = - this->new_for_suppliers (default_op_, id_unused TAO_ENV_ARG_PARAMETER); + this->new_for_suppliers (default_op_, id_unused ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -132,10 +132,10 @@ TAO_Notify_EventChannel_i::get_default_POA (void) } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_EventChannel_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::get_ref (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var obj = this->poa_factory_-> - servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER); + servant_to_reference (this->my_POA_.in (), this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ()); return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ()); @@ -143,47 +143,47 @@ TAO_Notify_EventChannel_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) void -TAO_Notify_EventChannel_i::unregister_listener (TAO_Notify_EventListener* group_listener TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::unregister_listener (TAO_Notify_EventListener* group_listener ACE_ENV_ARG_DECL) { // UnRegister the group listener. - this->event_listener_list_->disconnected (group_listener TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->disconnected (group_listener ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_EventChannel_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->event_manager_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_manager_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Deactivate ourselves. this->poa_factory_->deactivate_object (this, this->my_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // shutdown consumer admins's. TAO_Notify_Shutdown_Worker shutdown_worker; - this->event_listener_list_->for_each (&shutdown_worker TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->for_each (&shutdown_worker ACE_ENV_ARG_PARAMETER); ACE_CHECK; // release all references. - this->event_listener_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_listener_list_->shutdown (ACE_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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->poa_factory_->destroy_POA (this->SA_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } const TAO_Notify_QoSAdmin_i& @@ -193,32 +193,32 @@ TAO_Notify_EventChannel_i::qos_admin (void) const } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_EventChannel_i::MyFactory (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::MyFactory (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->channel_factory_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->channel_factory_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::default_consumer_admin (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->get_consumeradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); + return this->get_consumeradmin (this->default_id_ ACE_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel_i::default_supplier_admin (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->get_supplieradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); + return this->get_supplieradmin (this->default_id_ ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterFactory_ptr -TAO_Notify_EventChannel_i::default_filter_factory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_EventChannel_i::default_filter_factory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -227,14 +227,14 @@ TAO_Notify_EventChannel_i::default_filter_factory (TAO_ENV_SINGLE_ARG_DECL_NOT_U } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_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 TAO_ENV_ARG_PARAMETER); + this->channel_objects_factory_->create_consumer_admin (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); PortableServer::ServantBase_var consumeradmin_var (consumer_admin); @@ -247,18 +247,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 () TAO_ENV_ARG_PARAMETER); + consumer_admin->init (id, op, this->CA_POA_.in () ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); // Register the group listener. - this->event_listener_list_->connected (consumer_admin TAO_ENV_ARG_PARAMETER); + this->event_listener_list_->connected (consumer_admin ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); this->consumer_admin_ids_.next (); @@ -266,13 +266,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 TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { TAO_Notify_SupplierAdmin_i* supplieradmin = - this->channel_objects_factory_->create_supplier_admin (this TAO_ENV_ARG_PARAMETER); + this->channel_objects_factory_->create_supplier_admin (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); PortableServer::ServantBase_var supplieradmin_var (supplieradmin); @@ -283,14 +283,14 @@ TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilter id = this->supplier_admin_ids_.get (); } - supplieradmin->init (id, op, this->SA_POA_.in () TAO_ENV_ARG_PARAMETER); + supplieradmin->init (id, op, this->SA_POA_.in () ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); this->supplier_admin_ids_.next (); @@ -298,7 +298,7 @@ TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilter } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminNotFound @@ -306,14 +306,14 @@ TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id { CORBA::Object_var obj = this->poa_factory_->id_to_reference (id, this->CA_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminNotFound @@ -321,23 +321,23 @@ TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id { CORBA::Object_var obj = this->poa_factory_->id_to_reference (id, this->SA_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ()); } CosNotifyChannelAdmin::AdminIDSeq* -TAO_Notify_EventChannel_i::get_all_consumeradmins (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->consumer_admin_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumer_admin_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::AdminIDSeq* -TAO_Notify_EventChannel_i::get_all_supplieradmins (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -346,63 +346,63 @@ TAO_Notify_EventChannel_i::get_all_supplieradmins (TAO_ENV_SINGLE_ARG_DECL) CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); - return this->supplier_admin_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supplier_admin_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotification::QoSProperties* -TAO_Notify_EventChannel_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::get_qos (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->qos_admin_.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_EventChannel_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.set_qos (qos ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_EventChannel_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER); } CosNotification::AdminProperties* -TAO_Notify_EventChannel_i::get_admin (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::get_admin (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // Delegate to Event Manager. - return this->event_manager_->admin_properties ()->get_admin (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->event_manager_->admin_properties ()->get_admin (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_EventChannel_i::set_admin (const CosNotification::AdminProperties & admin TAO_ENV_ARG_DECL) +TAO_Notify_EventChannel_i::set_admin (const CosNotification::AdminProperties & admin ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedAdmin )) { - this->event_manager_->admin_properties ()->set_admin (admin TAO_ENV_ARG_PARAMETER); + this->event_manager_->admin_properties ()->set_admin (admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->event_manager_->update_task_admins (); } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -412,25 +412,25 @@ TAO_Notify_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL) // TODO: find a way to disable the destroy method in the default Admin. CORBA::Object_var obj = - this->get_consumeradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); + this->get_consumeradmin (this->default_id_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::ConsumerAdmin::_nil ()); return CosEventChannelAdmin::ConsumerAdmin::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel_i::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_EventChannel_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { CORBA::Object_var obj = - this->get_supplieradmin (this->default_id_ TAO_ENV_ARG_PARAMETER); + this->get_supplieradmin (this->default_id_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::SupplierAdmin::_nil ()); return CosEventChannelAdmin::SupplierAdmin::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 3847d750794..c8757fcb99a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h @@ -76,7 +76,7 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr default_POA, PortableServer::POA_ptr my_POA - TAO_ENV_ARG_DECL); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + CosNotifyChannelAdmin::EventChannel_ptr get_ref (ACE_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 TAO_ENV_ARG_DECL); + void unregister_listener (TAO_Notify_EventListener* group_listener ACE_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 ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyFilter::FilterFactory_ptr default_filter_factory ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -134,7 +134,7 @@ virtual CosNotifyFilter::FilterFactory_ptr default_filter_factory ( virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers ( CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -143,7 +143,7 @@ virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers ( virtual CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers ( CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -151,7 +151,7 @@ virtual CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers ( virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin ( CosNotifyChannelAdmin::AdminID id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -160,7 +160,7 @@ virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin ( virtual CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin ( CosNotifyChannelAdmin::AdminID id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -168,21 +168,21 @@ virtual CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin ( )); virtual CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotification::QoSProperties * get_qos ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -190,7 +190,7 @@ virtual CosNotification::QoSProperties * get_qos ( virtual void set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -200,7 +200,7 @@ virtual CosNotification::QoSProperties * get_qos ( virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -208,7 +208,7 @@ virtual CosNotification::QoSProperties * get_qos ( )); virtual CosNotification::AdminProperties * get_admin ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -216,7 +216,7 @@ virtual CosNotification::QoSProperties * get_qos ( virtual void set_admin ( const CosNotification::AdminProperties & admin - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -224,21 +224,21 @@ virtual CosNotification::QoSProperties * get_qos ( )); virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_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 fa626cea37d..84c80dfe3f9 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Event_Dispatch_Command::execute (ACE_ENV_SINGLE_ARG_DECL) { - this->event_listener_->dispatch_event (*this->event_ TAO_ENV_ARG_PARAMETER); + this->event_listener_->dispatch_event (*this->event_ ACE_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 b1646aabdcd..86dd58ea0f5 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 (TAO_ENV_SINGLE_ARG_DECL); + virtual int execute (ACE_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 161f142ebf4..a2628852f52 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp @@ -37,7 +37,7 @@ TAO_Notify_Event_Manager::~TAO_Notify_Event_Manager () } void -TAO_Notify_Event_Manager::init (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Event_Manager::init (ACE_ENV_SINGLE_ARG_DECL) { ACE_NEW_THROW_EX (this->lock_, ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (), @@ -48,25 +48,25 @@ TAO_Notify_Event_Manager::init (TAO_ENV_SINGLE_ARG_DECL) this->admin_properties_ = new TAO_Notify_AdminProperties (); this->event_map_ = - this->emo_factory_->create_event_map (TAO_ENV_SINGLE_ARG_PARAMETER); + this->emo_factory_->create_event_map (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->event_processor_ = - this->emo_factory_->create_event_processor (this TAO_ENV_ARG_PARAMETER); + this->emo_factory_->create_event_processor (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->updates_dispatching_task_ = - this->emo_factory_->create_updates_task (TAO_ENV_SINGLE_ARG_PARAMETER); + this->emo_factory_->create_updates_task (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Init the objects - this->event_map_->init (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_map_->init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_Notify_QoSAdmin_i* qos_admin = (TAO_Notify_QoSAdmin_i*)&(this->event_channel_->qos_admin ()); - this->event_processor_->init (qos_admin TAO_ENV_ARG_PARAMETER); + this->event_processor_->init (qos_admin ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->updates_dispatching_task_->init_task ( @@ -79,54 +79,54 @@ TAO_Notify_Event_Manager::init (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_Event_Manager::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Event_Manager::shutdown (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); ACE_CHECK; - this->event_processor_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_processor_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->event_map_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_map_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->updates_dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->updates_dispatching_task_->shutdown (ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_Event_Manager::subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL) { TAO_Notify_EventType_List added_update, removed_update; this->event_map_->subscribe_for_events (event_listener, added_update, - added TAO_ENV_ARG_PARAMETER); + added ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->event_map_->unsubscribe_from_events (event_listener, removed_update, - removed TAO_ENV_ARG_PARAMETER); + removed ACE_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 TAO_ENV_ARG_PARAMETER); + added_update, removed_update ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Manager::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) +TAO_Notify_Event_Manager::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_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 TAO_ENV_ARG_PARAMETER); + added_list, removed_list ACE_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 TAO_ENV_ARG_PARAMETER); + added_list, removed_list ACE_ENV_ARG_PARAMETER); } void @@ -136,7 +136,7 @@ TAO_Notify_Event_Manager::update_task_admins (void) } 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 TAO_ENV_ARG_DECL) +TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); @@ -144,7 +144,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 TAO_ENV_ARG_PARAMETER); + update_listener_list->for_each (&update_worker ACE_ENV_ARG_PARAMETER); } /********************************************************************/ @@ -157,13 +157,13 @@ TAO_Notify_Update_Worker::TAO_Notify_Update_Worker (TAO_Notify_Worker_Task * upd } void -TAO_Notify_Update_Worker::work (TAO_Notify_UpdateListener* listener TAO_ENV_ARG_DECL) +TAO_Notify_Update_Worker::work (TAO_Notify_UpdateListener* listener ACE_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 TAO_ENV_ARG_PARAMETER); + this->updates_dispatching_task_->process_event (mb ACE_ENV_ARG_PARAMETER); } /********************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h index 0df63cd44bd..cf07091dab9 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 (TAO_ENV_SINGLE_ARG_DECL); + void init (ACE_ENV_SINGLE_ARG_DECL); // Init - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_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 TAO_ENV_ARG_DECL); + void subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_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 TAO_ENV_ARG_DECL); + void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_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 TAO_ENV_ARG_DECL); + void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Registers the subscription update listener with the Event Manager. - void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); + void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Unregister from subscription updates. - void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); + void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Registers the publication update listener with the Event Manager. - void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); + void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Unregister from publication updates. // = Accessors @@ -111,7 +111,7 @@ class TAO_Notify_Export TAO_Notify_Event_Manager // = Event forwarding methods. void process_event (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Delivers the event to listeners subscribed for <event> // <event_source> is the <event> source to the Event Manager. @@ -122,7 +122,7 @@ protected: void 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_ENV_ARG_DECL); // Dispatch the updates to the <update_listener_list> // = Data members. @@ -163,7 +163,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 TAO_ENV_ARG_DECL); + void work (TAO_Notify_UpdateListener* listener ACE_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 88a95c1baf2..0b9af87de70 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i @@ -8,7 +8,7 @@ ACE_INLINE void TAO_Notify_Event_Manager::process_event (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (admin_properties_->reject_new_events () == 1 && admin_properties_->queue_full ()) @@ -16,36 +16,36 @@ TAO_Notify_Event_Manager::process_event (TAO_Notify_Event* event, this->event_processor_->evaluate_source_filter (event, event_source - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_Event_Manager::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { this->event_map_->register_for_publication_updates (update_listener - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void -TAO_Notify_Event_Manager::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Manager::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { this->event_map_->register_for_subscription_updates (update_listener - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void -TAO_Notify_Event_Manager:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Manager:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { this->event_map_->unregister_from_subscription_updates (update_listener - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void -TAO_Notify_Event_Manager::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Manager::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { this->event_map_->unregister_from_publication_updates(update_listener - TAO_ENV_ARG_PARAMETER); + ACE_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 77c84b86954..cd4e92af434 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 TAO_ENV_ARG_DECL)= 0; + virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL)= 0; // Create an event manager. - virtual TAO_Notify_Event_Map* create_event_map (TAO_ENV_SINGLE_ARG_DECL)= 0; + virtual TAO_Notify_Event_Map* create_event_map (ACE_ENV_SINGLE_ARG_DECL)= 0; // Create the event map. - virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL)= 0; + virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager ACE_ENV_ARG_DECL)= 0; // Create event processor. // = Create processing tasks. - 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_source_eval_task (ACE_ENV_SINGLE_ARG_DECL)= 0; + virtual TAO_Notify_Worker_Task* create_lookup_task (ACE_ENV_SINGLE_ARG_DECL)= 0; + virtual TAO_Notify_Worker_Task* create_listener_eval_task (ACE_ENV_SINGLE_ARG_DECL)= 0; - virtual TAO_Notify_Worker_Task* create_dispatching_task (TAO_ENV_SINGLE_ARG_DECL)= 0; + virtual TAO_Notify_Worker_Task* create_dispatching_task (ACE_ENV_SINGLE_ARG_DECL)= 0; // Task that dispatches events. - virtual TAO_Notify_Worker_Task* create_updates_task (TAO_ENV_SINGLE_ARG_DECL)= 0; + virtual TAO_Notify_Worker_Task* create_updates_task (ACE_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 1ccbc9eb6aa..7881ebdfd17 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Event_Map::init (ACE_ENV_SINGLE_ARG_DECL) { this->default_subscription_list_ = - this->collection_factory_->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_factory_->create_event_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the default list of listeners. this->subscription_change_listeners_ - = this->collection_factory_->create_update_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); + = this->collection_factory_->create_update_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->publication_change_listeners_ - = this->collection_factory_->create_update_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER); + = this->collection_factory_->create_update_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_Event_Map::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Event_Map::shutdown (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) iterator.next (entry) != 0; iterator.advance ()) { - entry->int_id_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + entry->int_id_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - default_subscription_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + default_subscription_list_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - subscription_change_listeners_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + subscription_change_listeners_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - publication_change_listeners_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + publication_change_listeners_->shutdown (ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_factory_->create_event_listener_list (ACE_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 TAO_ENV_ARG_PARAMETER); + event_listener_list->connected (event_listener ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed ACE_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 TAO_ENV_ARG_PARAMETER); + event_listener_list->disconnected (event_listener ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_Event_Map::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { - this->publication_change_listeners_->connected (update_listener TAO_ENV_ARG_PARAMETER); + this->publication_change_listeners_->connected (update_listener ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Map::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Map::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { - this->subscription_change_listeners_->connected (update_listener TAO_ENV_ARG_PARAMETER); + this->subscription_change_listeners_->connected (update_listener ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Map:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Map:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { - this->subscription_change_listeners_->disconnected (update_listener TAO_ENV_ARG_PARAMETER); + this->subscription_change_listeners_->disconnected (update_listener ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Map::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Map::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL) { - this->publication_change_listeners_->disconnected (update_listener TAO_ENV_ARG_PARAMETER); + this->publication_change_listeners_->disconnected (update_listener ACE_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 TAO_ENV_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +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 ACE_ENV_ARG_DECL_NOT_USED/*ACE_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 ef139ca3353..9f94b5e31c3 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 (TAO_ENV_SINGLE_ARG_DECL); + void init (ACE_ENV_SINGLE_ARG_DECL); // Init - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_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 TAO_ENV_ARG_DECL); + void subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added ACE_ENV_ARG_DECL); - void unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL); + void unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed ACE_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 TAO_ENV_ARG_DECL); + void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list ACE_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 TAO_ENV_ARG_DECL); + void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Registers the subscription update listener with the Event Manager. - void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); + void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Unregister from subscription updates. // = Publication Updates - void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); + void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL); // Registers the publication update listener with the Event Manager. - void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL); + void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_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 cb487af32f8..ce55df28f1a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp @@ -29,9 +29,9 @@ TAO_Notify_Event_Processor::~TAO_Notify_Event_Processor () void TAO_Notify_Event_Processor::init (TAO_Notify_QoSAdmin_i* qos_properties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->lookup_task_ = this->emo_factory_->create_lookup_task (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lookup_task_ = this->emo_factory_->create_lookup_task (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -43,15 +43,15 @@ TAO_Notify_Event_Processor::init (TAO_Notify_QoSAdmin_i* qos_properties } void -TAO_Notify_Event_Processor::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Event_Processor::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->lookup_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lookup_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } void TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // TODO: use cache allocator here. // @@ Pradeep: you shouldn't be allocating at all! If this must go @@ -64,22 +64,22 @@ TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event, ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "Evaluating listener filter\n")); - event_source->filter_eval_task ()->process_event (mb TAO_ENV_ARG_PARAMETER); + event_source->filter_eval_task ()->process_event (mb ACE_ENV_ARG_PARAMETER); } void TAO_Notify_Event_Processor::lookup_subscriptions (TAO_Notify_Event* event, TAO_Notify_EventSource* /*event_source*/ - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->lookup_task_->process_event (lookup ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Processor::evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL) +TAO_Notify_Event_Processor::evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent ACE_ENV_ARG_DECL) { // @@ Pradeep: you should use ACE_NEW here.... // @@ Pradeep: do you really need to allocate this guy from the @@ -90,14 +90,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 TAO_ENV_ARG_PARAMETER); + event_listener->filter_eval_task ()->process_event (mb ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_Event_Processor::dispatch_event (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener TAO_ENV_ARG_DECL) +TAO_Notify_Event_Processor::dispatch_event (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener ACE_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 TAO_ENV_ARG_PARAMETER); + event_listener->event_dispatch_task ()->process_event (dispatch ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h index 888730b1326..d4d98499699 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h @@ -58,34 +58,34 @@ class TAO_Notify_Export TAO_Notify_Event_Processor virtual ~TAO_Notify_Event_Processor (); void init (TAO_Notify_QoSAdmin_i* qos_properties - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Init - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_ENV_SINGLE_ARG_DECL); // Shutdown operations. void evaluate_source_filter (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Event processing entry point. // = Callbacks for Source/Event Listeners. void lookup_subscriptions (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This method is called by an Event_Source after it has // successfully evaluated its filter. void evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This method is called by an Event_Listener after it has // successfully evaluated its filter. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp index 7b9859e70f4..99ac21f7715 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Factory::init (ACE_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 e5476598473..a5c48f02e74 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 (TAO_ENV_SINGLE_ARG_DECL); + static void init (ACE_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 5f385bb3e87..ecf40231947 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 (TAO_Notify_Event &event TAO_ENV_ARG_DECL) +TAO_Notify_FilterAdmin_i::match (TAO_Notify_Event &event ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData @@ -32,7 +32,7 @@ TAO_Notify_FilterAdmin_i::match (TAO_Notify_Event &event TAO_ENV_ARG_DECL) for (; iter.next (entry); iter.advance ()) { - ret_val = event.do_match (entry->int_id_.in () TAO_ENV_ARG_PARAMETER); + ret_val = event.do_match (entry->int_id_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (ret_val == 1) @@ -45,7 +45,7 @@ TAO_Notify_FilterAdmin_i::match (TAO_Notify_Event &event TAO_ENV_ARG_DECL) CosNotifyFilter::FilterID TAO_Notify_FilterAdmin_i::add_filter ( CosNotifyFilter::Filter_ptr new_filter - TAO_ENV_ARG_DECL + ACE_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 TAO_ENV_ARG_DECL) +void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound @@ -84,7 +84,7 @@ void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_i CosNotifyFilter::Filter_ptr TAO_Notify_FilterAdmin_i::get_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_FilterAdmin_i::get_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_ids_.get_sequence(TAO_ENV_SINGLE_ARG_PARAMETER); + return this->filter_ids_.get_sequence(ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_FilterAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_FilterAdmin_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { CosNotifyFilter::FilterIDSeq* id_list = - this->get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_all_filters (ACE_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 TAO_ENV_ARG_PARAMETER); + this->remove_filter (id ACE_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 76783881955..a821c0c0205 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 (TAO_Notify_Event &event TAO_ENV_ARG_DECL) + CORBA::Boolean match (TAO_Notify_Event &event ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData @@ -51,7 +51,7 @@ public: virtual CosNotifyFilter::FilterID add_filter ( CosNotifyFilter::Filter_ptr new_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -59,7 +59,7 @@ public: virtual void remove_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -68,7 +68,7 @@ public: virtual CosNotifyFilter::Filter_ptr get_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -76,14 +76,14 @@ public: )); virtual CosNotifyFilter::FilterIDSeq * get_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_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 100337158d5..388bdefeee2 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_FilterFactory_i::get_ref (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyFilter::FilterFactory_var filterfactory; - filterfactory = _this (TAO_ENV_SINGLE_ARG_PARAMETER); + filterfactory = _this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ()); return filterfactory._retn (); @@ -29,7 +29,7 @@ TAO_Notify_FilterFactory_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) CosNotifyFilter::Filter_ptr TAO_Notify_FilterFactory_i::create_filter ( const char *constraint_grammar - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -47,14 +47,14 @@ TAO_Notify_FilterFactory_i::create_filter ( TAO_Notify_Filter_i (constraint_grammar), CORBA::NO_MEMORY ()); - return filter->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return filter->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyFilter::MappingFilter_ptr TAO_Notify_FilterFactory_i::create_mapping_filter ( const char * /*constraint_grammar*/, const CORBA::Any & /*default_value*/ - TAO_ENV_ARG_DECL_NOT_USED //TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_ARG_DECL_NOT_USED //ACE_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 d6b57eb7794..72eb9e53166 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 (TAO_ENV_SINGLE_ARG_DECL); + get_ref (ACE_ENV_SINGLE_ARG_DECL); // Activate with the default POA virtual CosNotifyFilter::Filter_ptr create_filter ( const char * constraint_grammar - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -61,7 +61,7 @@ public: virtual CosNotifyFilter::MappingFilter_ptr create_mapping_filter ( const char * constraint_grammar, const CORBA::Any & default_value - TAO_ENV_ARG_DECL + ACE_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 25a119d2098..8c9bfaeb18b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp @@ -18,8 +18,8 @@ TAO_Notify_Filter_i::TAO_Notify_Filter_i (const char* constraint_grammar) // Implementation skeleton destructor TAO_Notify_Filter_i::~TAO_Notify_Filter_i (void) { - TAO_ENV_DECLARE_NEW_ENV; - this->remove_all_constraints (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_DECLARE_NEW_CORBA_ENV; + this->remove_all_constraints (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (TAO_debug_level > 0) @@ -29,7 +29,7 @@ TAO_Notify_Filter_i::~TAO_Notify_Filter_i (void) } CosNotifyFilter::Filter_ptr -TAO_Notify_Filter_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Filter_i::get_ref (ACE_ENV_SINGLE_ARG_DECL) { PortableServer::POA_var my_POA = _default_POA (); @@ -37,21 +37,21 @@ TAO_Notify_Filter_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var oid = my_POA->activate_object (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ()); CORBA::Object_var obj = my_POA->id_to_reference (oid.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ()); return CosNotifyFilter::Filter::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } char* TAO_Notify_Filter_i::constraint_grammar ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED + ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC (( CORBA::SystemException @@ -63,7 +63,7 @@ TAO_Notify_Filter_i::constraint_grammar ( void TAO_Notify_Filter_i::add_constraints_i ( const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -87,7 +87,7 @@ TAO_Notify_Filter_i::add_constraints_i ( notify_constr_expr->interpreter.build_tree ( expr.constraint_expr.in () - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_TRY_CHECK; @@ -120,7 +120,7 @@ TAO_Notify_Filter_i::add_constraints_i ( CosNotifyFilter::ConstraintInfoSeq* TAO_Notify_Filter_i::add_constraints ( const CosNotifyFilter::ConstraintExpSeq& constraint_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -163,7 +163,7 @@ TAO_Notify_Filter_i::add_constraints ( } this->add_constraints_i (*infoseq - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); auto_infoseq.release (); @@ -175,7 +175,7 @@ void TAO_Notify_Filter_i::modify_constraints ( const CosNotifyFilter::ConstraintIDSeq & del_list, const CosNotifyFilter::ConstraintInfoSeq & modify_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -229,7 +229,7 @@ TAO_Notify_Filter_i::modify_constraints ( ACE_TRY { this->add_constraints_i (modify_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -273,7 +273,7 @@ TAO_Notify_Filter_i::modify_constraints ( CosNotifyFilter::ConstraintInfoSeq * TAO_Notify_Filter_i::get_constraints ( const CosNotifyFilter::ConstraintIDSeq & id_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::ConstraintNotFound)) @@ -308,7 +308,7 @@ TAO_Notify_Filter_i::get_constraints ( } CosNotifyFilter::ConstraintInfoSeq * -TAO_Notify_Filter_i::get_all_constraints (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Filter_i::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { size_t current_size = this->constraint_expr_list_.current_size (); @@ -344,7 +344,7 @@ TAO_Notify_Filter_i::get_all_constraints (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_Notify_Filter_i::remove_all_constraints (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Filter_i::remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CONSTRAINT_EXPR_LIST_ITER iter (this->constraint_expr_list_); @@ -364,10 +364,10 @@ TAO_Notify_Filter_i::remove_all_constraints (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_Notify_Filter_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Filter_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->remove_all_constraints (TAO_ENV_SINGLE_ARG_PARAMETER); + this->remove_all_constraints (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var my_POA = _default_POA (); @@ -379,7 +379,7 @@ TAO_Notify_Filter_i::destroy (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_Notify_Filter_i::match (const CORBA::Any & /*filterable_data */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData)) { @@ -390,7 +390,7 @@ TAO_Notify_Filter_i::match (const CORBA::Any & /*filterable_data */ CORBA::Boolean TAO_Notify_Filter_i::match_structured ( const CosNotification::StructuredEvent & filterable_data - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData)) @@ -424,7 +424,7 @@ TAO_Notify_Filter_i::match_structured ( CORBA::Boolean TAO_Notify_Filter_i::match_typed ( const CosNotification::PropertySeq & /* filterable_data */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::UnsupportedFilterableData)) @@ -436,7 +436,7 @@ TAO_Notify_Filter_i::match_typed ( CosNotifyFilter::CallbackID TAO_Notify_Filter_i::attach_callback ( CosNotifyComm::NotifySubscribe_ptr /* callback */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -447,7 +447,7 @@ TAO_Notify_Filter_i::attach_callback ( void TAO_Notify_Filter_i::detach_callback ( CosNotifyFilter::CallbackID /* callback */ - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyFilter::CallbackNotFound)) @@ -456,7 +456,7 @@ TAO_Notify_Filter_i::detach_callback ( } CosNotifyFilter::CallbackIDSeq * -TAO_Notify_Filter_i::get_callbacks (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Filter_i::get_callbacks (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h index 6559a4e397b..8afd12e2f7f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h @@ -53,11 +53,11 @@ public: virtual ~TAO_Notify_Filter_i (void); CosNotifyFilter::Filter_ptr - get_ref (TAO_ENV_SINGLE_ARG_DECL); + get_ref (ACE_ENV_SINGLE_ARG_DECL); // Activate with the default POA virtual char * constraint_grammar ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -65,7 +65,7 @@ virtual char * constraint_grammar ( virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints ( const CosNotifyFilter::ConstraintExpSeq & constraint_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -75,7 +75,7 @@ virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints ( virtual void modify_constraints ( const CosNotifyFilter::ConstraintIDSeq & del_list, const CosNotifyFilter::ConstraintInfoSeq & modify_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -85,7 +85,7 @@ virtual void modify_constraints ( virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints ( const CosNotifyFilter::ConstraintIDSeq & id_list - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -93,21 +93,21 @@ virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints ( )); virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_constraints ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -115,7 +115,7 @@ virtual void destroy ( virtual CORBA::Boolean match ( const CORBA::Any & filterable_data - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -124,7 +124,7 @@ virtual CORBA::Boolean match ( virtual CORBA::Boolean match_structured ( const CosNotification::StructuredEvent & filterable_data - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -133,7 +133,7 @@ virtual CORBA::Boolean match_structured ( virtual CORBA::Boolean match_typed ( const CosNotification::PropertySeq & filterable_data - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -142,7 +142,7 @@ virtual CORBA::Boolean match_typed ( virtual CosNotifyFilter::CallbackID attach_callback ( CosNotifyComm::NotifySubscribe_ptr callback - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -150,7 +150,7 @@ virtual CosNotifyFilter::CallbackID attach_callback ( virtual void detach_callback ( CosNotifyFilter::CallbackID callback - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -158,7 +158,7 @@ virtual void detach_callback ( )); virtual CosNotifyFilter::CallbackIDSeq * get_callbacks ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -167,7 +167,7 @@ virtual CosNotifyFilter::CallbackIDSeq * get_callbacks ( private: void add_constraints_i ( const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq - TAO_ENV_ARG_DECL + ACE_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 3e917878450..b0cc56bcf1d 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ID_Pool_Ex<ID_TYPE, ID_TYPE_SEQ>::get_sequence (ACE_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 33471fc7b10..c88b497b7df 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 (TAO_ENV_SINGLE_ARG_DECL); + ID_TYPE_SEQ* get_sequence (ACE_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 1e75f974275..7be49ac9fe3 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Listener_Filter_Eval_Command::execute (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Boolean result = - this->event_listener_->evaluate_filter (*this->event_, this->eval_parent_ TAO_ENV_ARG_PARAMETER); + this->event_listener_->evaluate_filter (*this->event_, this->eval_parent_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result == 1) { - this->event_processor_->dispatch_event (this->event_, this->event_listener_ TAO_ENV_ARG_PARAMETER); + this->event_processor_->dispatch_event (this->event_, this->event_listener_ ACE_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 daaf4567e9b..1526a3ed433 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 (TAO_ENV_SINGLE_ARG_DECL); + virtual int execute (ACE_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 bb15333aaff..458c8c29c1d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h @@ -71,18 +71,18 @@ class TAO_Notify_Export TAO_Notify_EventListener : virtual public TAO_Notify_Re public: virtual void dispatch_event (TAO_Notify_Event &event - TAO_ENV_ARG_DECL) = 0; + ACE_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 - TAO_ENV_ARG_DECL) = 0; + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0; // Ask the listener to relinquish any bindings and prepare to be // disposed. @@ -107,7 +107,7 @@ class TAO_Notify_Export TAO_Notify_EventSource : virtual public TAO_Notify_RefCo // TODO: add a shutdown method to this interface!! virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; // Evaluates true if this event is acceptable by the Source. virtual TAO_Notify_Worker_Task* filter_eval_task (void) = 0; @@ -130,7 +130,7 @@ 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 - TAO_ENV_ARG_DECL) = 0; + ACE_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 b2f1b14b23d..46ca4442051 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Lookup_Command::execute (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) if (event_map_->find (this->event_->event_type (), listener_list) == 0) { - listener_list->for_each (this TAO_ENV_ARG_PARAMETER); + listener_list->for_each (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } } @@ -50,7 +50,7 @@ TAO_Notify_Lookup_Command::execute (TAO_ENV_SINGLE_ARG_DECL) // 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 TAO_ENV_ARG_PARAMETER); + event_map_->default_subscription_list ()->for_each (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -59,8 +59,8 @@ TAO_Notify_Lookup_Command::execute (TAO_ENV_SINGLE_ARG_DECL) void TAO_Notify_Lookup_Command::work (TAO_Notify_EventListener* event_listener - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->event_processor_->evaluate_listener_filter (this->event_, event_listener, 1 TAO_ENV_ARG_PARAMETER); + this->event_processor_->evaluate_listener_filter (this->event_, event_listener, 1 ACE_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 07a769906e5..a860df2e3f7 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Command callback // = TAO_ESF_Worker method - void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL); + void work (TAO_Notify_EventListener* listener ACE_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 7ae2676c1c2..34cfcdf67bd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp @@ -56,7 +56,7 @@ TAO_Notify_MT_Worker_Task::init_task ( } void -TAO_Notify_MT_Worker_Task::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_MT_Worker_Task::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) { // Put a shutdown message in the task queue and wait here till all // threads exit. @@ -71,8 +71,8 @@ TAO_Notify_MT_Worker_Task::close (u_long) TAO_Notify_Shutdown_Command * mb = new TAO_Notify_Shutdown_Command (); - TAO_ENV_DECLARE_NEW_ENV; - this->process_event (mb TAO_ENV_ARG_PARAMETER); + ACE_DECLARE_NEW_CORBA_ENV; + this->process_event (mb ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // We can not wait for ourselves to quit @@ -90,10 +90,10 @@ TAO_Notify_MT_Worker_Task::close (u_long) } int -TAO_Notify_MT_Worker_Task::process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv) +TAO_Notify_MT_Worker_Task::process_event (TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value *tv) { // Execute the buffering strategy. - this->buffering_strategy_->execute (this->msg_queue (), mb TAO_ENV_ARG_PARAMETER, tv); + this->buffering_strategy_->execute (this->msg_queue (), mb ACE_ENV_ARG_PARAMETER, tv); ACE_CHECK_RETURN (-1); return 0; @@ -114,7 +114,7 @@ TAO_Notify_MT_Worker_Task::update_qos (TAO_Notify_QoSAdmin_i& qos_admin) // set on say the event channel or the supplier proxy. ACE_TRY_NEW_ENV { - CosNotification::QoSProperties_var qos = qos_admin.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + CosNotification::QoSProperties_var qos = qos_admin.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong index = 0; index < qos->length (); ++index) @@ -185,7 +185,7 @@ TAO_Notify_MT_Worker_Task::svc (void) if (command != 0) { - result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER); + result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -212,7 +212,7 @@ TAO_Notify_Shutdown_Command::TAO_Notify_Shutdown_Command (void) } int -TAO_Notify_Shutdown_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_Shutdown_Command::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_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 fa2bea56446..a86f1661e48 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h @@ -58,10 +58,10 @@ public: TAO_Notify_QoSAdmin_i* const qos_properties); // Init the task - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); // shutdown this task. - virtual int process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv = 0); + virtual int process_event (TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value *tv = 0); // Process the command. virtual void update_admin (TAO_Notify_AdminProperties& admin); @@ -102,7 +102,7 @@ class TAO_Notify_Export TAO_Notify_Shutdown_Command : public TAO_Notify_Command TAO_Notify_Shutdown_Command (void); - virtual int execute (TAO_ENV_SINGLE_ARG_DECL); + virtual int execute (ACE_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 6160260a456..dd072e486d5 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 TAO_ENV_ARG_DECL) = 0; + virtual PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa ACE_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 TAO_ENV_ARG_DECL) = 0; + virtual PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_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 TAO_ENV_ARG_DECL) = 0; + virtual PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_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 TAO_ENV_ARG_DECL) = 0; + virtual PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_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 TAO_ENV_ARG_DECL) = 0; + virtual PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_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 TAO_ENV_ARG_DECL) = 0; + virtual CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_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 TAO_ENV_ARG_DECL) = 0; + virtual CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL) = 0; // Registers with the POA <poa>. - virtual CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL) = 0; + virtual CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL) = 0; // Registers with the POA <poa>. - virtual CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0; + virtual CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) = 0; // Look for the Object with id <id> in <poa>. - virtual void destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0; + virtual void destroy_POA (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) = 0; // Destroy the <poa> - virtual void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0; + virtual void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) = 0; // Deactivate the object. - virtual void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr TAO_ENV_ARG_DECL) = 0; + virtual void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr ACE_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 9a1d5fdb1a9..0eb9eaaba70 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 TAO_ENV_ARG_DECL) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lock_ = cof->create_proxy_consumer_lock (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + event_manager_objects_factory->create_source_eval_task (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -58,7 +58,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer (void) ACE_DECLARE_NEW_CORBA_ENV; this->event_manager_->unregister_from_subscription_updates (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; delete this->lock_; @@ -67,7 +67,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer (void) this->supplier_admin_->_remove_ref (); // @@: Move this to on_disconnected - this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_eval_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_Notify_EMO_Factory* event_manager_objects_factory = @@ -77,27 +77,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 TAO_ENV_ARG_DECL) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event ACE_ENV_ARG_DECL) { // check if it passes the parent filter. CORBA::Boolean bval = this->supplier_admin_->get_filter_admin ().match (event - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean ret_val; - ret_val = this->supplier_admin_->MyOperator (TAO_ENV_SINGLE_ARG_PARAMETER); + ret_val = this->supplier_admin_->MyOperator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (ret_val == CosNotifyChannelAdmin::AND_OP) { - ret_val = bval && this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER); + ret_val = bval && this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } else { - ret_val = bval || this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER); + ret_val = bval || this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -111,7 +111,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::filter_eval_task (void) } template <class SERVANT_TYPE> void -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_connected (ACE_ENV_SINGLE_ARG_DECL) { // Get hold of the admin properties. TAO_Notify_AdminProperties* const admin_properties = @@ -124,14 +124,14 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL) 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 TAO_ENV_ARG_PARAMETER); + this->event_manager_->register_for_subscription_updates (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; (*supplier_count)++; } template <class SERVANT_TYPE> void -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_disconnected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) { // Get hold of the admin properties. TAO_Notify_AdminProperties* const admin_properties = @@ -141,17 +141,17 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL } template <class SERVANT_TYPE> void -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType )) { - this->event_manager_->update_publication_list (added, removed TAO_ENV_ARG_PARAMETER); + this->event_manager_->update_publication_list (added, removed ACE_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> CosNotification::EventTypeSeq* -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode TAO_ENV_ARG_DECL) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -170,39 +170,39 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return event_type_seq; } template <class SERVANT_TYPE> CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_ProxyConsumer<SERVANT_TYPE>::MyAdmin (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxyConsumer<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->supplier_admin_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supplier_admin_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class SERVANT_TYPE> void TAO_Notify_ProxyConsumer<SERVANT_TYPE>::set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { // Call our base class set_qos (). - TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (qos TAO_ENV_ARG_PARAMETER); + TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Then update our task's qos diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h index 035f48d0cf1..cb550e3ab1e 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 TAO_ENV_ARG_DECL); + void init (CosNotifyChannelAdmin::ProxyID myID ACE_ENV_ARG_DECL); // Init the Proxy. // = TAO_Notify_EventSource methods. - virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event TAO_ENV_ARG_DECL); + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotification::EventTypeSeq * obtain_subscription_types ( CosNotifyChannelAdmin::ObtainInfoMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -78,7 +78,7 @@ public: virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -89,7 +89,7 @@ public: // so we can update the qos on our tasks. virtual void set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -98,10 +98,10 @@ public: protected: // = Helper methods - void on_connected (TAO_ENV_SINGLE_ARG_DECL); + void on_connected (ACE_ENV_SINGLE_ARG_DECL); // Derived classes should call this when their suppliers connect. - void on_disconnected (TAO_ENV_SINGLE_ARG_DECL); + void on_disconnected (ACE_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 009798f4939..567124efd80 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 TAO_ENV_ARG_DECL) +TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_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 TAO_ENV_ARG_PARAMETER); + CosNotifyComm::PushSupplier::_narrow (push_supplier ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_connected (ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL) { { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, @@ -94,7 +94,7 @@ TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq ACE_TRY { this->notify_push_supplier_->subscription_change (added, removed - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -125,7 +125,7 @@ TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data TAO_ENV_ARG_DECL) TAO_Notify_Any* notify_event = new TAO_Notify_Any(data_copy); - this->event_manager_->process_event (notify_event, this TAO_ENV_ARG_PARAMETER); + this->event_manager_->process_event (notify_event, this ACE_ENV_ARG_PARAMETER); ACE_CHECK; notify_event->_decr_refcnt (); @@ -133,7 +133,7 @@ TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data TAO_ENV_ARG_DECL) void TAO_Notify_ProxyPushConsumer_i::disconnect_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_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 TAO_ENV_ARG_PARAMETER); + deactivate_proxy_pushconsumer (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_disconnected (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_CosEC_ProxyPushConsumer_i::init (ACE_ENV_SINGLE_ARG_DECL) { // Pass the default id. - this->notify_proxy_.init (0 TAO_ENV_ARG_PARAMETER); + this->notify_proxy_.init (0 ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data TAO_ENV_ARG_DECL) +TAO_Notify_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->notify_proxy_.push (data TAO_ENV_ARG_PARAMETER); + this->notify_proxy_.push (data ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->notify_proxy_.disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->notify_proxy_.disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushConsumer_i::connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier TAO_ENV_ARG_DECL) +TAO_Notify_CosEC_ProxyPushConsumer_i::connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected)) { - this->notify_proxy_.connect_any_push_supplier (push_supplier TAO_ENV_ARG_PARAMETER); + this->notify_proxy_.connect_any_push_supplier (push_supplier ACE_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 81c2a6a3d64..8da7670887d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h @@ -55,7 +55,7 @@ public: // Destructor // = Interface methods - void push (const CORBA::Any & data TAO_ENV_ARG_DECL) + void push (const CORBA::Any & data ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -63,7 +63,7 @@ public: virtual void connect_any_push_supplier ( CosEventComm::PushSupplier_ptr push_supplier - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -71,7 +71,7 @@ public: )); virtual void disconnect_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_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 TAO_ENV_ARG_DECL); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + void init (ACE_ENV_SINGLE_ARG_DECL); // init. virtual void push (const CORBA::Any &data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Suppliers call this method to pass data to connected consumers. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_consumer (ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 7c45f284d4c..049cc32f249 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 TAO_ENV_ARG_DECL) +TAO_Notify_ProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL) { ACE_TRY { - event.do_push (this->cosec_push_consumer_.in () TAO_ENV_ARG_PARAMETER); + event.do_push (this->cosec_push_consumer_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL { ACE_DEBUG ((LM_DEBUG, "Exception dispatching any event\n")); // misbehaving client, - this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_ENDTRY; } void -TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) +TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_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 TAO_ENV_ARG_PARAMETER); + this->notify_push_consumer_->offer_change (added, removed ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer ACE_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 TAO_ENV_ARG_PARAMETER); + CosNotifyComm::PushConsumer::_narrow (push_consumer ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_connected (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxyPushSupplier_i::shutdown_i (ACE_ENV_SINGLE_ARG_DECL) { - this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ask our parent to deactivate us. this->consumer_admin_-> - deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER); + deactivate_proxy_pushsupplier (this ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxyPushSupplier_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // unregister with CA - this->consumer_admin_->unregister_listener (this TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->unregister_listener (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_ProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxyPushSupplier_i::shutdown (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) return; } - this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TRY { - this->cosec_push_consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->cosec_push_consumer_->disconnect_push_consumer (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_CosEC_ProxyPushSupplier_i::init (ACE_ENV_SINGLE_ARG_DECL) { - this->notify_proxy_.init (0 TAO_ENV_ARG_PARAMETER); + this->notify_proxy_.init (0 ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->notify_proxy_.disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->notify_proxy_.disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_CosEC_ProxyPushSupplier_i::connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer TAO_ENV_ARG_DECL) +TAO_Notify_CosEC_ProxyPushSupplier_i::connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, CosEventChannelAdmin::TypeError)) { - this->notify_proxy_.connect_any_push_consumer (push_consumer TAO_ENV_ARG_PARAMETER); + this->notify_proxy_.connect_any_push_consumer (push_consumer ACE_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 97f2fdde840..bf7748e077b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h @@ -55,7 +55,7 @@ public: // = Interface methods virtual void connect_any_push_consumer ( CosEventComm::PushConsumer_ptr push_consumer - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -64,23 +64,23 @@ public: )); virtual void disconnect_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); // Shutdown. protected: - void shutdown_i (TAO_ENV_SINGLE_ARG_DECL); + void shutdown_i (ACE_ENV_SINGLE_ARG_DECL); // Shutdown - virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL); + virtual void dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL); // Deliver the event to the consumer. - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + void init (ACE_ENV_SINGLE_ARG_DECL); // Init. - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_supplier (ACE_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 TAO_ENV_ARG_DECL) + virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer ACE_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 55009cd0b51..cc540f3a9af 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 TAO_ENV_ARG_DECL) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { - consumer_admin_->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin_->_add_ref (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lock_ = cof->create_proxy_supplier_lock (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + event_manager_objects_factory->create_dispatching_task (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->filter_eval_task_ = - event_manager_objects_factory->create_listener_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER); + event_manager_objects_factory->create_listener_eval_task (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -67,7 +67,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void) { ACE_DECLARE_NEW_CORBA_ENV; this->event_manager_->unregister_from_publication_updates (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // unsubscribe it to our current subscriptions. @@ -78,14 +78,14 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void) added.length (0); this->event_manager_->subscribe_for_events (this, - added, removed TAO_ENV_ARG_PARAMETER); + added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; delete this->lock_; this->consumer_admin_->proxy_pushsupplier_destroyed (this->proxy_id_); - consumer_admin_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_Notify_EMO_Factory* event_manager_objects_factory = @@ -96,23 +96,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 TAO_ENV_ARG_DECL) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent ACE_ENV_ARG_DECL) { if (eval_parent == 1) { CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator = - consumer_admin_->MyOperator (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin_->MyOperator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Inter-filter group operator. CORBA::Boolean bval = - this->consumer_admin_->get_filter_admin ().match (event TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->get_filter_admin ().match (event ACE_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 TAO_ENV_ARG_PARAMETER); + bval = this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return bval; } @@ -127,14 +127,14 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event } else { - int status = this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER); + int status = this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return status; } } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event ACE_ENV_ARG_DECL) { if (this->is_connected_ == 0) { @@ -156,7 +156,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " "dispatching event\n")); - this->dispatch_event_i (event TAO_ENV_ARG_PARAMETER); + this->dispatch_event_i (event ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -174,7 +174,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 TAO_ENV_ARG_DECL) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -183,7 +183,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotificati if (this->is_connected_ == 1) { this->event_manager_->subscribe_for_events (this, - added, removed TAO_ENV_ARG_PARAMETER); + added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -199,7 +199,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotificati } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (ACE_ENV_SINGLE_ARG_DECL) { // Get hold of the admin properties. TAO_Notify_AdminProperties* const admin_properties = @@ -213,7 +213,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW (CORBA::IMP_LIMIT ()); // we've reached the limit of consumers connected. // register with CA - this->consumer_admin_->register_listener (this TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->register_listener (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosNotification::EventTypeSeq added; @@ -227,17 +227,17 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL) this->subscription_list_.populate (added); this->event_manager_->subscribe_for_events (this, - added, removed TAO_ENV_ARG_PARAMETER); + added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->event_manager_->register_for_publication_updates (this TAO_ENV_ARG_PARAMETER); + this->event_manager_->register_for_publication_updates (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; (*consumer_count)++; } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (ACE_ENV_SINGLE_ARG_DECL) { { ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, @@ -261,18 +261,18 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL this->subscription_list_.populate (removed); this->event_manager_->subscribe_for_events (this, - added, removed TAO_ENV_ARG_PARAMETER); + added, removed ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->event_manager_->unregister_from_publication_updates (this TAO_ENV_ARG_PARAMETER); + this->event_manager_->unregister_from_publication_updates (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; // shutdown the tasks. - this->dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->dispatching_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_eval_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get hold of the admin properties. @@ -283,7 +283,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ConnectionAlreadyInactive, @@ -294,7 +294,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (TAO_ENV_SINGLE_ARG_D } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ConnectionAlreadyActive, @@ -312,7 +312,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (TAO_ENV_SINGLE_ARG_DE while (this->event_list_.dequeue_head (event) == 0) { - this->dispatch_event_i (*event TAO_ENV_ARG_PARAMETER); + this->dispatch_event_i (*event ACE_ENV_ARG_PARAMETER); ACE_CHECK; delete event; @@ -321,16 +321,16 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (TAO_ENV_SINGLE_ARG_DE } template <class SERVANT_TYPE> CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_ProxySupplier<SERVANT_TYPE>::MyAdmin (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->consumer_admin_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumer_admin_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -340,7 +340,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (TAO_ENV_SINGLE_ARG_DECL } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ TAO_ENV_ARG_DECL) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -349,7 +349,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::Mappin } template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -359,7 +359,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL } template <class SERVANT_TYPE> void -TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ TAO_ENV_ARG_DECL) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -368,7 +368,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 TAO_ENV_ARG_DECL) +TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -387,14 +387,14 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return event_type_seq; } @@ -402,14 +402,14 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAd template <class SERVANT_TYPE> void TAO_Notify_ProxySupplier<SERVANT_TYPE>::set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { // Call our base class set_qos (). - TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (qos TAO_ENV_ARG_PARAMETER); + TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Then update our task's qos diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h index de1cc1522de..4d172d15b13 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 TAO_ENV_ARG_DECL); + void init (CosNotifyChannelAdmin::ProxyID myID ACE_ENV_ARG_DECL); // Init the Proxy. // = Notify_Event_Listener methods - virtual void dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL); + virtual void dispatch_event (TAO_Notify_Event &event ACE_ENV_ARG_DECL); - virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL); + virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent ACE_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 ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void suspend_connection ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -79,7 +79,7 @@ public: )); virtual void resume_connection ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -88,7 +88,7 @@ public: )); virtual CosNotifyFilter::MappingFilter_ptr priority_filter ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -96,14 +96,14 @@ public: virtual void priority_filter ( CosNotifyFilter::MappingFilter_ptr priority_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -111,7 +111,7 @@ public: virtual void lifetime_filter ( CosNotifyFilter::MappingFilter_ptr lifetime_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -119,7 +119,7 @@ public: virtual CosNotification::EventTypeSeq * obtain_offered_types ( CosNotifyChannelAdmin::ObtainInfoMode mode - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -128,7 +128,7 @@ public: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -139,7 +139,7 @@ public: // so we can update the qos on our tasks. virtual void set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -148,13 +148,13 @@ public: protected: // = Helper methods - virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL) = 0; + virtual void dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL) = 0; // Derived classes should implement this. - void on_connected (TAO_ENV_SINGLE_ARG_DECL); + void on_connected (ACE_ENV_SINGLE_ARG_DECL); // Derived classes should call this when their consumers connect. - void on_disconnected (TAO_ENV_SINGLE_ARG_DECL); + void on_disconnected (ACE_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 90f946d3ec4..690b25585e7 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_Proxy<SERVANT_TYPE>::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) { this->_incr_refcnt (); } template <class SERVANT_TYPE> void -TAO_Notify_Proxy<SERVANT_TYPE>::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_Proxy<SERVANT_TYPE>::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_Proxy<SERVANT_TYPE>::dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list ACE_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 TAO_ENV_ARG_PARAMETER); + this->dispatch_update_i (added, removed ACE_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> CosNotifyChannelAdmin::ProxyType -TAO_Notify_Proxy<SERVANT_TYPE>::MyType (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_Proxy<SERVANT_TYPE>::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -83,7 +83,7 @@ TAO_Notify_Proxy<SERVANT_TYPE>::MyType (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_EN } template <class SERVANT_TYPE> void -TAO_Notify_Proxy<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ TAO_ENV_ARG_DECL) +TAO_Notify_Proxy<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS @@ -93,25 +93,25 @@ TAO_Notify_Proxy<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSPr } template <class SERVANT_TYPE> CosNotification::QoSProperties* -TAO_Notify_Proxy<SERVANT_TYPE>::get_qos (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Proxy<SERVANT_TYPE>::get_qos (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->qos_admin_.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class SERVANT_TYPE> void -TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL) +TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.set_qos (qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->setup_qos_policies (TAO_ENV_SINGLE_ARG_PARAMETER); + this->setup_qos_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -119,64 +119,64 @@ template <class SERVANT_TYPE> void TAO_Notify_Proxy<SERVANT_TYPE>::validate_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> CosNotifyFilter::FilterID -TAO_Notify_Proxy<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL) +TAO_Notify_Proxy<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER); + return this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> void TAO_Notify_Proxy<SERVANT_TYPE>::remove_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER); + this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> CosNotifyFilter::Filter_ptr -TAO_Notify_Proxy<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) +TAO_Notify_Proxy<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER); + return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER); } template <class SERVANT_TYPE> CosNotifyFilter::FilterIDSeq* -TAO_Notify_Proxy<SERVANT_TYPE>::get_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Proxy<SERVANT_TYPE>::get_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class SERVANT_TYPE> void -TAO_Notify_Proxy<SERVANT_TYPE>::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Proxy<SERVANT_TYPE>::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } template <class SERVANT_TYPE> const TAO_Notify_QoSAdmin_i& @@ -187,9 +187,9 @@ TAO_Notify_Proxy<SERVANT_TYPE>::qos_admin (void) const template <class SERVANT_TYPE> void TAO_Notify_Proxy<SERVANT_TYPE>::setup_qos_policies ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { - this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_admin_.remove_all_filters (ACE_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 cbfbb59f1c7..5660c3a0c83 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 (TAO_ENV_SINGLE_ARG_DECL); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL); // = Notify_Update_Listener methods - virtual void dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list TAO_ENV_ARG_DECL); + virtual void dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list ACE_ENV_ARG_DECL); virtual CosNotifyChannelAdmin::ProxyType MyType ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -84,7 +84,7 @@ public: virtual void validate_event_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -92,7 +92,7 @@ public: )); virtual CosNotification::QoSProperties * get_qos ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -100,7 +100,7 @@ public: virtual void set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -110,7 +110,7 @@ public: virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -119,7 +119,7 @@ public: virtual CosNotifyFilter::FilterID add_filter ( CosNotifyFilter::Filter_ptr new_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -127,7 +127,7 @@ public: virtual void remove_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -136,7 +136,7 @@ public: virtual CosNotifyFilter::Filter_ptr get_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -144,14 +144,14 @@ public: )); virtual CosNotifyFilter::FilterIDSeq * get_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -160,10 +160,10 @@ public: const TAO_Notify_QoSAdmin_i& qos_admin (void) const; protected: - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) = 0; + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL) = 0; // Derived types should implement this to deliver the update. - virtual void setup_qos_policies (TAO_ENV_SINGLE_ARG_DECL); + virtual void setup_qos_policies (ACE_ENV_SINGLE_ARG_DECL); // Derived types may implement this if they need to do something // directly after setting the qos policies. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp index 40580ea329b..97287df8c1d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp @@ -44,7 +44,7 @@ TAO_Notify_QoSAdmin_i::~TAO_Notify_QoSAdmin_i (void) } CosNotification::QoSProperties * TAO_Notify_QoSAdmin_i::get_qos ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -142,7 +142,7 @@ CosNotification::QoSProperties * TAO_Notify_QoSAdmin_i::get_qos ( void TAO_Notify_QoSAdmin_i::set_qos (const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -232,7 +232,7 @@ void TAO_Notify_QoSAdmin_i::validate_qos ( const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ - TAO_ENV_ARG_DECL_NOT_USED //TAO_ENV_SINGLE_ARG_PARAMETER + ACE_ENV_ARG_DECL_NOT_USED //ACE_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 049c0bdf25e..c53a847ca51 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h @@ -44,7 +44,7 @@ public: // Destructor virtual CosNotification::QoSProperties * get_qos ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -52,7 +52,7 @@ public: virtual void set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -62,7 +62,7 @@ public: virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - TAO_ENV_ARG_DECL + ACE_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 3e30a801e72..d85cb9f24b3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp @@ -20,7 +20,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::~TAO_Notify_SequenceProxyPushConsumer_i } void -TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier TAO_ENV_ARG_DECL) +TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected @@ -51,7 +51,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotif CORBA::INTERNAL ()); ACE_TRY_CHECK; - this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_connected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -66,12 +66,12 @@ TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotif } void -TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) +TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL) { ACE_TRY { this->push_supplier_->subscription_change (added, removed - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -82,7 +82,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::Even } void -TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotification::EventBatch & notifications TAO_ENV_ARG_DECL) +TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotification::EventBatch & notifications ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -102,24 +102,24 @@ TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotific new TAO_Notify_StructuredEvents (notifications); // Send 'em out - this->event_manager_->process_event (notify_events, this TAO_ENV_ARG_PARAMETER); + this->event_manager_->process_event (notify_events, this ACE_ENV_ARG_PARAMETER); ACE_CHECK; notify_events->_decr_refcnt (); } void -TAO_Notify_SequenceProxyPushConsumer_i::disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SequenceProxyPushConsumer_i::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // ask our parent to deaactivate us. this->supplier_admin_-> - deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER); + deactivate_proxy_pushconsumer (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_disconnected (ACE_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 c89f90c755f..8713adf8aa6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h @@ -52,7 +52,7 @@ public: // = interface methods virtual void connect_sequence_push_supplier ( CosNotifyComm::SequencePushSupplier_ptr push_supplier - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -61,7 +61,7 @@ public: virtual void push_structured_events ( const CosNotification::EventBatch & notifications - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -69,7 +69,7 @@ public: )); virtual void disconnect_sequence_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_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 TAO_ENV_ARG_DECL); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_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 453388240c1..68af758ef3a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp @@ -28,7 +28,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::~TAO_Notify_SequenceProxyPushSupplier_i } void -TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer TAO_ENV_ARG_DECL) +TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventChannelAdmin::AlreadyConnected, @@ -60,7 +60,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotif CORBA::INTERNAL ()); ACE_CHECK; - this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_connected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -75,7 +75,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotif void TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // If we are in this method then we are a SequenceProxyPushSupplier // connected up to a SequenceProxyPushConsumer and the only thing @@ -102,7 +102,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event& even this->qos_admin (), this->event_cache_, this->from_timeout_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } else { @@ -110,7 +110,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event& even this->qos_admin (), this->event_cache_, this->from_timeout_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_TRY_CHECK; } @@ -123,11 +123,11 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event& even } void -TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) +TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL) { ACE_TRY { - this->push_consumer_->offer_change (added, removed TAO_ENV_ARG_PARAMETER); + this->push_consumer_->offer_change (added, removed ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -138,22 +138,22 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::Even } void -TAO_Notify_SequenceProxyPushSupplier_i::disconnect_sequence_push_supplier(TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SequenceProxyPushSupplier_i::disconnect_sequence_push_supplier(ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ask our parent to deactivate us. this->consumer_admin_-> - deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER); + deactivate_proxy_pushsupplier (this ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_SequenceProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SequenceProxyPushSupplier_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) { // Tell the consumer that we're going away ... // @@ Later, lookup a "notify_on_disconnect" option. @@ -165,12 +165,12 @@ TAO_Notify_SequenceProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) return; } - this->disconnect_sequence_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TRY { - this->push_consumer_->disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->push_consumer_->disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL @@ -183,7 +183,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) void TAO_Notify_SequenceProxyPushSupplier_i::setup_qos_policies ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { # if defined (ACE_CONFIG_WIN32_H) ACE_Time_Value interval ( @@ -198,7 +198,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::setup_qos_policies ( TAO_Notify_CO_Factory* cof = TAO_Notify_Factory::get_channel_objects_factory (); - this->batch_lock_ = cof->create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_PARAMETER); + this->batch_lock_ = cof->create_proxy_supplier_lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get back to the reactor to schedule the timer @@ -243,7 +243,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::handle_timeout ( // the event cache will be flushed a split second before it // normally would. this->from_timeout_ = 1; - this->dispatch_event (dummy_events TAO_ENV_ARG_PARAMETER); + this->dispatch_event (dummy_events ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h index 1e652f71358..9bf891c40c2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h @@ -50,7 +50,7 @@ public: virtual void connect_sequence_push_consumer ( CosNotifyComm::SequencePushConsumer_ptr push_consumer - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -60,24 +60,24 @@ public: // @@ Pradeep: more indentation problems.... virtual void disconnect_sequence_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); // Shutdown. protected: - virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL); + virtual void dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL); // Deliver the event to the consumer. - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL); // Deliver the update to the consumer. - void setup_qos_policies (TAO_ENV_SINGLE_ARG_DECL); + void setup_qos_policies (ACE_ENV_SINGLE_ARG_DECL); // Do what we need to do after the qos policies are set. virtual int handle_timeout (const ACE_Time_Value& current_time, 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 48619250ed9..d3ba6f93475 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Source_Filter_Eval_Command::execute (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Boolean result = - this->event_source_->evaluate_filter (*this->event_ TAO_ENV_ARG_PARAMETER); + this->event_source_->evaluate_filter (*this->event_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result == 1) { this->event_processor_-> - lookup_subscriptions (this->event_, this->event_source_ TAO_ENV_ARG_PARAMETER); + lookup_subscriptions (this->event_, this->event_source_ ACE_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 50fd2182489..68e9032839c 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 (TAO_ENV_SINGLE_ARG_DECL); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL); // Command callback protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.cpp index 9c078458fb4..f7a3864d8e3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.cpp @@ -91,7 +91,7 @@ TAO_Notify_StructuredEvents::event_type (void) const CORBA::Boolean TAO_Notify_StructuredEvents::do_match (CosNotifyFilter::Filter_ptr filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " @@ -104,7 +104,7 @@ TAO_Notify_StructuredEvents::do_match (CosNotifyFilter::Filter_ptr filter for (CORBA::ULong i = 0; i < length; i++) { CORBA::Boolean matched = filter->match_structured (this->data_[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (matched) @@ -124,7 +124,7 @@ TAO_Notify_StructuredEvents::do_match (CosNotifyFilter::Filter_ptr filter void TAO_Notify_StructuredEvents::do_push (CosEventComm::PushConsumer_ptr consumer - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { CORBA::ULong sending_length = (this->match_called_ ? this->matching_.length () : @@ -134,14 +134,14 @@ TAO_Notify_StructuredEvents::do_push (CosEventComm::PushConsumer_ptr consumer CORBA::Any any; any <<= this->data_[(this->match_called_ ? this->matching_[i] : i)]; - consumer->push (any TAO_ENV_ARG_PARAMETER); + consumer->push (any ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_Notify_StructuredEvents::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { CORBA::ULong sending_length = (this->match_called_ ? this->matching_.length () : @@ -150,7 +150,7 @@ TAO_Notify_StructuredEvents::do_push (CosNotifyComm::StructuredPushConsumer_ptr { consumer->push_structured_event (this->data_[(this->match_called_ ? this->matching_[i] : i)] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -161,7 +161,7 @@ TAO_Notify_StructuredEvents::do_push ( const TAO_Notify_QoSAdmin_i& qos_admin, CosNotification::EventBatch& unsent, int flush_queue - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - " @@ -190,7 +190,7 @@ TAO_Notify_StructuredEvents::do_push ( { matched[i] = unsent[i]; } - consumer->push_structured_events (matched TAO_ENV_ARG_PARAMETER); + consumer->push_structured_events (matched ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Shift the rest of the unsent messages to the front. @@ -229,7 +229,7 @@ TAO_Notify_StructuredEvents::do_push ( this->matching_[index] : index)]; start++; } - consumer->push_structured_events (matched TAO_ENV_ARG_PARAMETER); + consumer->push_structured_events (matched ACE_ENV_ARG_PARAMETER); ACE_CHECK; unsent.length (0); @@ -245,7 +245,7 @@ TAO_Notify_StructuredEvents::do_push ( this->matching_[start] : start)]; start++; } - consumer->push_structured_events (matched TAO_ENV_ARG_PARAMETER); + consumer->push_structured_events (matched ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.h index 0fbb4bbe639..a41afe4b417 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.h @@ -45,14 +45,14 @@ 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 TAO_ENV_ARG_DECL); - 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; + virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL); + virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const; + virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const; virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer, const TAO_Notify_QoSAdmin_i& qos_admin, CosNotification::EventBatch& unsent, int flush_queue - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; protected: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp index c5a6f80b12f..277be4d1b89 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 TAO_ENV_ARG_DECL) +TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_connected (ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL) { ACE_TRY { this->push_supplier_->subscription_change (added, removed - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotification::StructuredEvent & notification ACE_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 TAO_ENV_ARG_PARAMETER); + this->event_manager_->process_event (notify_event, this ACE_ENV_ARG_PARAMETER); ACE_CHECK; notify_event->_decr_refcnt (); } void -TAO_Notify_StructuredProxyPushConsumer_i::disconnect_structured_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_StructuredProxyPushConsumer_i::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // ask our parent to deactivate us. this->supplier_admin_-> - deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER); + deactivate_proxy_pushconsumer (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_disconnected (ACE_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 6f166c499e8..e83adff731d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h @@ -58,7 +58,7 @@ public: // = interface methods virtual void connect_structured_push_supplier ( CosNotifyComm::StructuredPushSupplier_ptr push_supplier - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -67,7 +67,7 @@ public: virtual void push_structured_event ( const CosNotification::StructuredEvent & notification - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -75,7 +75,7 @@ virtual void push_structured_event ( )); virtual void disconnect_structured_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_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 TAO_ENV_ARG_DECL); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_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 ab811b694d9..00770c13a3a 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 TAO_ENV_ARG_DECL) +TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_connected (ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_StructuredProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL) { ACE_TRY { - event.do_push (this->push_consumer_.in () TAO_ENV_ARG_PARAMETER); + event.do_push (this->push_consumer_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHALL { ACE_DEBUG ((LM_DEBUG, "Exception dispatching structured event\n")); // misbehaving client, - this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check + this->shutdown (ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_StructuredProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL) { ACE_TRY { - this->push_consumer_->offer_change (added, removed TAO_ENV_ARG_PARAMETER); + this->push_consumer_->offer_change (added, removed ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_StructuredProxyPushSupplier_i::shutdown_i (ACE_ENV_SINGLE_ARG_DECL) { - this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER); + this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ask our parent to deactivate us. this->consumer_admin_-> - deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER); + deactivate_proxy_pushsupplier (this ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_StructuredProxyPushSupplier_i::disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_StructuredProxyPushSupplier_i::disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { // unregister with CA - this->consumer_admin_->unregister_listener (this TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->unregister_listener (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_StructuredProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_StructuredProxyPushSupplier_i::shutdown (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) return; } - this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_TRY { - this->push_consumer_->disconnect_structured_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->push_consumer_->disconnect_structured_push_consumer (ACE_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 0e578846a02..b73ebe944dc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h @@ -54,7 +54,7 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_No virtual void connect_structured_push_consumer ( CosNotifyComm::StructuredPushConsumer_ptr push_consumer - TAO_ENV_ARG_DECL + ACE_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 ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); // Shutdown. protected: // = Helper methods - void shutdown_i (TAO_ENV_SINGLE_ARG_DECL); + void shutdown_i (ACE_ENV_SINGLE_ARG_DECL); // Shutdown - virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL); + virtual void dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL); // Deliver the event to the consumer. - virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL); + virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_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 d3a54d94d95..4e30fc27bc0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp @@ -50,7 +50,7 @@ void TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator, PortableServer::POA_ptr my_POA - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->my_POA_ = PortableServer::POA::_duplicate (my_POA); @@ -60,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + create_supplier_admin_lock (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_pushconsumer_POA_ = this->poa_factory_-> create_proxy_pushconsumer_POA (this->my_POA_.in (), my_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; my_id_ = my_id; @@ -73,14 +73,14 @@ TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id, } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_SupplierAdmin_i::get_ref (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::get_ref (ACE_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 TAO_ENV_ARG_PARAMETER); + servant_to_reference (this->my_POA_.in (), this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ()); return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ()); @@ -102,15 +102,15 @@ TAO_Notify_SupplierAdmin_i::get_filter_admin (void) } void -TAO_Notify_SupplierAdmin_i::deactivate_proxy_pushconsumer (PortableServer::Servant servant TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::deactivate_proxy_pushconsumer (PortableServer::Servant servant ACE_ENV_ARG_DECL) { this->poa_factory_-> deactivate_object (servant, this->proxy_pushconsumer_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::AdminID -TAO_Notify_SupplierAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_SupplierAdmin_i::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -119,16 +119,16 @@ TAO_Notify_SupplierAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SING } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_SupplierAdmin_i::MyChannel (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::MyChannel (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return event_channel_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return event_channel_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_SupplierAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/) +TAO_Notify_SupplierAdmin_i::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -137,7 +137,7 @@ TAO_Notify_SupplierAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_EN } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_SupplierAdmin_i::push_consumers (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::push_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -146,11 +146,11 @@ TAO_Notify_SupplierAdmin_i::push_consumers (TAO_ENV_SINGLE_ARG_DECL) CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); - return this->proxy_pushconsumer_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->proxy_pushconsumer_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER); } CosNotifyChannelAdmin::ProxyConsumer_ptr -TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::ProxyNotFound @@ -159,74 +159,74 @@ 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 () - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { TAO_Notify_SequenceProxyPushConsumer_i* seq_proxy_pushconsumer = this->channel_objects_factory_->create_seq_proxy_pushconsumer (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushconsumer_var (seq_proxy_pushconsumer); - seq_proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER); + seq_proxy_pushconsumer->init (proxy_id ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_SupplierAdmin_i::obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { TAO_Notify_StructuredProxyPushConsumer_i* struct_proxy_pushconsumer = this->channel_objects_factory_->create_struct_proxy_pushconsumer (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushconsumer_var (struct_proxy_pushconsumer); - struct_proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER); + struct_proxy_pushconsumer->init (proxy_id ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::Object_ptr -TAO_Notify_SupplierAdmin_i::obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL) { TAO_Notify_ProxyPushConsumer_i* proxy_pushconsumer = this->channel_objects_factory_->create_proxy_pushconsumer (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); PortableServer::ServantBase_var proxy_pushconsumer_var (proxy_pushconsumer); - proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER); + proxy_pushconsumer->init (proxy_id ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosNotifyChannelAdmin::ProxyConsumer_ptr -TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminLimitExceeded @@ -246,7 +246,7 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA { case CosNotifyChannelAdmin::ANY_EVENT: { - obj = this->obtain_proxy_pushconsumer_i (proxy_id TAO_ENV_ARG_PARAMETER); + obj = this->obtain_proxy_pushconsumer_i (proxy_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); } break; @@ -254,7 +254,7 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA case CosNotifyChannelAdmin::STRUCTURED_EVENT: { obj = this->obtain_struct_proxy_pushconsumer_i (proxy_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); } break; @@ -262,7 +262,7 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA case CosNotifyChannelAdmin::SEQUENCE_EVENT: { obj = this->obtain_sequence_proxy_pushconsumer_i (proxy_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ()); } break; @@ -274,113 +274,113 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA this->proxy_pushconsumer_ids_.next (); // commit the current id. return CosNotifyChannelAdmin::ProxyConsumer::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::destroy (ACE_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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // deactivate ourselves this->poa_factory_->deactivate_object (this, this->my_POA_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CosNotification::QoSProperties* -TAO_Notify_SupplierAdmin_i::get_qos (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::get_qos (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->qos_admin_.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.set_qos (qos ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotification::UnsupportedQoS )) { - this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER); + this->qos_admin_.validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType )) { this->get_event_manager ()->update_publication_list (added, - removed TAO_ENV_ARG_PARAMETER); + removed ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterID -TAO_Notify_SupplierAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER); + return this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::remove_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER); + this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::Filter_ptr -TAO_Notify_SupplierAdmin_i::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyFilter::FilterNotFound )) { - return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER); + return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER); } CosNotifyFilter::FilterIDSeq* -TAO_Notify_SupplierAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::get_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_SupplierAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER); } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_Notify_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -393,14 +393,14 @@ TAO_Notify_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ServantBase_var proxy_var (cosec_proxy); - cosec_proxy->init (TAO_ENV_SINGLE_ARG_PARAMETER); + cosec_proxy->init (ACE_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 TAO_ENV_ARG_PARAMETER); + activate_object (def_poa.in (), cosec_proxy ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushConsumer::_nil ()); return CosEventChannelAdmin::ProxyPushConsumer::_narrow (obj.in ()); @@ -408,7 +408,7 @@ TAO_Notify_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) // = Pull Methods. CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_SupplierAdmin_i::pull_consumers (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::pull_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -421,7 +421,7 @@ TAO_Notify_SupplierAdmin_i::pull_consumers (TAO_ENV_SINGLE_ARG_DECL) } CosNotifyChannelAdmin::ProxyConsumer_ptr -TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ TAO_ENV_ARG_DECL) +TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyChannelAdmin::AdminLimitExceeded @@ -432,7 +432,7 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelA } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_Notify_SupplierAdmin_i::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_SupplierAdmin_i::obtain_pull_consumer (ACE_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 0bf4940fbb9..3915e4cf514 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h @@ -64,7 +64,7 @@ public: void init (CosNotifyChannelAdmin::AdminID myID, CosNotifyChannelAdmin::InterFilterGroupOperator myOperator, PortableServer::POA_ptr my_POA - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //Initialize the Supplier Admin. // @@ Pradeep: could this method be const? Try to use const @@ -73,7 +73,7 @@ public: // Get our filter admin. void deactivate_proxy_pushconsumer (PortableServer::Servant servant - TAO_ENV_ARG_DECL); + ACE_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 ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); - CosNotifyChannelAdmin::SupplierAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL); + CosNotifyChannelAdmin::SupplierAdmin_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL); // Return the CORBA object for this servant. TAO_Notify_Event_Manager* get_event_manager (void); @@ -96,28 +96,28 @@ 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 ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotifyChannelAdmin::ProxyIDSeq * push_consumers ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -125,7 +125,7 @@ virtual CosNotifyChannelAdmin::ProxyIDSeq * push_consumers ( virtual CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer ( CosNotifyChannelAdmin::ProxyID proxy_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -135,7 +135,7 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer ( virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_pull_consumer ( CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -145,7 +145,7 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_pull_consum virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_push_consumer ( CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -153,14 +153,14 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_push_consum )); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosNotification::QoSProperties * get_qos ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -168,7 +168,7 @@ virtual CosNotification::QoSProperties * get_qos ( virtual void set_qos ( const CosNotification::QoSProperties & qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -178,7 +178,7 @@ virtual void set_qos ( virtual void validate_qos ( const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -188,7 +188,7 @@ virtual void validate_qos ( virtual void offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -197,7 +197,7 @@ virtual void offer_change ( virtual CosNotifyFilter::FilterID add_filter ( CosNotifyFilter::Filter_ptr new_filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -205,7 +205,7 @@ virtual CosNotifyFilter::FilterID add_filter ( virtual void remove_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -214,7 +214,7 @@ virtual void remove_filter ( virtual CosNotifyFilter::Filter_ptr get_filter ( CosNotifyFilter::FilterID filter - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -222,28 +222,28 @@ virtual CosNotifyFilter::Filter_ptr get_filter ( )); virtual CosNotifyFilter::FilterIDSeq * get_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual void remove_all_filters ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )); virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer ( - TAO_ENV_SINGLE_ARG_DECL + ACE_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 TAO_ENV_ARG_DECL); + CORBA::Object_ptr obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL); // Obtain a proxy pushconsumer object - CORBA::Object_ptr obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); + CORBA::Object_ptr obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL); // Obtain a structured proxy pushconsumer object. - CORBA::Object_ptr obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL); + CORBA::Object_ptr obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_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 bd6586314b6..9df8ecd1499 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Notify_Update_Dispatch_Command::execute (ACE_ENV_SINGLE_ARG_DECL) { this->update_listener_->dispatch_update (this->added_, this->removed_ - TAO_ENV_ARG_PARAMETER); + ACE_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 e32a2c9ae3d..a02113c6653 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 (TAO_ENV_SINGLE_ARG_DECL); + virtual int execute (ACE_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 840e27367cc..4c23104c958 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp @@ -23,14 +23,14 @@ TAO_Notify_Worker_Task::init_task (TAO_Notify_AdminProperties* const, } void -TAO_Notify_Worker_Task::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Notify_Worker_Task::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } int -TAO_Notify_Worker_Task::process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value * /*tv*/) +TAO_Notify_Worker_Task::process_event (TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value * /*tv*/) { - int result = mb->execute (TAO_ENV_SINGLE_ARG_PARAMETER); + int result = mb->execute (ACE_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 9b1ff867f97..be7ed7c5378 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h @@ -54,10 +54,10 @@ public: TAO_Notify_QoSAdmin_i* const qos_properties); // Init the task - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); // shutdown this task. - virtual int process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv = 0); + virtual int process_event (TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value *tv = 0); // Process the command. virtual void update_admin (TAO_Notify_AdminProperties& admin); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp index da75658fe8a..ff9e0e0d862 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp @@ -22,7 +22,7 @@ PortableServer::ObjectId * TAO_POA_Hooks::create_id_for_reference ( TAO_POA &the_poa, CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject @@ -36,18 +36,18 @@ TAO_POA_Hooks::create_id_for_reference ( // Create a temporary object reference and then get the // ObjectId out of it. CORBA::Object_var obj_ref = the_poa.create_reference (repository_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); PortableServer::ObjectId_var obj_id = the_poa.reference_to_id (obj_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Associate the object reference with the group reference. this->associate_group_with_ref (the_poa, the_ref, obj_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return obj_id._retn (); @@ -114,7 +114,7 @@ int TAO_POA_Hooks::create_group_acceptors (CORBA::Object_ptr the_ref, TAO_PortableGroup_Acceptor_Registry &acceptor_registry, TAO_ORB_Core &orb_core - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const TAO_MProfile& profiles = the_ref->_stubobj ()->base_profiles (); const TAO_Profile* profile; @@ -130,7 +130,7 @@ TAO_POA_Hooks::create_group_acceptors (CORBA::Object_ptr the_ref, { acceptor_registry.open (profile, orb_core - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ++num; } @@ -147,7 +147,7 @@ PortableServer::IDs * TAO_POA_Hooks::reference_to_ids ( TAO_POA &/*the_poa*/, CORBA::Object_ptr /*the_ref*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject @@ -162,7 +162,7 @@ TAO_POA_Hooks::associate_group_with_ref ( TAO_POA &the_poa, CORBA::Object_ptr group_ref, CORBA::Object_ptr obj_ref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::NotAGroupObject)) { @@ -191,7 +191,7 @@ TAO_POA_Hooks::associate_group_with_ref ( this->create_group_acceptors (group_ref, this->request_dispatcher_.acceptor_registry_, the_poa.orb_core () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -201,7 +201,7 @@ TAO_POA_Hooks::associate_group_with_ref ( this->request_dispatcher_.group_map_.add_groupid_objectkey_pair ( group_id._retn (), key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -211,7 +211,7 @@ TAO_POA_Hooks::associate_reference_with_id ( TAO_POA &the_poa, CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject @@ -222,14 +222,14 @@ TAO_POA_Hooks::associate_reference_with_id ( // it is much easier to extract the object key from the // reference. CORBA::Object_var obj_ref = the_poa.id_to_reference (oid - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Associate the object reference with the group reference. this->associate_group_with_ref (the_poa, ref, obj_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -238,7 +238,7 @@ TAO_POA_Hooks::disassociate_reference_with_id ( TAO_POA &/*the_poa*/, CORBA::Object_ptr /*ref*/, const PortableServer::ObjectId & /*oid*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::NotAGroupObject diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h index 46a1e55f737..bfcdcdfdb2e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h @@ -49,7 +49,7 @@ public: virtual PortableServer::ObjectId * create_id_for_reference ( TAO_POA &the_poa, CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -59,7 +59,7 @@ public: virtual PortableServer::IDs * reference_to_ids ( TAO_POA &the_poa, CORBA::Object_ptr the_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -70,7 +70,7 @@ public: TAO_POA &the_poa, CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -81,7 +81,7 @@ public: TAO_POA &the_poa, CORBA::Object_ptr ref, const PortableServer::ObjectId & oid - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -99,7 +99,7 @@ protected: int create_group_acceptors (CORBA::Object_ptr the_ref, TAO_PortableGroup_Acceptor_Registry &acceptor_registry, TAO_ORB_Core &orb_core - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Helper function to associate group references with /// object references. @@ -107,7 +107,7 @@ protected: TAO_POA &the_poa, CORBA::Object_ptr group_ref, CORBA::Object_ptr obj_ref - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::NotAGroupObject)); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp index ff6909d98a8..b0c22ac01b0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp @@ -35,7 +35,7 @@ TAO_PortableGroup_Acceptor_Registry::~TAO_PortableGroup_Acceptor_Registry (void) void TAO_PortableGroup_Acceptor_Registry::open (const TAO_Profile* profile, TAO_ORB_Core &orb_core - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Entry *entry; @@ -66,7 +66,7 @@ TAO_PortableGroup_Acceptor_Registry::open (const TAO_Profile* profile, this->open_i (profile, orb_core, factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // found = 1; // A usable protocol was found. @@ -83,7 +83,7 @@ void TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile, TAO_ORB_Core &orb_core, TAO_ProtocolFactorySetItor &factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Acceptor *acceptor = (*factory)->factory ()->make_acceptor (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h index ff1e71bfc11..7c2ca835ed8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h @@ -67,7 +67,7 @@ public: /// Open an acceptor based on a tagged profile. void open (const TAO_Profile* profile, TAO_ORB_Core &orb_core - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Close all open acceptors. int close_all (void); @@ -81,7 +81,7 @@ protected: void open_i (const TAO_Profile* profile, TAO_ORB_Core &orb_core, TAO_ProtocolFactorySetItor &factory - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Find an acceptor by using a profile. int find (const TAO_Profile* profile, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp index ff890a90c4e..d64270a8a82 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp @@ -37,7 +37,7 @@ TAO_PortableGroup_Loader::init (int /*argc*/, orb_initializer = temp_orb_initializer; PortableInterceptor::register_orb_initializer (orb_initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp index f17c6673349..a3cadc7b45d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp @@ -26,13 +26,13 @@ TAO_PortableGroup_ORBInitializer::TAO_PortableGroup_ORBInitializer () void TAO_PortableGroup_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Narrow to a TAO_ORBInitInfo object to get access to the // orb_core() TAO extension. TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (tao_info.in ())) @@ -76,7 +76,7 @@ TAO_PortableGroup_ORBInitializer::pre_init ( void TAO_PortableGroup_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h index d87e8c01871..0ee3a735d33 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h @@ -45,11 +45,11 @@ public: TAO_PortableGroup_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp index 9902278a780..df24bdce259 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp @@ -18,7 +18,7 @@ void PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check if the request contains a tagged profile @@ -39,7 +39,7 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core, orb_core, request, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; return; @@ -52,6 +52,6 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core, orb_core->adapter_registry ()->dispatch (request.object_key (), request, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h index 6bcc6a1a8c3..a80cba11a8c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h @@ -47,7 +47,7 @@ public: virtual void dispatch (TAO_ORB_Core *orb_core, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index 675b3986154..77d982f4c97 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -44,7 +44,7 @@ TAO_Portable_Group_Map::~TAO_Portable_Group_Map (void) void TAO_Portable_Group_Map::add_groupid_objectkey_pair (PortableGroup::TagGroupTaggedComponent *group_id, const TAO_ObjectKey &key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Map_Entry *new_entry; @@ -96,7 +96,7 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair (PortableGroup::TagGroupTagge void TAO_Portable_Group_Map::remove_groupid_objectkey_pair (const PortableGroup::TagGroupTaggedComponent* /*group_id*/, const TAO_ObjectKey &/*key*/ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -107,7 +107,7 @@ TAO_Portable_Group_Map::dispatch (PortableGroup::TagGroupTaggedComponent* group_ TAO_ORB_Core *orb_core, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Look up the GroupId. Map_Entry *entry; @@ -129,7 +129,7 @@ TAO_Portable_Group_Map::dispatch (PortableGroup::TagGroupTaggedComponent* group_ orb_core->adapter_registry ()->dispatch (entry->key, request, forward_to - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Reset the read pointer in the message block. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h index da5d24348e3..b903f1d6a1e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h @@ -83,13 +83,13 @@ public: /// This function takes ownership of the memory pointed to be group_id void add_groupid_objectkey_pair (PortableGroup::TagGroupTaggedComponent *group_id, const TAO_ObjectKey &key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Remove a GroupId->ObjectKey mapping from the map. void remove_groupid_objectkey_pair (const PortableGroup::TagGroupTaggedComponent* group_id, const TAO_ObjectKey &key - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Dispatch a request to all of the ObjectIds that belong to /// the specified group. @@ -97,7 +97,7 @@ public: TAO_ORB_Core *orb_core, TAO_ServerRequest &request, CORBA::Object_out forward_to - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Id hash map. typedef ACE_Hash_Map_Manager_Ex< diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 49ad5487662..d364e2abfc4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -88,7 +88,7 @@ TAO_UIPMC_Connector::close (void) int TAO_UIPMC_Connector::connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { TAO_Transport *&transport = invocation->transport (); // ACE_Time_Value *max_wait_time = invocation->max_wait_time (); @@ -182,7 +182,7 @@ TAO_UIPMC_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_UIPMC_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL) +TAO_UIPMC_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) { // The endpoint should be of the form: // N.n@host:port/object_key diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h index d010698dc8c..00ee0ad7582 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h @@ -53,7 +53,7 @@ public: int close (void); int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int preconnect (const char *preconnections); TAO_Profile *create_profile (TAO_InputCDR& cdr); @@ -64,7 +64,7 @@ public: protected: /// = More TAO_Connector methods, please check the documentation on /// Pluggable.h - virtual TAO_Profile * make_profile (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL); /// Obtain UIPMC properties that must be used by this connector, i.e., /// initialize <uipmc_properties_>. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index 7fd2df47ffd..b232cb7842a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -74,7 +74,7 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const CORBA::Octet class_d_address[4], TAO_UIPMC_Profile::TAO_UIPMC_Profile (const char *string, TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : TAO_Profile (TAO_TAG_UIPMC_PROFILE, orb_core, TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)), @@ -83,7 +83,7 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const char *string, tagged_profile_ () { this->add_group_component (); - this->parse_string (string TAO_ENV_ARG_PARAMETER); + this->parse_string (string ACE_ENV_ARG_PARAMETER); ACE_CHECK; addressing_mode_ = default_addressing_mode_; } @@ -177,7 +177,7 @@ TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr) void TAO_UIPMC_Profile::parse_string (const char *string - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Remove the "N.n@" version prefix, if it exists, and verify the // version is one that we accept. @@ -400,7 +400,7 @@ TAO_UIPMC_Profile::is_equivalent (const TAO_Profile *other_profile) CORBA::ULong TAO_UIPMC_Profile::hash (CORBA::ULong max - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // Get the hashvalue for all endpoints. CORBA::ULong hashval = this->endpoint_.hash (); @@ -430,7 +430,7 @@ TAO_UIPMC_Profile::endpoint_count (void) } char * -TAO_UIPMC_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { // @@ Frank: Update to pull out GroupID information... @@ -664,7 +664,7 @@ void TAO_UIPMC_Profile::request_target_specifier ( TAO_Target_Specification &target_spec, TAO_Target_Specification::TAO_Target_Address required_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Fill out the target specifier based on the required type. switch (required_type) @@ -695,7 +695,7 @@ TAO_UIPMC_Profile::supports_multicast (void) const void TAO_UIPMC_Profile::addressing_mode (CORBA::Short addr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ** See race condition note about addressing mode in Profile.h ** switch (addr) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h index 06fcd82e543..b5dd69c96ee 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h @@ -68,7 +68,7 @@ public: /// Create object using a string ior. TAO_UIPMC_Profile (const char *string, TAO_ORB_Core *orb_core - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Destructor is to be called only through <_decr_refcnt>. ~TAO_UIPMC_Profile (void); @@ -76,7 +76,7 @@ public: /// Initialize this object using the given input string. /// Url-style string contain only one endpoint. virtual void parse_string (const char *string - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Return a string representation for this profile. @@ -84,7 +84,7 @@ public: * This is used to create url-style reference. Only one * endpoint is included into the string. */ - virtual char * to_string (TAO_ENV_SINGLE_ARG_DECL); + virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL); /// Initialize this object using the given CDR octet string. virtual int decode (TAO_InputCDR& cdr); @@ -134,7 +134,7 @@ public: /// Return a hash value for this object. virtual CORBA::ULong hash (CORBA::ULong max - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Please refer to Profile.h for the documentation of this /// function. @@ -146,7 +146,7 @@ public: virtual void request_target_specifier ( TAO_Target_Specification &target_spec, TAO_Target_Specification::TAO_Target_Address required_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Returns true since this profile can specify multicast endpoints. virtual int supports_multicast (void) const; @@ -162,7 +162,7 @@ public: /// Set and validate the addressing mode if the remote ORB returns an /// exception. virtual void addressing_mode (CORBA::Short addr_mode - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 8a2eee3b877..41256ad7ba6 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_PropertySetFactory::create_propertyset (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // New a TAO_PropertySet. @@ -109,7 +109,7 @@ TAO_PropertySetFactory::create_propertyset (TAO_ENV_SINGLE_ARG_DECL) 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + return new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } // Allows a client to create a new TAO_PropertySet with specific @@ -118,7 +118,7 @@ TAO_PropertySetFactory::create_propertyset (TAO_ENV_SINGLE_ARG_DECL) CosPropertyService::PropertySet_ptr TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types, const CosPropertyService::Properties &allowed_properties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::ConstraintNotSupported)) { @@ -131,7 +131,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService ACE_NEW_RETURN (new_set, TAO_PropertySet (allowed_property_types, allowed_properties - TAO_ENV_ARG_PARAMETER), + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + propset_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ex) @@ -171,7 +171,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService CosPropertyService::PropertySet_ptr TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -183,7 +183,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr // New a TAO_PropertySet. ACE_NEW_RETURN (new_set, TAO_PropertySet (initial_properties - TAO_ENV_ARG_PARAMETER), + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + propset_ptr = new_set->_this (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_PropertySetDefFactory::create_propertysetdef (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // New a TAO_PropertySetDef. @@ -254,7 +254,7 @@ TAO_PropertySetDefFactory::create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL) this->propertysetdef_products_[cur_len] = new_set; CosPropertyService::PropertySetDef_ptr propsetdef_ptr = - new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return propsetdef_ptr; @@ -263,7 +263,7 @@ TAO_PropertySetDefFactory::create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL) CosPropertyService::PropertySetDef_ptr TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types, const CosPropertyService::PropertyDefs &allowed_property_defs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::ConstraintNotSupported)) { @@ -276,7 +276,7 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS ACE_NEW_RETURN (new_set, TAO_PropertySetDef (allowed_property_types, allowed_property_defs - TAO_ENV_ARG_PARAMETER), + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + propsetdef_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ex) @@ -316,7 +316,7 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS CosPropertyService::PropertySetDef_ptr TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -328,7 +328,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi // New a TAO_PropertySet using these lengths. ACE_NEW_RETURN (new_set, TAO_PropertySetDef (initial_property_defs - TAO_ENV_ARG_PARAMETER), + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + propsetdef_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosPropertyService::MultipleExceptions, ex) @@ -379,7 +379,7 @@ TAO_PropertySet::TAO_PropertySet (void) TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types, const CosPropertyService::Properties allowed_properties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : allowed_property_types_ (allowed_property_types), allowed_property_names_ (allowed_properties.length ()) { @@ -397,7 +397,7 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe ACE_TRY { this->define_properties (allowed_properties - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -414,7 +414,7 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types, const CORBA::ULong number_of_allowed_properties - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) : allowed_property_types_ (allowed_property_types), allowed_property_names_ (number_of_allowed_properties) { @@ -425,14 +425,14 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_properties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Define all the initial properties in the Property Set. All take // *normal* modes. ACE_TRY { this->define_properties (initial_properties - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -461,7 +461,7 @@ TAO_PropertySet::~TAO_PropertySet (void) void TAO_PropertySet::define_property (const char *property_name, const CORBA::Any &property_value - TAO_ENV_ARG_DECL) + ACE_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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // If the sequence is empty, no constraints. if (this->allowed_property_types_.length () == 0) @@ -559,7 +559,7 @@ TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type) ACE_TRY { ret_val = this->allowed_property_types_[ti]->equal (type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret_val == 1) @@ -608,7 +608,7 @@ TAO_PropertySet::is_property_allowed (const char* property_name) void TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -625,7 +625,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope // Define this property. this->define_property (nproperties [pi].property_name.in (), nproperties [pi].property_value - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PropertySet::get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->hash_table_.current_size (); @@ -707,7 +707,7 @@ void TAO_PropertySet::get_all_property_names (CORBA::ULong how_many, CosPropertyService::PropertyNames_out property_names, CosPropertyService::PropertyNamesIterator_out rest - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_number_of_properties (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + names_iterator->_this (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + names_iterator->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Init the out parameter. @@ -792,7 +792,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many, CORBA::Any * TAO_PropertySet::get_property_value (const char *property_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName)) @@ -829,7 +829,7 @@ TAO_PropertySet::get_property_value (const char *property_name CORBA::Boolean TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &property_names, CosPropertyService::Properties_out nproperties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. @@ -853,7 +853,7 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper for (size_t i = 0; i < n; i++) { any_ptr = get_property_value (property_names [i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (any_ptr != 0) @@ -885,7 +885,7 @@ void TAO_PropertySet::get_all_properties (CORBA::ULong how_many, CosPropertyService::Properties_out nproperties, CosPropertyService::PropertiesIterator_out rest - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + iterator->_this (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + iterator->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Init the out parameter. @@ -979,7 +979,7 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many, void TAO_PropertySet::delete_property (const char *property_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName, @@ -1019,7 +1019,7 @@ TAO_PropertySet::delete_property (const char *property_name void TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -1037,7 +1037,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro { // Delete this property. this->delete_property (property_names[pi] - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_PropertySet::delete_all_properties (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) CosPropertyService::PropertyNamesIterator_out iter_out (iter_ptr); CosPropertyService::PropertyNamesIterator_var iter; - CORBA::ULong size = this->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong size = this->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); this->get_all_property_names (size, names_out, iter_out - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Get the out values on to the var varibles. @@ -1116,7 +1116,7 @@ TAO_PropertySet::delete_all_properties (TAO_ENV_SINGLE_ARG_DECL) // Delete all these properties. this->delete_properties (names.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // All properties deleted. @@ -1128,7 +1128,7 @@ TAO_PropertySet::delete_all_properties (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_PropertySet::is_property_defined (const char *property_name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName)) { @@ -1159,10 +1159,10 @@ TAO_PropertySetDef::TAO_PropertySetDef (void) TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types, const CosPropertyService::PropertyDefs allowed_property_defs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : TAO_PropertySet(allowed_property_types, allowed_property_defs.length () - TAO_ENV_ARG_PARAMETER) + ACE_ENV_ARG_PARAMETER) { // Set the length of the allowed property names. this->allowed_property_names_.length (allowed_property_defs.length ()); @@ -1176,7 +1176,7 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes ACE_TRY { this->define_properties_with_modes (allowed_property_defs - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1190,10 +1190,10 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes // Constructor that the factory uses. TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->define_properties_with_modes (initial_property_defs - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1206,7 +1206,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Copy contents of the sequence. @@ -1216,7 +1216,7 @@ TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyType void TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // We have all the names, get the values and the modes from the Hash @@ -1240,7 +1240,7 @@ void TAO_PropertySetDef::define_property_with_mode (const char *property_name, const CORBA::Any &property_value, CosPropertyService::PropertyModeType property_mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::ConflictingProperty, @@ -1322,7 +1322,7 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name, // MultipleExceptions sequence and raise that. void TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -1341,7 +1341,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop this->define_property_with_mode (property_defs[i].property_name, property_defs[i].property_value, property_defs[i].property_mode - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosPropertyService::InvalidPropertyName, ex) @@ -1415,7 +1415,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop // PropertyNotFound exceptions. CosPropertyService::PropertyModeType TAO_PropertySetDef::get_property_mode (const char *property_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName)) @@ -1453,7 +1453,7 @@ TAO_PropertySetDef::get_property_mode (const char *property_name CORBA::Boolean TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames &property_names, CosPropertyService::PropertyModes_out property_modes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate memory for the out parameter. @@ -1481,7 +1481,7 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames { // Invoke get_property_mode for this name. mode = this->get_property_mode (property_names[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Store the mode in the out sequence. @@ -1513,7 +1513,7 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames void TAO_PropertySetDef::set_property_mode (const char *property_name, CosPropertyService::PropertyModeType property_mode - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::PropertyNotFound, @@ -1607,7 +1607,7 @@ TAO_PropertySetDef::set_property_mode (const char *property_name, void TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)) { @@ -1624,7 +1624,7 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes { this->set_property_mode (property_modes[i].property_name, property_modes[i].property_mode - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PropertyNamesIterator::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->iterator_ = this->iterator_.map ().begin (); @@ -1702,7 +1702,7 @@ TAO_PropertyNamesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Boolean TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { COSPROPERTY_HASH_ENTRY *entry_ptr; @@ -1721,7 +1721,7 @@ TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name CORBA::Boolean TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many, CosPropertyService::PropertyNames_out property_names - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_PropertyNamesIterator::destroy (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1785,7 +1785,7 @@ TAO_PropertiesIterator::~TAO_PropertiesIterator (void) } void -TAO_PropertiesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_PropertiesIterator::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->iterator_ = this->iterator_.map ().begin (); @@ -1793,7 +1793,7 @@ TAO_PropertiesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Boolean TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { COSPROPERTY_HASH_ENTRY *entry_ptr; @@ -1816,7 +1816,7 @@ TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty CORBA::Boolean TAO_PropertiesIterator::next_n (CORBA::ULong how_many, CosPropertyService::Properties_out nproperties - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_PropertiesIterator::destroy (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index 2e55d30489e..66f85f5542a 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -126,7 +126,7 @@ public: // Destructor. virtual CosPropertyService::PropertySet_ptr - create_propertyset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create_propertyset (ACE_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." @@ -134,7 +134,7 @@ public: virtual CosPropertyService::PropertySet_ptr create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types, const CosPropertyService::Properties &allowed_properties - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::ConstraintNotSupported)); // Allows a client to create a new TAO_PropertySet with specific @@ -142,7 +142,7 @@ public: virtual CosPropertyService::PropertySet_ptr create_initial_propertyset (const CosPropertyService::Properties &initial_properties - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // Allows a client to create a new TAO_PropertySet with specific @@ -179,14 +179,14 @@ public: // Destructor. virtual CosPropertyService::PropertySetDef_ptr - create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + create_propertysetdef (ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::ConstraintNotSupported)); // Allows a client to create a new TAO_PropertySetDef with specific @@ -194,7 +194,7 @@ public: virtual CosPropertyService::PropertySetDef_ptr create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // Allows a client to create a new TAO_PropertySetDef with specific @@ -227,16 +227,16 @@ public: TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types, const CosPropertyService::Properties allowed_properties - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Init values that the PropertySetFactory will want to specify. TAO_PropertySet (const CosPropertyService::Properties initial_properties - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // PropertySetFactory needs this constructor. TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types, const CORBA::ULong number_of_allowed_propertydefs - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // PropertySetDef's construction needs this. virtual ~TAO_PropertySet (void); @@ -244,7 +244,7 @@ public: virtual void define_property (const char *property_name, const CORBA::Any &property_value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::ConflictingProperty, @@ -256,12 +256,12 @@ public: // property name, duplicate name, type code over writing etc. virtual void define_properties (const CosPropertyService::Properties &nproperties - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::ULong get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the number of properties that are currently defined in the // PropertySet. @@ -269,13 +269,13 @@ public: virtual void get_all_property_names (CORBA::ULong how_many, CosPropertyService::PropertyNames_out property_names, CosPropertyService::PropertyNamesIterator_out rest - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName)); @@ -283,21 +283,21 @@ public: virtual CORBA::Boolean get_properties (const CosPropertyService::PropertyNames &property_names, CosPropertyService::Properties_out nproperties - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName, @@ -305,17 +305,17 @@ public: // Delete a property given a name. virtual void delete_properties (const CosPropertyService::PropertyNames &property_names - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Boolean delete_all_properties (ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName)); // Tell whether this property is defined or no. Forget about the @@ -382,18 +382,18 @@ public: TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types, const CosPropertyService::PropertyDefs allowed_property - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The factory uses this constructor. TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs - TAO_ENV_ARG_DECL); + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 @@ -402,7 +402,7 @@ public: // get_allowed_properties output sequence is not empty. virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Indicates which properties are supported by this PropertySet. If @@ -413,7 +413,7 @@ public: virtual void define_property_with_mode (const char *property_name, const CORBA::Any &property_value, CosPropertyService::PropertyModeType property_mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::ConflictingProperty, @@ -430,14 +430,14 @@ public: // exception is thrown. virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::PropertyNotFound, CosPropertyService::InvalidPropertyName)); @@ -446,7 +446,7 @@ public: virtual CORBA::Boolean get_property_modes (const CosPropertyService::PropertyNames &property_names, CosPropertyService::PropertyModes_out property_modes - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 @@ -458,7 +458,7 @@ public: virtual void set_property_mode (const char *property_name, CosPropertyService::PropertyModeType property_mode - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::InvalidPropertyName, CosPropertyService::PropertyNotFound, @@ -475,7 +475,7 @@ public: // raised. virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CosPropertyService::MultipleExceptions)); // Batch operation for setting the property. Raises @@ -505,13 +505,13 @@ public: virtual ~TAO_PropertyNamesIterator (void); // Destructor. - virtual void reset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void reset (ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 @@ -520,7 +520,7 @@ public: virtual CORBA::Boolean next_n (CORBA::ULong how_many, CosPropertyService::PropertyNames_out property_names - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 @@ -528,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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroys the iterator. private: @@ -568,12 +568,12 @@ public: virtual ~TAO_PropertiesIterator (void); // Destructor. - virtual void reset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void reset (ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 @@ -582,7 +582,7 @@ public: virtual CORBA::Boolean next_n (CORBA::ULong how_many, CosPropertyService::Properties_out nproperties - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 @@ -590,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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_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 66a03582d03..e42168ee991 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp +++ b/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp @@ -19,7 +19,7 @@ TAO_LB_ReplicaLocator::preinvoke ( PortableServer::POA_ptr /* adapter */, const char * /* operation */, PortableServer::ServantLocator::Cookie & /* the_cookie */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -27,7 +27,7 @@ TAO_LB_ReplicaLocator::preinvoke ( ACE_THROW_RETURN (CORBA::INTERNAL (), 0); CORBA::Object_var replica = - this->load_balancer_->replica (TAO_ENV_SINGLE_ARG_PARAMETER); + this->load_balancer_->replica (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Throw a forward exception to force the client to redirect its @@ -44,7 +44,7 @@ TAO_LB_ReplicaLocator::postinvoke ( const char * /* operation */, PortableServer::ServantLocator::Cookie /* the_cookie */, PortableServer::Servant /* the_servant */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // No-op diff --git a/TAO/orbsvcs/orbsvcs/ReplicaLocator.h b/TAO/orbsvcs/orbsvcs/ReplicaLocator.h index 9031dbb51fc..0507fd23d50 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaLocator.h +++ b/TAO/orbsvcs/orbsvcs/ReplicaLocator.h @@ -50,7 +50,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie & the_cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -60,7 +60,7 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp index bfc9d025ba7..f111819e7f8 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp +++ b/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp @@ -23,7 +23,7 @@ TAO_LB_ReplicaProxy::TAO_LB_ReplicaProxy (void) void TAO_LB_ReplicaProxy::current_load (CORBA::Float load - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->balancer_->load_changed (this ACE_ENV_ARG_PARAMETER); } void -TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_ReplicaProxy::disconnect (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected, CORBA::SystemException)) { @@ -49,7 +49,7 @@ TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL) if (this->connected_) { - this->balancer_->disconnect (this TAO_ENV_ARG_PARAMETER); + this->balancer_->disconnect (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->connected_ = 0; @@ -64,7 +64,7 @@ void TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer, LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_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 9eb629ea29f..8f29e644a6d 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaProxy.h +++ b/TAO/orbsvcs/orbsvcs/ReplicaProxy.h @@ -55,7 +55,7 @@ public: // Return a reference to the Replica. virtual void current_load (CORBA::Float load - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected, CORBA::SystemException)); // Send a request to disconnect from the LoadBalancer. @@ -93,7 +93,7 @@ private: void connect (TAO_LB_LoadBalancer *balancer, LoadBalancing::ReplicaControl_ptr control, CORBA::Object_ptr replica - TAO_ENV_ARG_DECL) + ACE_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 4da47b060d7..d587a309dfa 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_LB_Round_Robin_Strategy::replica (ACE_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 93887fc6ac0..988e18ea25e 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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Object_ptr replica (ACE_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 1faa1a245f8..181011de6f0 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -29,7 +29,7 @@ ACE_Runtime_Scheduler (int config_count, RtecScheduler::handle_t ACE_Runtime_Scheduler::create (const char *entry_point - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)) { @@ -48,10 +48,10 @@ ACE_Runtime_Scheduler::create (const char *entry_point RtecScheduler::handle_t ACE_Runtime_Scheduler::lookup (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return create (entry_point TAO_ENV_ARG_PARAMETER); + return create (entry_point ACE_ENV_ARG_PARAMETER); } @@ -59,7 +59,7 @@ ACE_Runtime_Scheduler::lookup (const char * entry_point RtecScheduler::RT_Info * ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -110,7 +110,7 @@ ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle, RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -147,7 +147,7 @@ ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) @@ -170,22 +170,22 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) { - RtecScheduler::handle_t handle = lookup (entry_point TAO_ENV_ARG_PARAMETER); + RtecScheduler::handle_t handle = lookup (entry_point ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (handle < -1) - // The exception was thrown or is in TAO_ENV_SINGLE_ARG_PARAMETER already. + // The exception was thrown or is in ACE_ENV_SINGLE_ARG_PARAMETER already. return; this->priority (handle, priority, subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -197,7 +197,7 @@ ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t /* dependency */, CORBA::Long /* number_of_calls */, RtecScheduler::Dependency_Type_t /* dependency_type */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -232,7 +232,7 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */, RtecScheduler::RT_Info_Set_out /* infos */, RtecScheduler::Config_Info_Set_out /* configs */, RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, @@ -251,7 +251,7 @@ void ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& priority, RtecScheduler::Dispatching_Type_t & d_type - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +ACE_Runtime_Scheduler::last_scheduled_priority (ACE_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 61c7f6de038..1b85939bc90 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h @@ -40,7 +40,7 @@ public: // Constructor. Initialize the data from the POD_RT_Info array. virtual RtecScheduler::handle_t create (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)); // Create an RT_Info. In the config run scheduler this actually constructs @@ -48,13 +48,13 @@ public: // it's not present. virtual RtecScheduler::handle_t lookup (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); // Return a pointer to the RT_Info corresponding to the passed handle. @@ -69,7 +69,7 @@ public: RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); // Set characteristics of the RT_Info corresponding to the passed handle. @@ -78,7 +78,7 @@ public: RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -89,7 +89,7 @@ public: RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -100,7 +100,7 @@ public: RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); // In the config run scheduler, this method registers a dependency between @@ -111,7 +111,7 @@ public: RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, @@ -123,13 +123,13 @@ public: virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Dispatching_Type_t & d_type - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (ACE_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 5742ba7d84f..c8fa5d4df4a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -119,7 +119,7 @@ int TAO_IIOP_SSL_Connector::connect ( TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 e4e999675f5..634cedd3a73 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -53,7 +53,7 @@ public: int close (void); int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); public: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index a556252a79c..0f5907519f2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -122,7 +122,7 @@ TAO_SSLIOP_Connector::close (void) int TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -149,12 +149,12 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, // policy for the current object. CORBA::Policy_var policy = invocation->stub ()->get_policy (Security::SecEstablishTrustPolicy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); SecurityLevel2::EstablishTrustPolicy_var trust_policy = SecurityLevel2::EstablishTrustPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // We use a pointer and temporary to make it obvious to determine @@ -164,7 +164,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, Security::EstablishTrust trust = { 0 , 0 }; if (!CORBA::is_nil (trust_policy.in ())) { - trust = trust_policy->trust (TAO_ENV_SINGLE_ARG_PARAMETER); + trust = trust_policy->trust (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -197,12 +197,12 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); SecurityLevel2::QOPPolicy_var qop_policy = SecurityLevel2::QOPPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 ())) { - qop = qop_policy->qop (TAO_ENV_SINGLE_ARG_PARAMETER); + qop = qop_policy->qop (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -239,7 +239,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, { return this->iiop_connect (ssl_endpoint, invocation - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } return this->ssliop_connect (ssl_endpoint, @@ -247,7 +247,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, trust, invocation, desc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } @@ -270,7 +270,7 @@ TAO_SSLIOP_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_SSLIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL) +TAO_SSLIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) { // The endpoint should be of the form: // N.n@host:port/object_key @@ -294,7 +294,7 @@ TAO_SSLIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL) int TAO_SSLIOP_Connector::iiop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const SSLIOP::SSL &ssl_component = ssl_endpoint->ssl_component (); @@ -329,7 +329,7 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } int @@ -338,7 +338,7 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, const Security::EstablishTrust &trust, TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_Transport *&transport = invocation->transport (); ACE_Time_Value *max_wait_time = invocation->max_wait_time (); @@ -486,7 +486,7 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, TAO_SSLIOP_Credentials_var credentials = this->retrieve_credentials (invocation->stub (), svc_handler->peer ().ssl () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); svc_handler = safe_handler.release (); @@ -569,18 +569,18 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, TAO_SSLIOP_Credentials * TAO_SSLIOP_Connector::retrieve_credentials (TAO_Stub *stub, SSL *ssl - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Check if the user overrode the default invocation credentials. CORBA::Policy_var policy = stub->get_policy (Security::SecInvocationCredentialsPolicy - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ()); SecurityLevel2::InvocationCredentialsPolicy_var creds_policy = SecurityLevel2::InvocationCredentialsPolicy::_narrow ( policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ()); TAO_SSLIOP_Credentials_var ssliop_credentials; @@ -590,7 +590,7 @@ TAO_SSLIOP_Connector::retrieve_credentials (TAO_Stub *stub, if (!CORBA::is_nil (creds_policy.in ())) { SecurityLevel2::CredentialsList_var creds_list = - creds_policy->creds (TAO_ENV_SINGLE_ARG_PARAMETER); + creds_policy->creds (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ()); if (creds_list->length () > 0) @@ -603,7 +603,7 @@ TAO_SSLIOP_Connector::retrieve_credentials (TAO_Stub *stub, ssliop_credentials = TAO_SSLIOP_Credentials::_narrow (credentials - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ()); if (!CORBA::is_nil (ssliop_credentials.in ())) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h index 2842d3a062f..3d6175aa057 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h @@ -60,7 +60,7 @@ public: virtual int close (void); virtual int connect (TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual TAO_Profile *create_profile (TAO_InputCDR& cdr); //@} @@ -71,7 +71,7 @@ protected: * * Please check the documentation in Pluggable.h. */ - virtual TAO_Profile * make_profile (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL); /// IIOP-specific connection establishment. /** @@ -79,7 +79,7 @@ protected: */ int iiop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint, TAO_GIOP_Invocation *invocation - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// SSLIOP-specific connection establishment. int ssliop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint, @@ -87,14 +87,14 @@ protected: const Security::EstablishTrust &trust, TAO_GIOP_Invocation *invocation, TAO_Transport_Descriptor_Interface *desc - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Retrieve SSLIOP credentials from the policy overrides list and /// set up the underlying SSL connection to use the X.509 /// certificates stored within them. TAO_SSLIOP_Credentials * retrieve_credentials (TAO_Stub *stub, SSL *ssl - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); public: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp index 62015c21e9a..07ed18f146f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp @@ -40,7 +40,7 @@ TAO_SSLIOP_Credentials::~TAO_SSLIOP_Credentials (void) } SecurityLevel2::Credentials_ptr -TAO_SSLIOP_Credentials::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_SSLIOP_Credentials::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SSLIOP_Credentials *c = 0; @@ -58,20 +58,20 @@ TAO_SSLIOP_Credentials::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_SSLIOP_Credentials::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Credentials::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::InvocationCredentialsType -TAO_SSLIOP_Credentials::credentials_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Credentials::credentials_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecOwnCredentials; } Security::AuthenticationStatus -TAO_SSLIOP_Credentials::authentication_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Credentials::authentication_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Is the following statement correct? @@ -83,7 +83,7 @@ TAO_SSLIOP_Credentials::authentication_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } char * -TAO_SSLIOP_Credentials::mechanism (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Credentials::mechanism (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // @todo Is the following correct? @@ -97,7 +97,7 @@ TAO_SSLIOP_Credentials::mechanism (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) Security::AssociationOptions TAO_SSLIOP_Credentials::accepting_options_supported ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->accepting_options_supported_; @@ -106,7 +106,7 @@ TAO_SSLIOP_Credentials::accepting_options_supported ( void TAO_SSLIOP_Credentials::accepting_options_supported ( Security::AssociationOptions accepting_options_supported - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @todo Verify that the given accepting options are valid @@ -130,7 +130,7 @@ TAO_SSLIOP_Credentials::accepting_options_supported ( Security::AssociationOptions TAO_SSLIOP_Credentials::accepting_options_required ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->accepting_options_required_; @@ -139,7 +139,7 @@ TAO_SSLIOP_Credentials::accepting_options_required ( void TAO_SSLIOP_Credentials::accepting_options_required ( Security::AssociationOptions accepting_options_required - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // "accepting_options_required" should not have "more" capability @@ -158,7 +158,7 @@ TAO_SSLIOP_Credentials::accepting_options_required ( Security::AssociationOptions TAO_SSLIOP_Credentials::invocation_options_supported ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->invocation_options_supported_; @@ -167,7 +167,7 @@ TAO_SSLIOP_Credentials::invocation_options_supported ( void TAO_SSLIOP_Credentials::invocation_options_supported ( Security::AssociationOptions invocation_options_supported - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if ((invocation_options_supported & ::TAO_SSLIOP_DISALLOWED_ASSOCIATIONS) @@ -183,7 +183,7 @@ TAO_SSLIOP_Credentials::invocation_options_supported ( Security::AssociationOptions TAO_SSLIOP_Credentials::invocation_options_required ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->invocation_options_required_; @@ -192,7 +192,7 @@ TAO_SSLIOP_Credentials::invocation_options_required ( void TAO_SSLIOP_Credentials::invocation_options_required ( Security::AssociationOptions invocation_options_required - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if ((invocation_options_required & ::TAO_SSLIOP_DISALLOWED_ASSOCIATIONS) @@ -210,7 +210,7 @@ CORBA::Boolean TAO_SSLIOP_Credentials::get_security_feature ( Security::CommunicationDirection /* direction */, Security::SecurityFeature /* feature */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -225,7 +225,7 @@ CORBA::Boolean TAO_SSLIOP_Credentials::set_attributes ( const Security::AttributeList & /* requested_attributes */, Security::AttributeList_out /* actual_attributes */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -239,7 +239,7 @@ TAO_SSLIOP_Credentials::set_attributes ( Security::AttributeList * TAO_SSLIOP_Credentials::get_attributes ( const Security::AttributeTypeList & /* attributes */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -253,7 +253,7 @@ TAO_SSLIOP_Credentials::get_attributes ( CORBA::Boolean TAO_SSLIOP_Credentials::is_valid ( Security::UtcT_out expiry_time - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { X509 *x = this->x509_.in (); @@ -301,7 +301,7 @@ TAO_SSLIOP_Credentials::is_valid ( CORBA::Boolean TAO_SSLIOP_Credentials::refresh (const CORBA::Any & /* refresh_data */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Until it is clear the code below is correct, throw a @@ -416,15 +416,15 @@ TAO_SSLIOP_Credentials::hash (void) const TAO_SSLIOP_Credentials_ptr TAO_SSLIOP_Credentials::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return TAO_SSLIOP_Credentials::_unchecked_narrow (obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_SSLIOP_Credentials_ptr TAO_SSLIOP_Credentials::_unchecked_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return TAO_SSLIOP_Credentials::_nil (); @@ -512,10 +512,10 @@ tao_TAO_SSLIOP_Credentials_nil ( TAO_SSLIOP_Credentials_ptr tao_TAO_SSLIOP_Credentials_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_SSLIOP_Credentials::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO_SSLIOP_Credentials::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -637,10 +637,10 @@ TAO_SSLIOP_Credentials_var::tao_nil (void) ::TAO_SSLIOP_Credentials_ptr TAO_SSLIOP_Credentials_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_SSLIOP_Credentials::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_SSLIOP_Credentials::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index b3ec3619e01..68f70b49f06 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -58,7 +58,7 @@ public: static TAO_SSLIOP_Credentials_ptr tao_nil (void); static TAO_SSLIOP_Credentials_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); @@ -109,11 +109,11 @@ public: /// Return a duplicate (specifically a deep copy) of this credential /// object. virtual SecurityLevel2::Credentials_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the invocation credentials type this object is. @@ -133,79 +133,79 @@ public: * (i.e. Security::SecTargetCredentials) is returned. */ virtual Security::InvocationCredentialsType credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AuthenticationStatus authentication_state ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual char * mechanism ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions accepting_options_supported ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void accepting_options_supported ( Security::AssociationOptions accepting_options_supported - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions accepting_options_required ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void accepting_options_required ( Security::AssociationOptions accepting_options_required - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions invocation_options_supported ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void invocation_options_supported ( Security::AssociationOptions invocation_options_supported - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions invocation_options_required ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void invocation_options_required ( Security::AssociationOptions invocation_options_required - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean get_security_feature ( Security::CommunicationDirection direction, Security::SecurityFeature feature - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean set_attributes ( const Security::AttributeList & requested_attributes, Security::AttributeList_out actual_attributes - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AttributeList * get_attributes ( const Security::AttributeTypeList & attributes - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Verify that this credential is still valid. virtual CORBA::Boolean is_valid ( Security::UtcT_out expiry_time - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean refresh ( const CORBA::Any & refresh_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ @@ -244,12 +244,12 @@ public: static TAO_SSLIOP_Credentials_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_Credentials_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_Credentials_ptr _nil (void) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp index 896c4041c50..b7289fb5256 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 ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_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 ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_SSLIOP_Current::no_context (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return (this->implementation () == 0 ? 1 : 0); @@ -132,15 +132,15 @@ TAO_SSLIOP_Current::teardown (TAO_SSLIOP_Current_Impl *prev_impl, TAO_SSLIOP_Current_ptr TAO_SSLIOP_Current::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - return TAO_SSLIOP_Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER); + return TAO_SSLIOP_Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER); } TAO_SSLIOP_Current_ptr TAO_SSLIOP_Current::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return TAO_SSLIOP_Current::_nil (); @@ -247,10 +247,10 @@ tao_TAO_SSLIOP_Current_nil ( TAO_SSLIOP_Current_ptr tao_TAO_SSLIOP_Current_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_SSLIOP_Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO_SSLIOP_Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -375,10 +375,10 @@ TAO_SSLIOP_Current_var::tao_nil (void) ::TAO_SSLIOP_Current_ptr TAO_SSLIOP_Current_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_SSLIOP_Current::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_SSLIOP_Current::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index 7c27bf20d1d..a3798369bac 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 ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_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 ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_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 ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Set the TSS slot ID assigned to this object. @@ -118,12 +118,12 @@ public: static TAO_SSLIOP_Current_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_SSLIOP_Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static TAO_SSLIOP_Current_ptr _nil (void) @@ -197,7 +197,7 @@ public: static TAO_SSLIOP_Current_ptr tao_nil (void); static TAO_SSLIOP_Current_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_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 e65c3d59886..2264ace46b3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp @@ -23,7 +23,7 @@ TAO_SSLIOP_Current_Impl::~TAO_SSLIOP_Current_Impl (void) Security::AttributeList * TAO_SSLIOP_Current_Impl::get_attributes ( const Security::AttributeTypeList &attributes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong len = attributes.length (); @@ -126,7 +126,7 @@ TAO_SSLIOP_Current_Impl::get_attributes ( SecurityLevel2::ReceivedCredentials_ptr TAO_SSLIOP_Current_Impl::received_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SSLIOP_X509_var cert = ::SSL_get_peer_certificate (this->ssl_); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h index db6de036f3d..29d834ea4ef 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h @@ -50,13 +50,13 @@ public: /// SecurityLevel1::Current::get_attributes() method. virtual Security::AttributeList * get_attributes ( const Security::AttributeTypeList &attributes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// SSLIOP-specific version of the /// SecurityLevel2::Current::received_credentials() method. virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_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 0900543150e..a2778ea49eb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -212,7 +212,7 @@ TAO_SSLIOP_Protocol_Factory::init (int argc, int TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // @todo: This hard-coding should be fixed once SECIOP is @@ -231,7 +231,7 @@ TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void) PortableInterceptor::ORBInitializer_var initializer = tmp; PortableInterceptor::register_orb_initializer (initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register the SSLIOP ORB initializer. @@ -249,7 +249,7 @@ TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void) initializer = tmp; PortableInterceptor::register_orb_initializer (initializer.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 f708da783fa..e10055a6dab 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp @@ -25,7 +25,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor:: char * TAO_SSLIOP_Server_Invocation_Interceptor::name ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("TAO_SSLIOP_Server_Invocation_Interceptor"); @@ -33,7 +33,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::name ( void TAO_SSLIOP_Server_Invocation_Interceptor::destroy ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -42,7 +42,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::destroy ( void TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -56,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ssliop_current_->no_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (no_ssl && this->qop_ != Security::SecQOPNoProtection) @@ -70,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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ssliop_current_->get_peer_certificate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // @@ The following debugging code works but I don't think that @@ -128,7 +128,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts ( void TAO_SSLIOP_Server_Invocation_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -137,7 +137,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request ( void TAO_SSLIOP_Server_Invocation_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -145,7 +145,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::send_reply ( void TAO_SSLIOP_Server_Invocation_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -154,7 +154,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::send_exception ( void TAO_SSLIOP_Server_Invocation_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h index e71ec09950f..433244598e1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h @@ -61,38 +61,38 @@ public: * PortableInterceptor::ServerRequestInterceptor interface. */ //@{ - virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void send_other ( PortableInterceptor::ServerRequestInfo_ptr ri - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); //@} diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index a4bf5a6112a..129bc080131 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -27,12 +27,12 @@ TAO_SSLIOP_ORBInitializer::TAO_SSLIOP_ORBInitializer (Security::QOP qop) void TAO_SSLIOP_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (tao_info.in ())) @@ -63,14 +63,14 @@ TAO_SSLIOP_ORBInitializer::pre_init ( // Register the SSLIOP::Current object reference with the ORB. info->register_initial_reference ("SSLIOPCurrent", ssliop_current.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_SSLIOP_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Note we do not store the SSLIOP::Current as a class member since @@ -84,11 +84,11 @@ TAO_SSLIOP_ORBInitializer::post_init ( // pre_init() method. CORBA::Object_var obj = - info->resolve_initial_references ("SSLIOPCurrent" TAO_ENV_ARG_PARAMETER); + info->resolve_initial_references ("SSLIOPCurrent" ACE_ENV_ARG_PARAMETER); ACE_CHECK; SSLIOP::Current_var ssliop_current = - SSLIOP::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + SSLIOP::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (ssliop_current.in ())) @@ -99,7 +99,7 @@ TAO_SSLIOP_ORBInitializer::post_init ( if (tao_current != 0) { - size_t slot = this->get_tss_slot_id (info TAO_ENV_ARG_PARAMETER); + size_t slot = this->get_tss_slot_id (info ACE_ENV_ARG_PARAMETER); ACE_CHECK; tao_current->tss_slot (slot); @@ -128,27 +128,27 @@ TAO_SSLIOP_ORBInitializer::post_init ( // Register the SSLIOP secure invocation server request interceptor // with the ORB. info->add_server_request_interceptor (si_interceptor.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Register the SSLIOP-specific vault with the // PrincipalAuthenticator. obj = info->resolve_initial_references ("SecurityManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; SecurityLevel2::SecurityManager_var manager = SecurityLevel2::SecurityManager::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; SecurityLevel2::PrincipalAuthenticator_var pa = - manager->principal_authenticator (TAO_ENV_SINGLE_ARG_PARAMETER); + manager->principal_authenticator (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_PrincipalAuthenticator_var tao_pa = TAO_PrincipalAuthenticator::_narrow (pa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; SecurityReplaceable::Vault_ptr vault; @@ -160,25 +160,25 @@ TAO_SSLIOP_ORBInitializer::post_init ( SecurityReplaceable::Vault_var safe_vault = vault; // :-) tao_pa->register_vault (vault - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } size_t TAO_SSLIOP_ORBInitializer::get_tss_slot_id ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Obtain the Security Service TSS slot ID from the SecurityCurrent // object. CORBA::Object_var obj = info->resolve_initial_references ("SecurityCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); SecurityLevel2::Current_var current = SecurityLevel2::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 874ec46fa91..1c610432e8e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h @@ -53,11 +53,11 @@ public: TAO_SSLIOP_ORBInitializer (Security::QOP qop); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -65,7 +65,7 @@ private: // Obtain the TSS slot ID assigned to the "SSLIOPCurrent" object. size_t get_tss_slot_id ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp index a28808b374b..08c2f808c35 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp @@ -14,7 +14,7 @@ TAO_SSLIOP_ReceivedCredentials::TAO_SSLIOP_ReceivedCredentials (X509 *cert, } SecurityLevel2::Credentials_ptr -TAO_SSLIOP_ReceivedCredentials::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_SSLIOP_ReceivedCredentials::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SSLIOP_ReceivedCredentials *c = 0; @@ -33,7 +33,7 @@ TAO_SSLIOP_ReceivedCredentials::copy (TAO_ENV_SINGLE_ARG_DECL) Security::InvocationCredentialsType TAO_SSLIOP_ReceivedCredentials::credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecReceivedCredentials; @@ -41,7 +41,7 @@ TAO_SSLIOP_ReceivedCredentials::credentials_type ( SecurityLevel2::Credentials_ptr TAO_SSLIOP_ReceivedCredentials::accepting_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -54,7 +54,7 @@ TAO_SSLIOP_ReceivedCredentials::accepting_credentials ( Security::AssociationOptions TAO_SSLIOP_ReceivedCredentials::association_options_used ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -69,7 +69,7 @@ TAO_SSLIOP_ReceivedCredentials::association_options_used ( Security::DelegationState TAO_SSLIOP_ReceivedCredentials::delegation_state ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // It is not possible to perform credentials delegation with SSLIOP, @@ -80,7 +80,7 @@ TAO_SSLIOP_ReceivedCredentials::delegation_state ( Security::DelegationMode TAO_SSLIOP_ReceivedCredentials::delegation_mode ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // SSLIOP does not support delegation. @@ -91,16 +91,16 @@ TAO_SSLIOP_ReceivedCredentials::delegation_mode ( TAO_SSLIOP_ReceivedCredentials_ptr TAO_SSLIOP_ReceivedCredentials::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return TAO_SSLIOP_ReceivedCredentials::_unchecked_narrow (obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_SSLIOP_ReceivedCredentials_ptr TAO_SSLIOP_ReceivedCredentials::_unchecked_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return TAO_SSLIOP_ReceivedCredentials::_nil (); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h index 820dce9b20a..778a6ac28ae 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h @@ -52,11 +52,11 @@ public: */ //@{ virtual SecurityLevel2::Credentials_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::InvocationCredentialsType credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -68,19 +68,19 @@ public: */ //@{ virtual SecurityLevel2::Credentials_ptr accepting_credentials ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions association_options_used ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::DelegationState delegation_state ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::DelegationMode delegation_mode ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -97,12 +97,12 @@ public: static TAO_SSLIOP_ReceivedCredentials_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_ReceivedCredentials_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_ReceivedCredentials_ptr _nil (void) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp index 4fd1c9b7c59..eff8dbf4820 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp @@ -15,7 +15,7 @@ TAO_SSLIOP_TargetCredentials::TAO_SSLIOP_TargetCredentials (X509 *cert, } SecurityLevel2::Credentials_ptr -TAO_SSLIOP_TargetCredentials::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_SSLIOP_TargetCredentials::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_SSLIOP_TargetCredentials *c = 0; @@ -34,7 +34,7 @@ TAO_SSLIOP_TargetCredentials::copy (TAO_ENV_SINGLE_ARG_DECL) Security::InvocationCredentialsType TAO_SSLIOP_TargetCredentials::credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecTargetCredentials; @@ -42,7 +42,7 @@ TAO_SSLIOP_TargetCredentials::credentials_type ( SecurityLevel2::Credentials_ptr TAO_SSLIOP_TargetCredentials::initiating_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -55,7 +55,7 @@ TAO_SSLIOP_TargetCredentials::initiating_credentials ( Security::AssociationOptions TAO_SSLIOP_TargetCredentials::association_options_used ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -70,16 +70,16 @@ TAO_SSLIOP_TargetCredentials::association_options_used ( TAO_SSLIOP_TargetCredentials_ptr TAO_SSLIOP_TargetCredentials::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return TAO_SSLIOP_TargetCredentials::_unchecked_narrow (obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_SSLIOP_TargetCredentials_ptr TAO_SSLIOP_TargetCredentials::_unchecked_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) return TAO_SSLIOP_TargetCredentials::_nil (); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h index c7057863cf6..7bf32d6c168 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h @@ -50,11 +50,11 @@ public: */ //@{ virtual SecurityLevel2::Credentials_ptr copy ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::InvocationCredentialsType credentials_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -66,11 +66,11 @@ public: */ //@{ virtual SecurityLevel2::Credentials_ptr initiating_credentials ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationOptions association_options_used ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -87,12 +87,12 @@ public: static TAO_SSLIOP_TargetCredentials_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_TargetCredentials_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_SSLIOP_TargetCredentials_ptr _nil (void) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp index 17f3c2aa201..834df616b15 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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Go straight to the object_ref_table in the ORB Core to avoid @@ -29,12 +29,12 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core, CORBA::Object_var obj = orb_core->object_ref_table ().resolve_initial_references ( "SSLIOPCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; SSLIOP::Current_var current = SSLIOP::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (current.in ())) @@ -42,7 +42,7 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core, TAO_SSLIOP_Current_var tao_current = TAO_SSLIOP_Current::_narrow (current.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (tao_current.in ())) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp index be9c69c55d8..b98f379155f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp @@ -67,7 +67,7 @@ TAO_SSLIOP_Vault::~TAO_SSLIOP_Vault (void) Security::AuthenticationMethodList * TAO_SSLIOP_Vault::get_supported_authen_methods ( const char * /* mechanism */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -79,7 +79,7 @@ TAO_SSLIOP_Vault::get_supported_authen_methods ( } Security::OIDList * -TAO_SSLIOP_Vault::supported_mech_oids (TAO_ENV_SINGLE_ARG_DECL) +TAO_SSLIOP_Vault::supported_mech_oids (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -100,7 +100,7 @@ TAO_SSLIOP_Vault::acquire_credentials ( SecurityLevel2::Credentials_out creds, CORBA::Any_out /* continuation_data */, CORBA::Any_out /* auth_specific_data */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check if we support the given mechanism. @@ -147,7 +147,7 @@ TAO_SSLIOP_Vault::continue_credentials_acquisition ( SecurityLevel2::Credentials_ptr /* creds */, CORBA::Any_out /* continuation_data */, CORBA::Any_out /* auth_specific_data */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -161,7 +161,7 @@ TAO_SSLIOP_Vault::continue_credentials_acquisition ( IOP::TaggedComponentList * TAO_SSLIOP_Vault::create_ior_components ( SecurityLevel2::Credentials_ptr /* creds_list */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -184,7 +184,7 @@ TAO_SSLIOP_Vault::init_security_context ( const Security::ChannelBindings & /* chan_binding */, Security::OpaqueBuffer_out /* security_token */, SecurityReplaceable::ClientSecurityContext_out /* security_context */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -201,7 +201,7 @@ TAO_SSLIOP_Vault::accept_security_context ( const Security::ChannelBindings & /* chan_bindings */, const Security::Opaque & /* in_token */, Security::Opaque_out /* out_token */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -214,7 +214,7 @@ TAO_SSLIOP_Vault::accept_security_context ( Security::MechandOptionsList * TAO_SSLIOP_Vault::get_supported_mechs ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h index b8d61031994..ab699654a5a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h @@ -66,11 +66,11 @@ public: virtual Security::AuthenticationMethodList * get_supported_authen_methods ( const char * mechanism - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::OIDList * supported_mech_oids ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Authenticate the principal, request privileges and create @@ -93,7 +93,7 @@ public: SecurityLevel2::Credentials_out creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AuthenticationStatus continue_credentials_acquisition ( @@ -101,12 +101,12 @@ public: SecurityLevel2::Credentials_ptr creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual IOP::TaggedComponentList * create_ior_components ( SecurityLevel2::Credentials_ptr creds_list - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationStatus init_security_context ( @@ -120,7 +120,7 @@ public: const Security::ChannelBindings & chan_binding, Security::OpaqueBuffer_out security_token, SecurityReplaceable::ClientSecurityContext_out security_context - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::AssociationStatus accept_security_context ( @@ -128,11 +128,11 @@ public: const Security::ChannelBindings & chan_bindings, const Security::Opaque & in_token, Security::Opaque_out out_token - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Security::MechandOptionsList * get_supported_mechs ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index 8fdf9cde9ee..9b2933bf66b 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -34,7 +34,7 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void) RtecScheduler::handle_t ACE_Config_Scheduler::create (const char * entry_point - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)) { @@ -86,7 +86,7 @@ ACE_Config_Scheduler::create (const char * entry_point RtecScheduler::handle_t ACE_Config_Scheduler::lookup (const char * entry_point - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecScheduler::RT_Info* rt_info = 0; @@ -108,7 +108,7 @@ ACE_Config_Scheduler::lookup (const char * entry_point RtecScheduler::RT_Info* ACE_Config_Scheduler::get (RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -144,7 +144,7 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle, RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -176,7 +176,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) @@ -193,14 +193,14 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) { - this->priority (lookup (entry_point TAO_ENV_ARG_PARAMETER), + this->priority (lookup (entry_point ACE_ENV_ARG_PARAMETER), priority, p_subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle, @@ -208,7 +208,7 @@ void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -244,7 +244,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, @@ -445,7 +445,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED, RtecScheduler::UNKNOWN_PRIORITY_LEVEL)) @@ -462,7 +462,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri RtecScheduler::Preemption_Priority_t -ACE_Config_Scheduler::last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ACE_Config_Scheduler::last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::NOT_SCHEDULED)) { diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index ab2efe18810..7288bb466dc 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -37,15 +37,15 @@ public: virtual ~ACE_Config_Scheduler (void); virtual RtecScheduler::handle_t create (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME)); virtual RtecScheduler::handle_t lookup (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException)); virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); virtual void set (RtecScheduler::handle_t handle, @@ -58,14 +58,14 @@ public: RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -74,7 +74,7 @@ public: RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -83,7 +83,7 @@ public: RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); @@ -92,7 +92,7 @@ public: RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS, @@ -101,14 +101,14 @@ public: virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& priority, RtecScheduler::Dispatching_Type_t & d_type - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + last_scheduled_priority (ACE_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 22449341278..cd0d5ef21a5 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 TAO_ENV_ARG_PARAMETER); + stability_flags ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, corba_sysex) @@ -110,7 +110,7 @@ init (int config_count, int dependency_count, ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[], u_long stability_flags - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // (Re)initialize using the new settings. @@ -185,7 +185,7 @@ init (int config_count, { new_rt_info = create_i (rt_info [num_rt_infos].entry_point, rt_info [num_rt_infos].handle - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Fill in the portions to which the user has access. @@ -218,7 +218,7 @@ init (int config_count, dependency_info [dependency_count_].info_depended_on, dependency_info [dependency_count_].number_of_calls, dependency_info [dependency_count_].dependency_type - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)) @@ -306,7 +306,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::handle_t TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: create (const char *entry_point - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + create_i (entry_point, handle ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (handle); // Set affected stability flags. @@ -335,7 +335,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::handle_t TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: lookup (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + handle = this->lookup_i (entry_point ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (handle); return handle; @@ -358,7 +358,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> RtecScheduler::RT_Info * TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: get (RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)) @@ -402,7 +402,7 @@ set (RtecScheduler::handle_t handle, RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::INTERNAL, @@ -506,7 +506,7 @@ priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -545,7 +545,7 @@ entry_point_priority (const char * entry_point, RtecScheduler::OS_Priority& priority, RtecScheduler::Preemption_Subpriority_t& subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->lookup_i (entry_point ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->priority_i (handle, priority, subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -577,7 +577,7 @@ add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependenc RtecScheduler::handle_t dependency /* RT_Info on which it depends */, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + dependency_type ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Since the call graph topology has changed, set *all* @@ -611,7 +611,7 @@ compute_scheduling (CORBA::Long minimum_priority, RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + dfs_traverse_i (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + detect_cycles_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Propagate effective execution time and period, set total frame size. - propagate_characteristics_i (TAO_ENV_SINGLE_ARG_PARAMETER); + propagate_characteristics_i (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + assign_priorities_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (this->stability_flags_ & SCHED_UTILIZATION_NOT_STABLE) { // Compute utilization, set last feasible priority. - compute_utilization_i (TAO_ENV_SINGLE_ARG_PARAMETER); + compute_utilization_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -737,7 +737,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::NOT_SCHEDULED)) @@ -803,7 +803,7 @@ RtecScheduler::RT_Info * TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: create_i (const char *entry_point, RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::INTERNAL)) @@ -986,7 +986,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)) { @@ -1009,7 +1009,7 @@ priority_i (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)) @@ -1041,7 +1041,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende RtecScheduler::handle_t dependency /* RT_Info on which it depends */, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::UNKNOWN_TASK)) @@ -1065,7 +1065,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende calling_dependency_set_map_, // calling map number_of_calls, dependency_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Add the called dependency map entry @@ -1074,7 +1074,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende called_dependency_set_map_, // called map number_of_calls, dependency_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; break; @@ -1089,7 +1089,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende calling_dependency_set_map_, // calling map number_of_calls, dependency_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Add the called dependency map entry @@ -1098,7 +1098,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende called_dependency_set_map_, // called map number_of_calls, dependency_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; break; @@ -1124,7 +1124,7 @@ map_dependency_i (RtecScheduler::handle_t key, ACE_LOCK> & map, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL)) { @@ -1197,7 +1197,7 @@ dfs_traverse_i (TAO_ENV_SINGLE_ARG_DECL) // 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 (TAO_ENV_SINGLE_ARG_DECL) +detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::CYCLIC_DEPENDENCIES)) @@ -1237,7 +1237,7 @@ detect_cycles_i (TAO_ENV_SINGLE_ARG_DECL) // 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 (TAO_ENV_SINGLE_ARG_DECL) +propagate_characteristics_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES, @@ -1275,7 +1275,7 @@ propagate_characteristics_i (TAO_ENV_SINGLE_ARG_DECL) // Sets last scheduled priority. template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: -assign_priorities_i (TAO_ENV_SINGLE_ARG_DECL) +assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::DUPLICATE_NAME)) @@ -1383,7 +1383,7 @@ assign_priorities_i (TAO_ENV_SINGLE_ARG_DECL) // 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 (TAO_ENV_SINGLE_ARG_DECL) +compute_utilization_i (ACE_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 3d5e7c090fd..d067452daf6 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h @@ -94,7 +94,7 @@ public: int dependency_count, ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[], u_long stability_flags - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + void close (ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::INTERNAL, @@ -120,7 +120,7 @@ public: // is thrown. virtual RtecScheduler::handle_t lookup (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)); @@ -128,7 +128,7 @@ public: // value if it's not present. virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE)); @@ -144,7 +144,7 @@ public: RtecScheduler::Quantum_t quantum, CORBA::Long threads, RtecScheduler::Info_Type_t info_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::INTERNAL, @@ -155,7 +155,7 @@ public: RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -167,7 +167,7 @@ public: RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -179,7 +179,7 @@ public: RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::UNKNOWN_TASK)); @@ -190,7 +190,7 @@ public: RtecScheduler::RT_Info_Set_out infos, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UTILIZATION_BOUND_EXCEEDED, RtecScheduler::SYNCHRONIZATION_FAILURE, @@ -206,14 +206,14 @@ public: virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority, RtecScheduler::OS_Priority& o_priority, RtecScheduler::Dispatching_Type_t & d_type - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::SYNCHRONIZATION_FAILURE, RtecScheduler::NOT_SCHEDULED)); @@ -288,7 +288,7 @@ protected: virtual RtecScheduler::RT_Info * create_i (const char * entry_point, RtecScheduler::handle_t handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME, RtecScheduler::INTERNAL)); @@ -310,7 +310,7 @@ protected: // Internal method to set characteristics of the passed RT_Info. virtual RtecScheduler::handle_t lookup_i (const char * entry_point - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK)); // Internal method to look up a handle for an RT_Info, and return @@ -320,7 +320,7 @@ protected: RtecScheduler::OS_Priority& o_priority, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK, RtecScheduler::NOT_SCHEDULED)); @@ -331,7 +331,7 @@ protected: RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::INTERNAL, RtecScheduler::UNKNOWN_TASK)); @@ -349,33 +349,33 @@ protected: ACE_LOCK> &map, CORBA::Long number_of_calls, RtecScheduler::Dependency_Type_t dependency_type - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual void dfs_traverse_i (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual void detect_cycles_i (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual void propagate_characteristics_i (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual void assign_priorities_i (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual void compute_utilization_i (ACE_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 7c83d45c13d..091f2d250c9 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; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - server_ = ace_scheduler_factory_data->scheduler_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_ = ace_scheduler_factory_data->scheduler_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -122,7 +122,7 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming, // config runs. return 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CosNaming::Name schedule_name (1); @@ -130,12 +130,12 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming, schedule_name[0].id = CORBA::string_dup (name); CORBA::Object_var objref = naming->resolve (schedule_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; server_ = RtecScheduler::Scheduler::_narrow(objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 33af822572f..0e88335606d 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EstablishTrustPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecEstablishTrustPolicy; } CORBA::Policy_ptr -TAO_EstablishTrustPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_EstablishTrustPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_EstablishTrustPolicy *policy = 0; @@ -41,13 +41,13 @@ TAO_EstablishTrustPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_EstablishTrustPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EstablishTrustPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::EstablishTrust -TAO_EstablishTrustPolicy::trust (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EstablishTrustPolicy::trust (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) 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 5fd059b6a07..d83f0efe367 100644 --- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h @@ -51,20 +51,20 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the "establish trust" value associated with this /// policy. virtual Security::EstablishTrust trust ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp index 9d724bd1bf1..08842a884d3 100644 --- a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp @@ -20,14 +20,14 @@ TAO_InvocationCredentialsPolicy::~TAO_InvocationCredentialsPolicy (void) CORBA::PolicyType TAO_InvocationCredentialsPolicy::policy_type ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecInvocationCredentialsPolicy; } CORBA::Policy_ptr -TAO_InvocationCredentialsPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_InvocationCredentialsPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_InvocationCredentialsPolicy *policy = 0; @@ -45,13 +45,13 @@ TAO_InvocationCredentialsPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) void TAO_InvocationCredentialsPolicy::destroy ( - TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } SecurityLevel2::CredentialsList * -TAO_InvocationCredentialsPolicy::creds (TAO_ENV_SINGLE_ARG_DECL) +TAO_InvocationCredentialsPolicy::creds (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { SecurityLevel2::CredentialsList *creds = 0; diff --git a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h index 8f9fa4ef129..6482e1815a4 100644 --- a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h @@ -57,20 +57,20 @@ public: */ //@{ virtual CORBA::PolicyType policy_type ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the list of invocation credentials associated with this /// policy. virtual SecurityLevel2::CredentialsList * creds ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp index b5be5045b7a..d5cb2b2d989 100644 --- a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp @@ -17,14 +17,14 @@ TAO_MechanismPolicy::~TAO_MechanismPolicy (void) } CORBA::PolicyType -TAO_MechanismPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_MechanismPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecMechanismsPolicy; } CORBA::Policy_ptr -TAO_MechanismPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_MechanismPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_MechanismPolicy *policy = 0; @@ -41,13 +41,13 @@ TAO_MechanismPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_MechanismPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_MechanismPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::MechanismTypeList * -TAO_MechanismPolicy::mechanisms (TAO_ENV_SINGLE_ARG_DECL) +TAO_MechanismPolicy::mechanisms (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Security::MechanismTypeList *mechs = 0; diff --git a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h index 7a61ec97227..0e2785c53f9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h @@ -52,19 +52,19 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the list of mechanism types associated with this policy. virtual Security::MechanismTypeList mechanisms ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp index 8d7ae7ea699..f5f8d674bc3 100644 --- a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp @@ -32,7 +32,7 @@ TAO_PrincipalAuthenticator::~TAO_PrincipalAuthenticator (void) Security::AuthenticationMethodList * TAO_PrincipalAuthenticator::get_supported_authen_methods ( const char * /* mechanism */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { #if 0 @@ -77,7 +77,7 @@ TAO_PrincipalAuthenticator::authenticate ( SecurityLevel2::Credentials_out creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Security::AuthenticationStatus status = Security::SecAuthFailure; @@ -100,7 +100,7 @@ TAO_PrincipalAuthenticator::authenticate ( creds, continuation_data, auth_specific_data - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Security::SecAuthFailure); if (status == Security::SecAuthSuccess @@ -111,7 +111,7 @@ TAO_PrincipalAuthenticator::authenticate ( if (status == Security::SecAuthSuccess) { this->security_manager_->add_own_credentials (creds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Security::SecAuthFailure); } @@ -124,7 +124,7 @@ TAO_PrincipalAuthenticator::continue_authentication ( SecurityLevel2::Credentials_ptr creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Security::AuthenticationStatus status = Security::SecAuthFailure; @@ -144,7 +144,7 @@ TAO_PrincipalAuthenticator::continue_authentication ( creds, continuation_data, auth_specific_data - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Security::SecAuthFailure); if (status == Security::SecAuthSuccess @@ -155,7 +155,7 @@ TAO_PrincipalAuthenticator::continue_authentication ( if (status == Security::SecAuthSuccess) { this->security_manager_->add_own_credentials (creds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Security::SecAuthFailure); } @@ -165,7 +165,7 @@ TAO_PrincipalAuthenticator::continue_authentication ( void TAO_PrincipalAuthenticator::register_vault ( SecurityReplaceable::Vault_ptr vault - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (!CORBA::is_nil (vault)) { @@ -207,10 +207,10 @@ tao_TAO_PrincipalAuthenticator_nil ( TAO_PrincipalAuthenticator_ptr tao_TAO_PrincipalAuthenticator_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return TAO_PrincipalAuthenticator::_narrow (p TAO_ENV_ARG_PARAMETER); + return TAO_PrincipalAuthenticator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -333,10 +333,10 @@ TAO_PrincipalAuthenticator_var::tao_nil (void) ::TAO_PrincipalAuthenticator_ptr TAO_PrincipalAuthenticator_var::tao_narrow ( CORBA::Object *p - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) { - return ::TAO_PrincipalAuthenticator::_narrow (p TAO_ENV_ARG_PARAMETER); + return ::TAO_PrincipalAuthenticator::_narrow (p ACE_ENV_ARG_PARAMETER); } CORBA::Object * @@ -410,17 +410,17 @@ TAO_PrincipalAuthenticator_out::operator-> (void) TAO_PrincipalAuthenticator_ptr TAO_PrincipalAuthenticator::_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { return TAO_PrincipalAuthenticator::_unchecked_narrow (obj - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_PrincipalAuthenticator_ptr TAO_PrincipalAuthenticator::_unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ) { if (CORBA::is_nil (obj)) diff --git a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h index 82b6feb7269..36601d95469 100644 --- a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h +++ b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h @@ -62,7 +62,7 @@ public: /// mechanism. virtual Security::AuthenticationMethodList * get_supported_authen_methods ( const char * mechanism - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Authenticate the principal, request privileges and create @@ -85,7 +85,7 @@ public: SecurityLevel2::Credentials_out creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Continue partially completed authentication process. @@ -94,7 +94,7 @@ public: SecurityLevel2::Credentials_ptr creds, CORBA::Any_out continuation_data, CORBA::Any_out auth_specific_data - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -105,7 +105,7 @@ public: * @note This is a TAO-specific extension. */ void register_vault (SecurityReplaceable::Vault_ptr vault - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * @name Downcast Related Methods @@ -126,12 +126,12 @@ public: static TAO_PrincipalAuthenticator_ptr _narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_PrincipalAuthenticator_ptr _unchecked_narrow ( CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL_WITH_DEFAULTS ); static TAO_PrincipalAuthenticator_ptr _nil (void) @@ -193,7 +193,7 @@ public: static TAO_PrincipalAuthenticator_ptr tao_nil (void); static TAO_PrincipalAuthenticator_ptr tao_narrow ( CORBA::Object * - TAO_ENV_ARG_DECL_NOT_USED + ACE_ENV_ARG_DECL_NOT_USED ); static CORBA::Object * tao_upcast (void *); diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp index 7cf77b5dc24..647c40061fc 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_QOPPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecQOPPolicy; } CORBA::Policy_ptr -TAO_QOPPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) +TAO_QOPPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_QOPPolicy *policy = 0; @@ -40,13 +40,13 @@ TAO_QOPPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_QOPPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_QOPPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::QOP -TAO_QOPPolicy::qop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_QOPPolicy::qop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) 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 0579628d355..8af3d440076 100644 --- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h @@ -51,19 +51,19 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual Security::QOP qop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp index ed5f8993976..28ccaa60bbd 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp @@ -21,7 +21,7 @@ TAO_SecurityManager::~TAO_SecurityManager (void) } Security::MechandOptionsList * -TAO_SecurityManager::supported_mechanisms (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::supported_mechanisms (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -33,7 +33,7 @@ TAO_SecurityManager::supported_mechanisms (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::CredentialsList * -TAO_SecurityManager::own_credentials (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::own_credentials (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, @@ -55,7 +55,7 @@ TAO_SecurityManager::own_credentials (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::RequiredRights_ptr -TAO_SecurityManager::required_rights_object (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::required_rights_object (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -67,7 +67,7 @@ TAO_SecurityManager::required_rights_object (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::PrincipalAuthenticator_ptr -TAO_SecurityManager::principal_authenticator (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::principal_authenticator (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { { @@ -98,7 +98,7 @@ TAO_SecurityManager::principal_authenticator (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::AccessDecision_ptr -TAO_SecurityManager::access_decision (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::access_decision (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -110,7 +110,7 @@ TAO_SecurityManager::access_decision (TAO_ENV_SINGLE_ARG_DECL) } SecurityLevel2::AuditDecision_ptr -TAO_SecurityManager::audit_decision (TAO_ENV_SINGLE_ARG_DECL) +TAO_SecurityManager::audit_decision (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -123,7 +123,7 @@ TAO_SecurityManager::audit_decision (TAO_ENV_SINGLE_ARG_DECL) SecurityLevel2::TargetCredentials_ptr TAO_SecurityManager::get_target_credentials (CORBA::Object_ptr /* obj_ref */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -137,7 +137,7 @@ TAO_SecurityManager::get_target_credentials (CORBA::Object_ptr /* obj_ref */ void TAO_SecurityManager::remove_own_credentials ( SecurityLevel2::Credentials_ptr creds - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); @@ -172,7 +172,7 @@ TAO_SecurityManager::remove_own_credentials ( CORBA::Policy_ptr TAO_SecurityManager::get_security_policy (CORBA::PolicyType /* policy_type */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( @@ -185,7 +185,7 @@ TAO_SecurityManager::get_security_policy (CORBA::PolicyType /* policy_type */ void TAO_SecurityManager::add_own_credentials (SecurityLevel2::Credentials_ptr creds - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h index 9260e4f3565..15667932dc1 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h @@ -52,13 +52,13 @@ public: /// Return a sequence containing the security mechanisms supported /// by the Security Service. virtual Security::MechandOptionsList * supported_mechanisms ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of Credentials currently associated with the /// application itself, i.e. its own credentials. virtual SecurityLevel2::CredentialsList * own_credentials ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a reference to the RequiredRights object. @@ -68,7 +68,7 @@ public: * control. */ virtual SecurityLevel2::RequiredRights_ptr required_rights_object ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a reference to the PrincipalAuthenticator object. @@ -77,7 +77,7 @@ public: * create credentials for them. */ virtual SecurityLevel2::PrincipalAuthenticator_ptr principal_authenticator ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a reference to the AccessDecision object. @@ -86,7 +86,7 @@ public: * of objects. */ virtual SecurityLevel2::AccessDecision_ptr access_decision ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return a reference to the AuditDecision object. @@ -95,14 +95,14 @@ public: * be audited for a given object. */ virtual SecurityLevel2::AuditDecision_ptr audit_decision ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the TargetCredentials associated with the given object /// reference. virtual SecurityLevel2::TargetCredentials_ptr get_target_credentials ( CORBA::Object_ptr obj_ref - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Remove the given credential from the application's own @@ -114,14 +114,14 @@ public: */ virtual void remove_own_credentials ( SecurityLevel2::Credentials_ptr creds - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the security policy currently in effect corresponding to /// the given policy type. virtual CORBA::Policy_ptr get_security_policy ( CORBA::PolicyType policy_type - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -138,7 +138,7 @@ public: * when credentials are created and authenticated. */ void add_own_credentials (SecurityLevel2::Credentials_ptr creds - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index bccb5842a4d..d0cb2584117 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -26,7 +26,7 @@ TAO_Security_Current::~TAO_Security_Current (void) Security::AttributeList * TAO_Security_Current::get_attributes ( const Security::AttributeTypeList &attributes - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + return impl->get_attributes (attributes ACE_ENV_ARG_PARAMETER); } SecurityLevel2::ReceivedCredentials_ptr TAO_Security_Current::received_credentials ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + return impl->received_credentials (ACE_ENV_SINGLE_ARG_PARAMETER); } int @@ -61,7 +61,7 @@ TAO_Security_Current::init (void) { int result = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { int argc = 0; @@ -69,7 +69,7 @@ TAO_Security_Current::init (void) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, this->orb_id_.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 2dd683bf77c..afe05f12842 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -63,7 +63,7 @@ public: /// given attribute type list associated with the current request. virtual Security::AttributeList * get_attributes ( const Security::AttributeTypeList & attributes - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_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 ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_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 a911373a459..6de0cea0c47 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -53,7 +53,7 @@ public: /// given attribute type list associated with the current request. virtual Security::AttributeList * get_attributes ( const Security::AttributeTypeList & attributes - TAO_ENV_ARG_DECL) + ACE_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 ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_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 c7377f36b48..552bd7a9e6f 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -17,13 +17,13 @@ ACE_RCSID (TAO_Security, void TAO_Security_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (tao_info.in ())) @@ -41,10 +41,10 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var orb_id = info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the SecurityLevel2::Current object. @@ -64,7 +64,7 @@ TAO_Security_ORBInitializer::pre_init ( // ORB. info->register_initial_reference ("SecurityCurrent", security_current.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Create the SecurityLevel2::SecurityManager object. @@ -85,25 +85,25 @@ TAO_Security_ORBInitializer::pre_init ( // ORB. info->register_initial_reference ("SecurityManager", security_manager.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_Security_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->register_policy_factories (info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_Security_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Register the security policy factories. @@ -121,37 +121,37 @@ TAO_Security_ORBInitializer::register_policy_factories ( type = Security::SecQOPPolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecMechanismsPolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecInvocationCredentialsPolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecFeaturePolicy; // Deprecated info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecDelegationDirectivePolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecEstablishTrustPolicy; info->register_policy_factory (type, policy_factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // ---------------------------------------------------------------- diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h index af1aecce473..d7d0d4490e5 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h @@ -48,11 +48,11 @@ class TAO_Security_Export TAO_Security_ORBInitializer public: virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -60,7 +60,7 @@ private: /// Register Security policy factories. void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 6d69fbbcd95..ee11a590271 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -15,7 +15,7 @@ CORBA::Policy_ptr TAO_Security_PolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h index f0f5b66640e..d5c4a57571b 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h @@ -43,7 +43,7 @@ public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); }; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index f1e64ebe556..0da9f75664f 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_TIO::time_interval (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_time_interval; @@ -34,7 +34,7 @@ TAO_TIO::time_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CosTime::OverlapType TAO_TIO::spans (CosTime::UTO_ptr uto, CosTime::TIO_out overlap - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + TimeBase::TimeT tmp1 = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - TimeBase::TimeT tmp2 = uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); + TimeBase::TimeT tmp2 = uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::TimeT lb2 = tmp1 - tmp2; - tmp1 = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER); + tmp1 = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - tmp2 = uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); + tmp2 = uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::TimeT up2 = tmp1 + tmp2; @@ -155,7 +155,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, CosTime::OverlapType TAO_TIO::overlaps (CosTime::TIO_ptr tio, CosTime::TIO_out overlap - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_TIO::time (ACE_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 a9ed61cf860..a6dc5388edc 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 ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 @@ -63,7 +63,7 @@ public: virtual CosTime::OverlapType overlaps (CosTime::TIO_ptr interval, CosTime::TIO_out overlap - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual CosTime::UTO_ptr time (ACE_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 2f9616ef174..30344431070 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Time_Service_Clerk::universal_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)) { @@ -59,7 +59,7 @@ TAO_Time_Service_Clerk::universal_time (TAO_ENV_SINGLE_ARG_DECL) // implemented currently. CosTime::UTO_ptr -TAO_Time_Service_Clerk::secure_universal_time (TAO_ENV_SINGLE_ARG_DECL) +TAO_Time_Service_Clerk::secure_universal_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)) { @@ -72,7 +72,7 @@ CosTime::UTO_ptr TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, TimeBase::TdfT tdf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -90,7 +90,7 @@ TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time, CosTime::UTO_ptr TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -116,7 +116,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 083f8a8c3b6..16de6ba9bc0 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 (TAO_ENV_SINGLE_ARG_DECL) + virtual CosTime::UTO_ptr universal_time (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual CosTime::UTO_ptr secure_universal_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)); // This operation returns the global time in a UTO only if the time @@ -74,18 +74,18 @@ public: virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, TimeBase::TdfT tdf - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 5ba026e5798..9fc02513790 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Time_Service_Server::universal_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)) { @@ -74,7 +74,7 @@ TAO_Time_Service_Server::universal_time (TAO_ENV_SINGLE_ARG_DECL) // implemented currently. CosTime::UTO_ptr -TAO_Time_Service_Server::secure_universal_time (TAO_ENV_SINGLE_ARG_DECL) +TAO_Time_Service_Server::secure_universal_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)) { @@ -87,7 +87,7 @@ CosTime::UTO_ptr TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, TimeBase::TdfT tdf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -107,7 +107,7 @@ TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time, CosTime::UTO_ptr TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_UTO *uto = 0; @@ -126,7 +126,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 62215491365..095e3be0a68 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 (TAO_ENV_SINGLE_ARG_DECL) + virtual CosTime::UTO_ptr universal_time (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual CosTime::UTO_ptr secure_universal_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTime::TimeUnavailable)); // This operation returns the current time in a UTO only if the time @@ -61,18 +61,18 @@ public: virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time, TimeBase::InaccuracyT inaccuracy, TimeBase::TdfT tdf - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 5b2595df2fd..defc778d3db 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UTO::time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_utc_time_.time; @@ -51,7 +51,7 @@ TAO_UTO::time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Get method for the readonly attribute inaccuracy. TimeBase::InaccuracyT -TAO_UTO::inaccuracy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UTO::inaccuracy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Construct the Inaccuracy from the @@ -66,7 +66,7 @@ TAO_UTO::inaccuracy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Get method for the readonly attribute tdf. TimeBase::TdfT -TAO_UTO::tdf (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UTO::tdf (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_utc_time_.tdf; @@ -75,7 +75,7 @@ TAO_UTO::tdf (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Get method for the readonly attribute utc_time. TimeBase::UtcT -TAO_UTO::utc_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UTO::utc_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return attr_utc_time_; @@ -85,7 +85,7 @@ TAO_UTO::utc_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // the Base Time, UTC and Distributed Time Sync. Algos. [3]. CosTime::UTO_ptr -TAO_UTO::absolute_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_UTO::absolute_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -97,20 +97,20 @@ TAO_UTO::absolute_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CosTime::TimeComparison TAO_UTO::compare_time (CosTime::ComparisonType comparison_type, CosTime::UTO_ptr uto - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - TimeBase::TimeT uto_time = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER); + TimeBase::TimeT uto_time = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::InaccuracyT this_inaccuracy = - this->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TimeBase::InaccuracyT uto_inaccuracy = - uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); + uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (comparison_type == CosTime::MidC) @@ -172,14 +172,14 @@ TAO_UTO::compare_time (CosTime::ComparisonType comparison_type, CosTime::TIO_ptr TAO_UTO::time_to_interval (CosTime::UTO_ptr uto - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; ACE_TRY { - TimeBase::TimeT uto_time = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER); + TimeBase::TimeT uto_time = uto->time (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_UTO::interval (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_TIO *tio = 0; @@ -224,7 +224,7 @@ TAO_UTO::interval (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { TimeBase::TimeT this_inaccuracy = - this->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->inaccuracy (ACE_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 4c57b221c4c..3c742d610cd 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h @@ -56,24 +56,24 @@ public: // Destructor. virtual TimeBase::TimeT time ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // For the readonly attribute <time>. - virtual TimeBase::InaccuracyT inaccuracy (TAO_ENV_SINGLE_ARG_DECL) + virtual TimeBase::InaccuracyT inaccuracy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // For the readonly attribute <inaccuracy>. - virtual TimeBase::TdfT tdf (TAO_ENV_SINGLE_ARG_DECL) + virtual TimeBase::TdfT tdf (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual TimeBase::UtcT utc_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // For the readonly attribute <utc_time>. - CosTime::UTO_ptr absolute_time (TAO_ENV_SINGLE_ARG_DECL) + CosTime::UTO_ptr absolute_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Absolute time = Relative time + Base time. // ?? Find out more about the Base Time, UTC and @@ -81,13 +81,13 @@ public: CosTime::TimeComparison compare_time (CosTime::ComparisonType comparison_type, CosTime::UTO_ptr uto - TAO_ENV_ARG_DECL) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + CosTime::TIO_ptr interval (ACE_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 7b7dac9aa22..88503f94415 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + (*value)->universal_time (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULongLong curr_server_time = UTO_server->time (ACE_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 85267dc9f6c..af62d1644bb 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Trader, Constraint_Interpreter, "$Id$") TAO_Constraint_Interpreter:: TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, const char* constraints - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalConstraint, CORBA::NO_MEMORY)) : TAO_Interpreter () @@ -38,7 +38,7 @@ TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeSt TAO_Constraint_Interpreter:: TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator, const char* constraints - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalConstraint, CORBA::NO_MEMORY)) { @@ -79,7 +79,7 @@ TAO_Constraint_Interpreter::evaluate (TAO_Constraint_Evaluator& evaluator) TAO_Preference_Interpreter:: TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, const char* preference - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference, CORBA::NO_MEMORY)) : TAO_Interpreter () @@ -106,7 +106,7 @@ TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeSt TAO_Preference_Interpreter:: TAO_Preference_Interpreter (TAO_Constraint_Validator& validator, const char* preference - TAO_ENV_ARG_DECL) + ACE_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 e34d1af6cf1..fbac7c13a9c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -49,13 +49,13 @@ public: // = Initialization and termination methods. TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, const char* constraints - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalConstraint, CORBA::NO_MEMORY)); TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator, const char* constraints - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalConstraint, CORBA::NO_MEMORY)); // This constructor builds an expression tree representing the @@ -92,13 +92,13 @@ public: // = Initialization and termination methods. TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts, const char* preference - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference, CORBA::NO_MEMORY)); TAO_Preference_Interpreter (TAO_Constraint_Validator& validator, const char* preference - TAO_ENV_ARG_DECL) + ACE_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 e7bc02db9c9..fc823d74205 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp @@ -39,7 +39,7 @@ TAO_Binary_Constraint::~TAO_Binary_Constraint (void) // Dispatch table for the accept method static int (*dispatch_table[]) (TAO_Constraint_Visitor*, - TAO_Binary_Constraint*)= + TAO_Binary_Constraint*)= { TAO_Binary_Constraint::visit_greater_than, TAO_Binary_Constraint::visit_greater_than_equal, @@ -77,7 +77,7 @@ TAO_Binary_Constraint::accept (TAO_Constraint_Visitor* visitor) int TAO_Binary_Constraint:: visit_or (TAO_Constraint_Visitor* visitor, - TAO_Binary_Constraint* expr) + TAO_Binary_Constraint* expr) { return visitor->visit_or (expr); } @@ -93,7 +93,7 @@ visit_and (TAO_Constraint_Visitor* visitor, int TAO_Binary_Constraint:: visit_less_than (TAO_Constraint_Visitor* visitor, - TAO_Binary_Constraint* expr) + TAO_Binary_Constraint* expr) { return visitor->visit_less_than (expr); } @@ -101,7 +101,7 @@ visit_less_than (TAO_Constraint_Visitor* visitor, int TAO_Binary_Constraint:: visit_less_than_equal (TAO_Constraint_Visitor* visitor, - TAO_Binary_Constraint* expr) + TAO_Binary_Constraint* expr) { return visitor->visit_less_than_equal (expr); } @@ -109,7 +109,7 @@ visit_less_than_equal (TAO_Constraint_Visitor* visitor, int TAO_Binary_Constraint:: visit_greater_than (TAO_Constraint_Visitor* visitor, - TAO_Binary_Constraint* expr) + TAO_Binary_Constraint* expr) { return visitor->visit_greater_than (expr); } @@ -117,7 +117,7 @@ visit_greater_than (TAO_Constraint_Visitor* visitor, int TAO_Binary_Constraint:: visit_greater_than_equal (TAO_Constraint_Visitor* visitor, - TAO_Binary_Constraint* expr) + TAO_Binary_Constraint* expr) { return visitor->visit_greater_than_equal (expr); } @@ -125,7 +125,7 @@ visit_greater_than_equal (TAO_Constraint_Visitor* visitor, int TAO_Binary_Constraint:: visit_equal (TAO_Constraint_Visitor* visitor, - TAO_Binary_Constraint* expr) + TAO_Binary_Constraint* expr) { return visitor->visit_equal (expr); } @@ -133,7 +133,7 @@ visit_equal (TAO_Constraint_Visitor* visitor, int TAO_Binary_Constraint:: visit_not_equal (TAO_Constraint_Visitor* visitor, - TAO_Binary_Constraint* expr) + TAO_Binary_Constraint* expr) { return visitor->visit_not_equal (expr); } @@ -141,7 +141,7 @@ visit_not_equal (TAO_Constraint_Visitor* visitor, int TAO_Binary_Constraint:: visit_add (TAO_Constraint_Visitor* visitor, - TAO_Binary_Constraint* expr) + TAO_Binary_Constraint* expr) { return visitor->visit_add (expr); } @@ -149,7 +149,7 @@ visit_add (TAO_Constraint_Visitor* visitor, int TAO_Binary_Constraint:: visit_sub (TAO_Constraint_Visitor* visitor, - TAO_Binary_Constraint* expr) + TAO_Binary_Constraint* expr) { return visitor->visit_sub (expr); } @@ -157,7 +157,7 @@ visit_sub (TAO_Constraint_Visitor* visitor, int TAO_Binary_Constraint:: visit_mult (TAO_Constraint_Visitor* visitor, - TAO_Binary_Constraint* expr) + TAO_Binary_Constraint* expr) { return visitor->visit_mult (expr); } @@ -165,7 +165,7 @@ visit_mult (TAO_Constraint_Visitor* visitor, int TAO_Binary_Constraint:: visit_div (TAO_Constraint_Visitor* visitor, - TAO_Binary_Constraint* expr) + TAO_Binary_Constraint* expr) { return visitor->visit_div (expr); } @@ -173,7 +173,7 @@ visit_div (TAO_Constraint_Visitor* visitor, int TAO_Binary_Constraint:: visit_twiddle (TAO_Constraint_Visitor* visitor, - TAO_Binary_Constraint* expr) + TAO_Binary_Constraint* expr) { return visitor->visit_twiddle (expr); } @@ -181,7 +181,7 @@ visit_twiddle (TAO_Constraint_Visitor* visitor, int TAO_Binary_Constraint:: visit_in (TAO_Constraint_Visitor* visitor, - TAO_Binary_Constraint* expr) + TAO_Binary_Constraint* expr) { return visitor->visit_in (expr); } @@ -201,7 +201,7 @@ TAO_Binary_Constraint::right_operand (void) const TAO_Unary_Constraint:: TAO_Unary_Constraint (TAO_Expression_Type op_type, - TAO_Constraint* operand) + TAO_Constraint* operand) : op_ (op_type), operand_ (operand) { @@ -294,7 +294,7 @@ TAO_Literal_Constraint (CORBA::Any* any) CORBA::TCKind corba_type = CORBA::tk_null; ACE_TRY { - corba_type = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + corba_type = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -311,46 +311,46 @@ TAO_Literal_Constraint (CORBA::Any* any) case TAO_SIGNED: this->op_.integer_ = 0; if (corba_type == CORBA::tk_short) - { - CORBA::Short sh; - any_ref >>= sh; - this->op_.integer_ = (CORBA::Long) sh; - } + { + CORBA::Short sh; + any_ref >>= sh; + this->op_.integer_ = (CORBA::Long) sh; + } else - any_ref >>= this->op_.integer_; + any_ref >>= this->op_.integer_; break; case TAO_UNSIGNED: this->op_.uinteger_ = 0; if (corba_type == CORBA::tk_ushort) - { - CORBA::UShort sh; - any_ref >>= sh; - this->op_.uinteger_ = (CORBA::ULong) sh; - } + { + CORBA::UShort sh; + any_ref >>= sh; + this->op_.uinteger_ = (CORBA::ULong) sh; + } else - any_ref >>= this->op_.uinteger_; + any_ref >>= this->op_.uinteger_; break; case TAO_DOUBLE: if (corba_type == CORBA::tk_float) - { - CORBA::Float fl; + { + CORBA::Float fl; (*any) >>= fl; - this->op_.double_ = (CORBA::Double) fl; - } + this->op_.double_ = (CORBA::Double) fl; + } else (*any) >>= this->op_.double_; break; case TAO_BOOLEAN: { - CORBA_Any::to_boolean tmp (this->op_.bool_); + CORBA_Any::to_boolean tmp (this->op_.bool_); (*any) >>= tmp; } break; case TAO_STRING: { - const char* s; - any_ref >>= s; - this->op_.str_ = CORBA::string_dup (s); + const char* s; + any_ref >>= s; + this->op_.str_ = CORBA::string_dup (s); } break; case TAO_SEQUENCE: @@ -487,7 +487,7 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type) CORBA::TCKind kind = CORBA::tk_null; ACE_TRY { - kind = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = type->kind (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var typecode = type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (label2); - kind = typecode->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = typecode->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (label2);; } ACE_CATCHANY @@ -537,8 +537,8 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type) ACE_ENDTRY; // Since this is a "top level try block, no need to check again. - if (kind == CORBA::tk_sequence) - return_value = TAO_SEQUENCE; + if (kind == CORBA::tk_sequence) + return_value = TAO_SEQUENCE; } break; default: @@ -550,7 +550,7 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type) int operator== (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right) + const TAO_Literal_Constraint& right) { int return_value = 0; TAO_Expression_Type widest_type = @@ -581,7 +581,7 @@ operator== (const TAO_Literal_Constraint& left, int operator!= (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right) + const TAO_Literal_Constraint& right) { int return_value = 0; TAO_Expression_Type widest_type = @@ -611,7 +611,7 @@ operator!= (const TAO_Literal_Constraint& left, int operator< (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right) + const TAO_Literal_Constraint& right) { int return_value = 0; TAO_Expression_Type widest_type = @@ -641,7 +641,7 @@ operator< (const TAO_Literal_Constraint& left, int operator<= (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right) + const TAO_Literal_Constraint& right) { int return_value = 0; TAO_Expression_Type widest_type = @@ -668,7 +668,7 @@ operator<= (const TAO_Literal_Constraint& left, int operator> (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right) + const TAO_Literal_Constraint& right) { int return_value = 0; TAO_Expression_Type widest_type = @@ -695,7 +695,7 @@ operator> (const TAO_Literal_Constraint& left, int operator>= (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right) + const TAO_Literal_Constraint& right) { int return_value = 0; TAO_Expression_Type widest_type = @@ -729,7 +729,7 @@ operator== (CORBA::Double left, const TAO_Literal_Constraint& right) int operator== (const TAO_String_Manager& left, - const TAO_Literal_Constraint& right) + const TAO_Literal_Constraint& right) { int result = 0; @@ -742,7 +742,7 @@ operator== (const TAO_String_Manager& left, TAO_Literal_Constraint operator+ (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right) + const TAO_Literal_Constraint& right) { TAO_Expression_Type widest_type = TAO_Literal_Constraint::widest_type (left, right); @@ -751,18 +751,18 @@ operator+ (const TAO_Literal_Constraint& left, { case TAO_DOUBLE: { - CORBA::Double result = (CORBA::Double) left + (CORBA::Double) right; - return TAO_Literal_Constraint ((CORBA::Double) result); + CORBA::Double result = (CORBA::Double) left + (CORBA::Double) right; + return TAO_Literal_Constraint ((CORBA::Double) result); } case TAO_SIGNED: { - CORBA::Long result = (CORBA::Long) left + (CORBA::Long) right; - return TAO_Literal_Constraint ((CORBA::Long) result); + CORBA::Long result = (CORBA::Long) left + (CORBA::Long) right; + return TAO_Literal_Constraint ((CORBA::Long) result); } case TAO_UNSIGNED: { - CORBA::ULong result = (CORBA::ULong) left + (CORBA::ULong) right; - return TAO_Literal_Constraint ((CORBA::ULong) result); + CORBA::ULong result = (CORBA::ULong) left + (CORBA::ULong) right; + return TAO_Literal_Constraint ((CORBA::ULong) result); } default: return TAO_Literal_Constraint ((CORBA::Long)0); @@ -771,7 +771,7 @@ operator+ (const TAO_Literal_Constraint& left, TAO_Literal_Constraint operator- (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right) + const TAO_Literal_Constraint& right) { TAO_Expression_Type widest_type = TAO_Literal_Constraint::widest_type (left, right); @@ -780,18 +780,18 @@ operator- (const TAO_Literal_Constraint& left, { case TAO_DOUBLE: { - CORBA::Double result = (CORBA::Double) left - (CORBA::Double) right; - return TAO_Literal_Constraint ((CORBA::Double) result); + CORBA::Double result = (CORBA::Double) left - (CORBA::Double) right; + return TAO_Literal_Constraint ((CORBA::Double) result); } case TAO_SIGNED: { - CORBA::Long result = (CORBA::Long) left - (CORBA::Long) right; - return TAO_Literal_Constraint ((CORBA::Long) result); + CORBA::Long result = (CORBA::Long) left - (CORBA::Long) right; + return TAO_Literal_Constraint ((CORBA::Long) result); } case TAO_UNSIGNED: { - CORBA::ULong result = (CORBA::ULong) left - (CORBA::ULong) right; - return TAO_Literal_Constraint ((CORBA::ULong) result); + CORBA::ULong result = (CORBA::ULong) left - (CORBA::ULong) right; + return TAO_Literal_Constraint ((CORBA::ULong) result); } default: return TAO_Literal_Constraint ((CORBA::Long)0); @@ -800,7 +800,7 @@ operator- (const TAO_Literal_Constraint& left, TAO_Literal_Constraint operator* (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right) + const TAO_Literal_Constraint& right) { TAO_Expression_Type widest_type = TAO_Literal_Constraint::widest_type (left, right); @@ -809,18 +809,18 @@ operator* (const TAO_Literal_Constraint& left, { case TAO_DOUBLE: { - CORBA::Double result = (CORBA::Double) left * (CORBA::Double) right; - return TAO_Literal_Constraint ((CORBA::Double) result); + CORBA::Double result = (CORBA::Double) left * (CORBA::Double) right; + return TAO_Literal_Constraint ((CORBA::Double) result); } case TAO_SIGNED: { - CORBA::Long result = (CORBA::Long) left * (CORBA::Long) right; - return TAO_Literal_Constraint ((CORBA::Long) result); + CORBA::Long result = (CORBA::Long) left * (CORBA::Long) right; + return TAO_Literal_Constraint ((CORBA::Long) result); } case TAO_UNSIGNED: { - CORBA::ULong result = (CORBA::ULong) left * (CORBA::ULong) right; - return TAO_Literal_Constraint ((CORBA::ULong) result); + CORBA::ULong result = (CORBA::ULong) left * (CORBA::ULong) right; + return TAO_Literal_Constraint ((CORBA::ULong) result); } default: return TAO_Literal_Constraint ((CORBA::Long)0); @@ -829,7 +829,7 @@ operator* (const TAO_Literal_Constraint& left, TAO_Literal_Constraint operator/ (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right) + const TAO_Literal_Constraint& right) { TAO_Expression_Type widest_type = TAO_Literal_Constraint::widest_type (left, right); @@ -838,18 +838,18 @@ operator/ (const TAO_Literal_Constraint& left, { case TAO_DOUBLE: { - CORBA::Double result = (CORBA::Double) left / (CORBA::Double) right; - return TAO_Literal_Constraint ((CORBA::Double) result); + CORBA::Double result = (CORBA::Double) left / (CORBA::Double) right; + return TAO_Literal_Constraint ((CORBA::Double) result); } case TAO_SIGNED: { - CORBA::Long result = (CORBA::Long) left / (CORBA::Long) right; - return TAO_Literal_Constraint ((CORBA::Long) result); + CORBA::Long result = (CORBA::Long) left / (CORBA::Long) right; + return TAO_Literal_Constraint ((CORBA::Long) result); } case TAO_UNSIGNED: { - CORBA::ULong result = (CORBA::ULong) left / (CORBA::ULong) right; - return TAO_Literal_Constraint ((CORBA::ULong) result); + CORBA::ULong result = (CORBA::ULong) left / (CORBA::ULong) right; + return TAO_Literal_Constraint ((CORBA::ULong) result); } default: return TAO_Literal_Constraint ((CORBA::Long)0); @@ -863,18 +863,18 @@ operator- (const TAO_Literal_Constraint& operand) { case TAO_DOUBLE: { - CORBA::Double result = - (CORBA::Double) operand; - return TAO_Literal_Constraint ((CORBA::Double) result); + CORBA::Double result = - (CORBA::Double) operand; + return TAO_Literal_Constraint ((CORBA::Double) result); } case TAO_SIGNED: { - CORBA::Long result = - (CORBA::Long) operand; - return TAO_Literal_Constraint ((CORBA::Long) result); + CORBA::Long result = - (CORBA::Long) operand; + return TAO_Literal_Constraint ((CORBA::Long) result); } case TAO_UNSIGNED: { - CORBA::Long result = - (CORBA::Long) ((CORBA::ULong) operand); - return TAO_Literal_Constraint ((CORBA::ULong) result); + CORBA::Long result = - (CORBA::Long) ((CORBA::ULong) operand); + return TAO_Literal_Constraint ((CORBA::ULong) result); } default: return TAO_Literal_Constraint ((CORBA::Long)0); @@ -883,7 +883,7 @@ operator- (const TAO_Literal_Constraint& operand) TAO_Expression_Type TAO_Literal_Constraint::widest_type (const TAO_Literal_Constraint& left, - const TAO_Literal_Constraint& right) + const TAO_Literal_Constraint& right) { TAO_Expression_Type left_type = left.expr_type (), right_type = right.expr_type (), @@ -892,9 +892,9 @@ TAO_Literal_Constraint::widest_type (const TAO_Literal_Constraint& left, if (right_type != left_type) { if (right_type > left_type) - return_value = right_type; + return_value = right_type; else - return_value = left_type; + return_value = left_type; } return return_value; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp index 2a2dddd6077..5d0f4d6dc32 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. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_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 () TAO_ENV_ARG_PARAMETER); + TAO_Sequence_Extracter_Base::sequence_type (type.in () ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Short value = dyn_any.get_short (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::UShort value = dyn_any.get_ushort (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long value = dyn_any.get_long (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong value = dyn_any.get_ulong (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Float value = dyn_any.get_float (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Double value = dyn_any.get_short (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean value = (CORBA::Boolean) dyn_any.get_short (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + const char* value = dyn_any.get_string (ACE_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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_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 TAO_ENV_ARG_PARAMETER); + TAO_Sequence_Extracter_Base::sequence_type (prop_type ACE_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 30781c68228..635d5ac2cdd 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp @@ -53,12 +53,12 @@ TAO_String_Hash_Key::~TAO_String_Hash_Key (void) CORBA::TCKind TAO_Sequence_Extracter_Base:: sequence_type (CORBA::TypeCode* type_code - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + type_kind = type_code->kind (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind base_kind = base->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); if (base_kind == CORBA::tk_alias) { - base = base->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + base = base->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); } else break; } - CORBA::TCKind base_kind = base->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind base_kind = base->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); if (base_kind == CORBA::tk_sequence) { - base = base->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + base = base->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); - base_kind = base->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + base_kind = base->kind (ACE_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 ed92c170db0..27d352694a6 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h @@ -58,7 +58,7 @@ class TAO_Sequence_Extracter_Base public: static CORBA::TCKind sequence_type (CORBA::TypeCode* code - TAO_ENV_ARG_DECL) + ACE_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 516f47b61a0..a1d196b3de9 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 TAO_ENV_ARG_PARAMETER); + dyn_seq.init (sequence ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong length = - dyn_seq.get_length (TAO_ENV_SINGLE_ARG_PARAMETER); + dyn_seq.get_length (ACE_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 a6935170056..f0129139dd3 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp @@ -149,7 +149,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)) { @@ -159,7 +159,7 @@ remove_offer (const CosTrading::OfferId offer_id this->parse_offer_id (offer_id, stype, index - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (this->remove_offer (stype, @@ -174,13 +174,13 @@ template <class LOCK_TYPE> CosTrading::Offer* TAO_Offer_Database<LOCK_TYPE>:: lookup_offer (const CosTrading::OfferId offer_id, char*& type_name - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->parse_offer_id (offer_id, type_name, index ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (offer); if ((offer = this->lookup_offer (type_name, index)) == 0) @@ -193,7 +193,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + this->parse_offer_id (offer_id, type_name, index ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (offer); if ((offer = this->lookup_offer (type_name, index)) == 0) @@ -275,7 +275,7 @@ TAO_Offer_Database<LOCK_TYPE>:: parse_offer_id (const CosTrading::OfferId offer_id, char*&service_type, CORBA::ULong& id - TAO_ENV_ARG_DECL) + ACE_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 92a163b37f9..8bf86bc88eb 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h @@ -65,12 +65,12 @@ public: // for it. Returns 0 on failure. int remove_offer (const CosTrading::OfferId offer_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)); CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)); // Lookup an offer whose offer_id is <offer_id>, and return @@ -78,7 +78,7 @@ public: CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id, char*& type_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalOfferId, CosTrading::UnknownOfferId)); // Lookup an offer whose OfferId is <offer_id> and return in @@ -131,7 +131,7 @@ private: static void parse_offer_id (const CosTrading::OfferId offer_id, char* &service_type, CORBA::ULong& id - TAO_ENV_ARG_DECL) + ACE_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 a6f0cf2d93e..197fd50905a 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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Offer_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove self from POA PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Query_Only_Offer_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException, CosTrading::UnknownMaxLeft)) { @@ -60,7 +60,7 @@ TAO_Query_Only_Offer_Iterator::max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Boolean TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + offer_iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::release (offer_iter); @@ -119,7 +119,7 @@ add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter) CORBA::Boolean TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong offers_left = n; @@ -145,13 +145,13 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, any_left = iter->next_n (offers_left, CosTrading::OfferSeq_out (out_offers.out ()) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); // If we've exhausted this iterator, destroy it. if (any_left == 0) { - iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + iter->destroy (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Offer_Iterator_Collection::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Destroy all iterators in the collection. @@ -186,26 +186,26 @@ TAO_Offer_Iterator_Collection::destroy (TAO_ENV_SINGLE_ARG_DECL) CosTrading::OfferIterator** iter = 0; iters_iter.next (iter); - (*iter)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + (*iter)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } // Remove self from POA PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::ULong -TAO_Offer_Iterator_Collection::max_left (TAO_ENV_SINGLE_ARG_DECL) +TAO_Offer_Iterator_Collection::max_left (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Offer_Id_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)) { @@ -241,28 +241,28 @@ TAO_Offer_Id_Iterator::max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_Offer_Id_Iterator::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_Offer_Id_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Remove self from POA PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::Boolean TAO_Offer_Id_Iterator::next_n (CORBA::ULong n, CosTrading::OfferIdSeq_out _ids - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 d345fbcd38c..bbdf6061065 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h @@ -56,7 +56,7 @@ public: virtual ~TAO_Offer_Iterator (void); - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)) = 0; @@ -83,7 +83,7 @@ public: virtual CORBA::Boolean next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; // BEGIN SPEC // The next_n operation returns a set of service offers in the @@ -135,12 +135,12 @@ public: virtual CORBA::Boolean next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)); // Return the number of items left in the iterator. @@ -191,15 +191,15 @@ public: virtual CORBA::Boolean next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Retrieve n offers from the set of iterators. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroy the collection of iterators. - virtual CORBA::ULong max_left (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)); // Determine how many offers are left in the collection. @@ -246,7 +246,7 @@ class TAO_Offer_Id_Iterator : ~TAO_Offer_Id_Iterator (void); - virtual CORBA::ULong max_left(TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong max_left(ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)); // The max_left operation returns the number of offer identifiers @@ -255,7 +255,7 @@ class TAO_Offer_Id_Iterator : // identifiers (e.g., if the iterator determines its set of offer // identifiers through lazy evaluation). - virtual void destroy(TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy(ACE_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 @@ -263,7 +263,7 @@ class TAO_Offer_Id_Iterator : virtual CORBA::Boolean next_n(CORBA::ULong _n, CosTrading::OfferIdSeq_out _ids - TAO_ENV_ARG_DECL) + ACE_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 ee67777d024..f7cc7ff360d 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)) { @@ -50,7 +50,7 @@ template <class MAP_LOCK_TYPE> CORBA::Boolean TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>:: next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + CosTrading::Offer* offer = this->db_.lookup_offer (id ACE_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 fb3948efa72..54e0d96ce43 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h @@ -53,12 +53,12 @@ public: virtual CORBA::Boolean next_n (CORBA::ULong n, CosTrading::OfferSeq_out offers - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::ULong max_left (ACE_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 5f0a3087c54..ac4b649d4e5 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Service_Type_Repository::incarnation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num; @@ -63,7 +63,7 @@ add_type (const char *name, const char *if_name, const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, @@ -101,13 +101,13 @@ add_type (const char *name, // Make sure all property names are valid and appear only once. this->validate_properties (prop_map, props - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_PARAMETER); + // this->validate_interface (if_name, super_types ACE_ENV_ARG_PARAMETER); // ACE_CHECK_RETURN (this->incarnation); // // Instead, we do this: @@ -129,7 +129,7 @@ add_type (const char *name, // the job. this->validate_inheritance (prop_map, super_types - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (this->incarnation_); // We can now use prop_map to construct a sequence of all properties @@ -156,7 +156,7 @@ add_type (const char *name, void TAO_Service_Type_Repository::remove_type (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -187,7 +187,7 @@ TAO_Service_Type_Repository::remove_type (const char *name CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq * TAO_Service_Type_Repository:: list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); @@ -233,7 +233,7 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes CosTradingRepos::ServiceTypeRepository::TypeStruct * TAO_Service_Type_Repository:: describe_type (const char * name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)) @@ -283,7 +283,7 @@ describe_type (const char * name CosTradingRepos::ServiceTypeRepository::TypeStruct * TAO_Service_Type_Repository:: fully_describe_type (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)) @@ -329,7 +329,7 @@ fully_describe_type (const char *name void TAO_Service_Type_Repository:: mask_type (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -360,7 +360,7 @@ mask_type (const char *name void TAO_Service_Type_Repository:: unmask_type (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -497,7 +497,7 @@ void TAO_Service_Type_Repository:: validate_properties (Prop_Map &prop_map, const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)) { @@ -526,7 +526,7 @@ void TAO_Service_Type_Repository:: validate_supertypes (Service_Type_Map &super_map, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)) @@ -562,7 +562,7 @@ void TAO_Service_Type_Repository:: validate_inheritance (Prop_Map &prop_map, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition)) { CORBA::ULong num_super_types = super_types.length (); @@ -611,7 +611,7 @@ validate_inheritance (Prop_Map &prop_map, { compare = super_props[j].value_type->equal (prop_type - TAO_ENV_ARG_PARAMETER); + ACE_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 b70563d8c7f..171fb9eae3a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -37,7 +37,7 @@ public: ~TAO_Service_Type_Repository (void); virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber - incarnation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + incarnation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber @@ -45,7 +45,7 @@ public: const char *if_name, const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, @@ -99,7 +99,7 @@ public: // END SPEC virtual void remove_type (const char *name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -115,7 +115,7 @@ public: virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq * list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // BEGIN SPEC @@ -131,7 +131,7 @@ public: virtual CosTradingRepos::ServiceTypeRepository::TypeStruct * describe_type (const char *name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)); @@ -145,7 +145,7 @@ public: virtual CosTradingRepos::ServiceTypeRepository::TypeStruct * fully_describe_type (const char *name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)); @@ -162,7 +162,7 @@ public: // END SPEC virtual void mask_type (const char *name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -181,7 +181,7 @@ public: // END SPEC virtual void unmask_type (const char *name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -244,7 +244,7 @@ public: void validate_properties (Prop_Map &prop_map, const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)); // Confirm that the properties in props have valid names, and aren't @@ -252,7 +252,7 @@ public: void validate_supertypes (Service_Type_Map &super_map, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)); @@ -260,14 +260,14 @@ public: void validate_inheritance (Prop_Map &prop_map, const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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, - // TAO_ENV_SINGLE_ARG_DECL) + // ACE_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 436b6381e6a..ec82d7d89de 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 ()); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; this->type_repos_ = new_value; // @@ What can we do even if we catch this? this->service_type_repos_ = - CosTradingRepos::ServiceTypeRepository::_narrow (new_value TAO_ENV_ARG_PARAMETER); + CosTradingRepos::ServiceTypeRepository::_narrow (new_value ACE_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 a7fb0f83e10..a62b2d3773a 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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_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 TAO_ENV_ARG_PARAMETER); + value = this->prop_eval_.property_value (prop_index ACE_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 9904d27b106..9378c759148 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -46,7 +46,7 @@ query (const char *type, CosTrading::OfferSeq_out returned_offers, CosTrading::OfferIterator_out returned_offer_iterator, CosTrading::PolicyNameSeq_out returned_limits_applied - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + TAO_Policies policies (this->trader_, in_policies ACE_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 TAO_ENV_ARG_PARAMETER); + int check = this->seen_request_id (policies, request_id ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + policies.starting_trader (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (! CORBA::is_nil (link_if) && trader_name != 0) @@ -102,7 +102,7 @@ query (const char *type, returned_offers, returned_offer_iterator, returned_limits_applied - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_PARAMETER); + rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER); ACE_CHECK; // @@ Should throw a NO_MEMORY exception here... @@ -134,16 +134,16 @@ query (const char *type, // the preference string and orders offers according to those // constraints. TAO_Offer_Filter offer_filter (policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_Trader_Constraint_Validator validator (type_struct.in ()); TAO_Constraint_Interpreter constr_inter (validator, constraint - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_Preference_Interpreter pref_inter (validator, preferences - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Boolean result = policies.exact_type_match (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!result) @@ -172,7 +172,7 @@ query (const char *type, constr_inter, pref_inter, offer_filter - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -188,7 +188,7 @@ query (const char *type, pref_inter, *returned_offers.ptr (), returned_offer_iterator - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // The following steps are only appropriate for a linked trader. @@ -201,7 +201,7 @@ query (const char *type, this->retrieve_links (policies, offers_returned, CosTrading::LinkNameSeq_out (links.out ()) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (should_follow && links->length () != 0) @@ -219,7 +219,7 @@ query (const char *type, *returned_offers.ptr (), returned_offer_iterator.ptr (), *returned_limits_applied.ptr () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -287,7 +287,7 @@ lookup_all_subtypes (const char* type, TAO_Constraint_Interpreter& constr_inter, TAO_Preference_Interpreter& pref_inter, TAO_Offer_Filter& offer_filter - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + all_types = rep->list_types (sst ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Scan all types inserted after the super types. If the transitive @@ -322,7 +322,7 @@ lookup_all_subtypes (const char* type, { // Obtain a description of the prospective type. type_struct = rep->fully_describe_type (all_types[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& @@ -357,7 +357,7 @@ fill_receptacles (const char* /* type */, TAO_Preference_Interpreter& pref_inter, CosTrading::OfferSeq& offers, CosTrading::OfferIterator_ptr& offer_itr - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + TAO_Property_Filter prop_filter (desired_props ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong return_card = policies.return_card (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + offer_itr = oi->_this (ACE_ENV_SINGLE_ARG_PARAMETER); // @@ Seth, ACE_CHECK_RETURN (what?); - oi->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + oi->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (total_offers - offers_in_iterator); // Add to the iterator @@ -493,12 +493,12 @@ TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: retrieve_links (TAO_Policies& policies, CORBA::ULong offers_returned, CosTrading::LinkNameSeq_out links - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)) { CORBA::Boolean should_follow = 0; - CosTrading::FollowOption follow_rule = policies.link_follow_rule (TAO_ENV_SINGLE_ARG_PARAMETER); + CosTrading::FollowOption follow_rule = policies.link_follow_rule (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong hc = policies.hop_count (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + links = link_if->list_links (ACE_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] TAO_ENV_ARG_PARAMETER)); + link_info (link_if->describe_link (links[i] ACE_ENV_ARG_PARAMETER)); ACE_CHECK_RETURN (should_follow); // Compute the link follow rule. CosTrading::FollowOption link_rule = - policies.link_follow_rule (link_info.in () TAO_ENV_ARG_PARAMETER); + policies.link_follow_rule (link_info.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (should_follow); // Determine if the link follow rule applies. @@ -575,7 +575,7 @@ federated_query (const CosTrading::LinkNameSeq& links, CosTrading::OfferSeq& offers, CosTrading::OfferIterator_ptr& offer_iter, CosTrading::PolicyNameSeq& limits - TAO_ENV_ARG_DECL) + ACE_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] TAO_ENV_ARG_PARAMETER); + link_interface->describe_link (links[i] ACE_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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosTrading::Lookup_var remote_lookup = @@ -646,7 +646,7 @@ federated_query (const CosTrading::LinkNameSeq& links, CosTrading::OfferSeq_out (out_offers), CosTrading::OfferIterator_out (out_offer_iter), CosTrading::PolicyNameSeq_out (out_limits) - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + offer_iter = offer_iter_collection->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - offer_iter_collection->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + offer_iter_collection->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -744,7 +744,7 @@ forward_query (const char* next_hop, CosTrading::OfferSeq_out offers, CosTrading::OfferIterator_out offer_itr, CosTrading::PolicyNameSeq_out limits_applied - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + link_interface->describe_link (next_hop ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosTrading::Lookup_var remote_lookup = CosTrading::Lookup::_duplicate (link_info->target.in ()); - CORBA::Object_var us = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var us = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean self_loop = - remote_lookup->_is_equivalent (us.in () TAO_ENV_ARG_PARAMETER); + remote_lookup->_is_equivalent (us.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (! self_loop) @@ -789,7 +789,7 @@ forward_query (const char* next_hop, offers, offer_itr, limits_applied - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -803,7 +803,7 @@ forward_query (const char* next_hop, offers, offer_itr, limits_applied - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -823,20 +823,20 @@ CORBA::Boolean TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: seen_request_id (TAO_Policies& policies, CosTrading::Admin::OctetSeq*& seq - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)) { CORBA::Boolean return_value = 0; - seq = policies.request_id (TAO_ENV_SINGLE_ARG_PARAMETER); + seq = policies.request_id (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + seq = admin_if->request_id_stem (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); } else @@ -899,7 +899,7 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: _cxx_export (CORBA::Object_ptr reference, const char *type, const CosTrading::PropertySeq &properties - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + rep->fully_describe_type (type ACE_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 TAO_ENV_ARG_PARAMETER)); + int check = (! reference->_is_a (type_struct->if_name ACE_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 TAO_ENV_ARG_PARAMETER); + this->validate_properties (type, type_struct.ptr (), properties ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // CORBA::ULong plength = properties.length (); @@ -976,7 +976,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> void TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: withdraw (const char *id - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + offer_database.remove_offer ((CosTrading::OfferId) id ACE_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 - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + offer_database.lookup_offer ((CosTrading::OfferId) id, type ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); CosTrading::Register::OfferInfo *offer_info = 0; @@ -1027,7 +1027,7 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: modify (const char *id, const CosTrading::PropertyNameSeq& del_list, const CosTrading::PropertySeq& modify_list - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER)); + int check = (! this->supports_modifiable_properties (ACE_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 TAO_ENV_ARG_PARAMETER); + lookup_offer (ACE_const_cast (CosTrading::OfferId, id), type ACE_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 TAO_ENV_ARG_PARAMETER); + rep->fully_describe_type (type ACE_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 TAO_ENV_ARG_PARAMETER); + offer_mod.delete_properties (del_list ACE_ENV_ARG_PARAMETER); ACE_CHECK; - offer_mod.merge_properties (modify_list TAO_ENV_ARG_PARAMETER); + offer_mod.merge_properties (modify_list ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Alter our reference to the offer. We do this last, since the @@ -1087,7 +1087,7 @@ void TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: withdraw_using_constraint (const char *type, const char *constr - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + rep->fully_describe_type (type ACE_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 TAO_ENV_ARG_PARAMETER); + TAO_Constraint_Interpreter constr_inter (validator, constr ACE_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 TAO_ENV_ARG_PARAMETER); + offer_database.remove_offer (offer_id ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::string_free (offer_id); } @@ -1159,7 +1159,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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] TAO_ENV_ARG_PARAMETER); + link_info = link_if->describe_link (name[0] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; remote_reg = - CosTrading::Register::_narrow (link_info->target_reg.in () TAO_ENV_ARG_PARAMETER); + CosTrading::Register::_narrow (link_info->target_reg.in () ACE_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 TAO_ENV_ARG_PARAMETER); + return_value = remote_reg->resolve (trader_name ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosTrading::Register::_nil ()); } @@ -1225,7 +1225,7 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: validate_properties (const char* type, const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct, const CosTrading::PropertySeq& properties - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + TAO_Property_Evaluator_By_Name prop_eval (properties ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Perform property validation @@ -1261,7 +1261,7 @@ validate_properties (const char* type, { int check = (! prop_type->equal (prop_struct.value_type.in () - TAO_ENV_ARG_PARAMETER)); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 0); @@ -1366,7 +1366,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1380,7 +1380,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1394,7 +1394,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1408,7 +1408,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1422,7 +1422,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1436,7 +1436,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1450,7 +1450,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1464,7 +1464,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean return_value = @@ -1478,7 +1478,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean return_value = @@ -1492,7 +1492,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean return_value = @@ -1506,7 +1506,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1520,7 +1520,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong return_value = @@ -1534,7 +1534,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::FollowOption return_value = @@ -1548,7 +1548,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::FollowOption return_value = @@ -1562,7 +1562,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::FollowOption return_value = @@ -1576,7 +1576,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CosTrading::TypeRepository_ptr return_value = @@ -1590,7 +1590,7 @@ 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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, @@ -1605,7 +1605,7 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: list_offers (CORBA::ULong how_many, CosTrading::OfferIdSeq_out ids, CosTrading::OfferIdIterator_out id_itr - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + int check = offer_id_iter->next_n (how_many, ids ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (check == 1) { - id_itr = offer_id_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + id_itr = offer_id_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - offer_id_iter->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + offer_id_iter->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else @@ -1641,7 +1641,7 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: list_proxies (CORBA::ULong, CosTrading::OfferIdSeq_out, CosTrading::OfferIdIterator_out - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)) { @@ -1669,7 +1669,7 @@ add_link (const char *name, CosTrading::Lookup_ptr target, CosTrading::FollowOption def_pass_on_follow_rule, CosTrading::FollowOption limiting_follow_rule - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->max_link_follow_policy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (limiting_follow_rule < follow_policy) ACE_THROW (CosTrading::Link::LimitingFollowTooPermissive @@ -1722,7 +1722,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> void TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: remove_link (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName)) @@ -1743,7 +1743,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + new_link_info->target_reg = old_link_info.target->register_if (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Allocate space for the link names. @@ -1810,7 +1810,7 @@ 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 - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->max_link_follow_policy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (limiting_follow_rule < follow_policy) @@ -1871,7 +1871,7 @@ export_proxy (CosTrading::Lookup_ptr, CORBA::Boolean, const char *, const CosTrading::PolicySeq& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -1891,7 +1891,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> void TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: withdraw_proxy (const char * - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -1904,7 +1904,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Proxy::ProxyInfo * TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: describe_proxy (const char * - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -1919,7 +1919,7 @@ TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>:: list_proxies (CORBA::ULong, CosTrading::OfferIdSeq*&, CosTrading::OfferIdIterator_ptr& - TAO_ENV_ARG_DECL) + ACE_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 34d492776d7..53916ffb120 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -75,7 +75,7 @@ public: CosTrading::OfferSeq_out offers, CosTrading::OfferIterator_out offer_itr, CosTrading::PolicyNameSeq_out limits_applied - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -180,7 +180,7 @@ private: TAO_Constraint_Interpreter& constr_inter, TAO_Preference_Interpreter& pref_inter, TAO_Offer_Filter& offer_filter - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Traverse the type hierarchy to pull the matching offers from all // subtypes of the root type. @@ -199,7 +199,7 @@ private: TAO_Preference_Interpreter& pref_inter, CosTrading::OfferSeq& offers, CosTrading::OfferIterator_ptr& offer_itr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName)); // This method takes the list of ordered offers and places a number @@ -218,7 +218,7 @@ private: CosTrading::OfferSeq_out offers, CosTrading::OfferIterator_out offer_itr, CosTrading::PolicyNameSeq_out limits_applied - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -236,7 +236,7 @@ private: CORBA::Boolean retrieve_links (TAO_Policies& policies, CORBA::ULong offer_returned, CosTrading::LinkNameSeq_out links - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)); // Assemble a sequence of links that the federate_query method @@ -256,7 +256,7 @@ private: CosTrading::OfferSeq& offers, CosTrading::OfferIterator_ptr& offer_itr, CosTrading::PolicyNameSeq& limits_applied - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -278,7 +278,7 @@ private: CORBA::Boolean seen_request_id (TAO_Policies& policies, CosTrading::Admin::OctetSeq*& seq - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Lookup::PolicyTypeMismatch)); @@ -322,7 +322,7 @@ public: virtual CosTrading::OfferId _cxx_export (CORBA::Object_ptr reference, const char *type, const CosTrading::PropertySeq& properties - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_DECL) + virtual void withdraw (const char *id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -409,7 +409,7 @@ public: virtual CosTrading::Register::OfferInfo* describe (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -432,7 +432,7 @@ public: virtual void modify (const char * id, const CosTrading::PropertyNameSeq& del_list, const CosTrading::PropertySeq& modify_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented, CosTrading::IllegalOfferId, @@ -501,7 +501,7 @@ public: virtual void withdraw_using_constraint (const char *type, const char *constr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -533,7 +533,7 @@ public: virtual CosTrading::Register_ptr resolve (const CosTrading::TraderName &name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::IllegalTraderName, CosTrading::Register::UnknownTraderName, @@ -567,7 +567,7 @@ public: void validate_properties (const char* type, const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct, const CosTrading::PropertySeq& properties - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::PropertyTypeMismatch, CosTrading::ReadonlyDynamicProperty, @@ -623,47 +623,47 @@ public: // = Importing Parameters (used by the Lookup Interface) virtual CORBA::ULong set_def_search_card (CORBA::ULong value - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong set_max_search_card (CORBA::ULong value - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong set_max_match_card (CORBA::ULong value - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong set_max_return_card (CORBA::ULong value - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean set_supports_modifiable_properties (CORBA::Boolean value - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean set_supports_dynamic_properties (CORBA::Boolean value - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean set_supports_proxy_offers (CORBA::Boolean value - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Types of offers available for consideration. Ween out those // offers with modifiable properties @@ -671,45 +671,45 @@ public: // = Link Interface parameters virtual CORBA::ULong set_def_hop_count (CORBA::ULong value - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::ULong set_max_hop_count (CORBA::ULong value - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::FollowOption set_def_follow_policy (CosTrading::FollowOption policy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::FollowOption set_max_follow_policy (CosTrading::FollowOption policy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::FollowOption set_max_link_follow_policy (CosTrading::FollowOption policy - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = Set Type Repository virtual CosTrading::TypeRepository_ptr set_type_repos (CosTrading::TypeRepository_ptr repository - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::Admin::OctetSeq* - request_id_stem (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + request_id_stem (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual CosTrading::Admin::OctetSeq* set_request_id_stem (const CosTrading::Admin::OctetSeq& stem - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)); @@ -735,7 +735,7 @@ public: virtual void list_proxies (CORBA::ULong, CosTrading::OfferIdSeq_out, CosTrading::OfferIdIterator_out - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)); @@ -776,7 +776,7 @@ public: CosTrading::Lookup_ptr target, CosTrading::FollowOption def_pass_on_follow_rule, CosTrading::FollowOption limiting_follow_rule - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::DuplicateLinkName, @@ -825,7 +825,7 @@ public: // END SPEC virtual void remove_link (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName)); @@ -842,7 +842,7 @@ public: // END SPEC virtual CosTrading::Link::LinkInfo* describe_link (const char *name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CosTrading::LinkNameSeq* list_links (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // BEGIN SPEC @@ -883,7 +883,7 @@ public: virtual void modify_link (const char *name, CosTrading::FollowOption def_pass_on_follow_rule, CosTrading::FollowOption limiting_follow_rule - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName, CosTrading::Link::UnknownLinkName, CosTrading::Link::DefaultFollowTooPermissive, @@ -957,7 +957,7 @@ public: CORBA::Boolean if_match_all, const char *, const CosTrading::PolicySeq & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -971,7 +971,7 @@ public: CosTrading::DuplicatePolicyName)); virtual void withdraw_proxy (const char * - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -979,7 +979,7 @@ public: virtual CosTrading::Proxy::ProxyInfo * describe_proxy (const char * - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -990,7 +990,7 @@ public: virtual void list_proxies (CORBA::ULong, CosTrading::OfferIdSeq *&, CosTrading::OfferIdIterator_ptr & - TAO_ENV_ARG_DECL) + ACE_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 b452b289d20..2b02ec5ffdc 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 (TAO_ENV_SINGLE_ARG_PARAMETER)); + this->trading_components ().lookup_if (lookup->_this (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; - lookup->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + lookup->_remove_ref (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER)); + this->trading_components ().register_if (reg->_this (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; - reg->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + reg->_remove_ref (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER)); + this->trading_components ().admin_if (admin->_this (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; - admin->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + admin->_remove_ref (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER)); + this->trading_components ().proxy_if (proxy->_this (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; - proxy->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->_remove_ref (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER)); + this->trading_components ().link_if (link->_this (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK; - link->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + link->_remove_ref (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ifs_[i]->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this->ifs_[i] TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this->ifs_[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Trader_Components<IF>::lookup_if (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Trader_Components<IF>::register_if (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Trader_Components<IF>::admin_if (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Trader_Components<IF>::proxy_if (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Trader_Components<IF>::link_if (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Support_Attributes<IF>::supports_modifiable_properties (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Support_Attributes<IF>::supports_dynamic_properties (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Support_Attributes<IF>::supports_proxy_offers (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) +TAO_Support_Attributes<IF>::type_repos (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Import_Attributes<IF>::def_search_card (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Import_Attributes<IF>::max_search_card (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Import_Attributes<IF>::def_match_card (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Import_Attributes<IF>::max_match_card (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Import_Attributes<IF>::def_return_card (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Import_Attributes<IF>::max_return_card (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Import_Attributes<IF>::max_list (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Import_Attributes<IF>::def_hop_count (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Import_Attributes<IF>::max_hop_count (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Import_Attributes<IF>::def_follow_policy (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Import_Attributes<IF>::max_follow_policy (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_Link_Attributes<IF>::max_link_follow_policy (ACE_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 fd7aa7d1dd7..3f4732e92ec 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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CosTrading::Lookup_ptr lookup_if (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CosTrading::Register_ptr register_if (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CosTrading::Link_ptr link_if (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CosTrading::Proxy_ptr proxy_if (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CosTrading::Admin_ptr admin_if (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Boolean supports_modifiable_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean supports_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Boolean supports_dynamic_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Boolean supports_proxy_offers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Boolean supports_proxy_offers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CosTrading::TypeRepository_ptr type_repos (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CosTrading::TypeRepository_ptr type_repos (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::ULong def_search_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong max_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::ULong max_search_card (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::ULong def_match_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong max_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::ULong max_match_card (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::ULong def_return_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong max_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::ULong max_return_card (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::ULong max_list (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong def_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::ULong def_hop_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::ULong max_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::ULong max_hop_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CosTrading::FollowOption def_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CosTrading::FollowOption def_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CosTrading::FollowOption max_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CosTrading::FollowOption max_follow_policy (ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CosTrading::FollowOption max_link_follow_policy (ACE_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 9ab03d4f1c8..c4f76622ba7 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. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; if (type->equal (CosTradingDynamic::_tc_DynamicProp - TAO_ENV_ARG_PARAMETER)) + ACE_ENV_ARG_PARAMETER)) return_value = 1; } @@ -242,7 +242,7 @@ TAO_Property_Evaluator::is_dynamic_property (int index) CORBA::Any* TAO_Property_Evaluator::property_value (int index - TAO_ENV_ARG_DECL) + ACE_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 TAO_ENV_ARG_PARAMETER); + prop_val = dp_eval->evalDP(name, type, info ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->dp_cache_ != 0) @@ -326,7 +326,7 @@ TAO_Property_Evaluator::property_type (int index) TAO_Property_Evaluator_By_Name:: TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties - TAO_ENV_ARG_DECL, + ACE_ENV_ARG_DECL, CORBA::Boolean supports_dp) ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName, CosTrading::IllegalPropertyName)) @@ -378,7 +378,7 @@ is_dynamic_property(const char* property_name) CORBA::Any* TAO_Property_Evaluator_By_Name::property_value (const char* property_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) { int index = 0; @@ -391,7 +391,7 @@ TAO_Property_Evaluator_By_Name::property_value (const char* property_name { prop_value = this->TAO_Property_Evaluator::property_value (index - TAO_ENV_ARG_PARAMETER); + ACE_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. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; - this->prop_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->prop_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_remove_ref (ACE_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. - TAO_ENV_DECLARE_NEW_ENV; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_DECLARE_NEW_CORBA_ENV; + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -504,7 +504,7 @@ const char* TAO_Policies::POLICY_NAMES[] = TAO_Policies::TAO_Policies (TAO_Trader_Base& trader, const CosTrading::PolicySeq& policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName, CosTrading::DuplicatePolicyName)) : trader_ (trader) @@ -573,7 +573,7 @@ TAO_Policies::~TAO_Policies (void) CORBA::ULong TAO_Policies::ulong_prop (POLICY_TYPE pol - TAO_ENV_ARG_DECL) const + ACE_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 TAO_ENV_ARG_PARAMETER); + CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong ACE_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 (TAO_ENV_SINGLE_ARG_DECL) const +TAO_Policies::search_card (ACE_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->ulong_prop (SEARCH_CARD TAO_ENV_ARG_PARAMETER); + return this->ulong_prop (SEARCH_CARD ACE_ENV_ARG_PARAMETER); } CORBA::ULong -TAO_Policies::match_card (TAO_ENV_SINGLE_ARG_DECL) const +TAO_Policies::match_card (ACE_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->ulong_prop (MATCH_CARD TAO_ENV_ARG_PARAMETER); + return this->ulong_prop (MATCH_CARD ACE_ENV_ARG_PARAMETER); } CORBA::ULong -TAO_Policies::return_card (TAO_ENV_SINGLE_ARG_DECL) const +TAO_Policies::return_card (ACE_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->ulong_prop (RETURN_CARD TAO_ENV_ARG_PARAMETER); + return this->ulong_prop (RETURN_CARD ACE_ENV_ARG_PARAMETER); } CORBA::Boolean TAO_Policies::boolean_prop (POLICY_TYPE pol - TAO_ENV_ARG_DECL) const + ACE_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 TAO_ENV_ARG_PARAMETER); + type->equal (CORBA::_tc_boolean ACE_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 (TAO_ENV_SINGLE_ARG_DECL) const +TAO_Policies::use_modifiable_properties (ACE_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->boolean_prop (USE_MODIFIABLE_PROPERTIES TAO_ENV_ARG_PARAMETER); + return this->boolean_prop (USE_MODIFIABLE_PROPERTIES ACE_ENV_ARG_PARAMETER); } CORBA::Boolean -TAO_Policies::use_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL) const +TAO_Policies::use_dynamic_properties (ACE_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->boolean_prop (USE_DYNAMIC_PROPERTIES TAO_ENV_ARG_PARAMETER); + return this->boolean_prop (USE_DYNAMIC_PROPERTIES ACE_ENV_ARG_PARAMETER); } CORBA::Boolean -TAO_Policies::use_proxy_offers (TAO_ENV_SINGLE_ARG_DECL) const +TAO_Policies::use_proxy_offers (ACE_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->boolean_prop (USE_PROXY_OFFERS TAO_ENV_ARG_PARAMETER); + return this->boolean_prop (USE_PROXY_OFFERS ACE_ENV_ARG_PARAMETER); } CORBA::Boolean -TAO_Policies::exact_type_match (TAO_ENV_SINGLE_ARG_DECL) const +TAO_Policies::exact_type_match (ACE_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->boolean_prop (EXACT_TYPE_MATCH TAO_ENV_ARG_PARAMETER); + return this->boolean_prop (EXACT_TYPE_MATCH ACE_ENV_ARG_PARAMETER); } CosTrading::TraderName* -TAO_Policies::starting_trader (TAO_ENV_SINGLE_ARG_DECL) const +TAO_Policies::starting_trader (ACE_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch, CosTrading::Lookup::InvalidPolicyValue)) { @@ -746,11 +746,11 @@ TAO_Policies::starting_trader (TAO_ENV_SINGLE_ARG_DECL) const CORBA::TypeCode_var type = value.type (); CORBA::Boolean equal_tradername = - type->equal (CosTrading::_tc_TraderName TAO_ENV_ARG_PARAMETER); + type->equal (CosTrading::_tc_TraderName ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (trader_name); CORBA::Boolean equal_linknameseq = - type->equal (CosTrading::_tc_LinkNameSeq TAO_ENV_ARG_PARAMETER); + type->equal (CosTrading::_tc_LinkNameSeq ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (trader_name); if (!equal_tradername || @@ -765,7 +765,7 @@ TAO_Policies::starting_trader (TAO_ENV_SINGLE_ARG_DECL) const } CosTrading::FollowOption -TAO_Policies::link_follow_rule (TAO_ENV_SINGLE_ARG_DECL) const +TAO_Policies::link_follow_rule (ACE_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { CosTrading::FollowOption return_value = @@ -782,7 +782,7 @@ TAO_Policies::link_follow_rule (TAO_ENV_SINGLE_ARG_DECL) const // Extract the link follow rule CORBA::Boolean type_equal = - type->equal (CosTrading::_tc_FollowOption TAO_ENV_ARG_PARAMETER); + type->equal (CosTrading::_tc_FollowOption ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (return_value); if (!type_equal) @@ -800,7 +800,7 @@ TAO_Policies::link_follow_rule (TAO_ENV_SINGLE_ARG_DECL) const CosTrading::FollowOption TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info - TAO_ENV_ARG_DECL) const + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->link_follow_rule (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) const +TAO_Policies::hop_count (ACE_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)) { - return this->ulong_prop (HOP_COUNT TAO_ENV_ARG_PARAMETER); + return this->ulong_prop (HOP_COUNT ACE_ENV_ARG_PARAMETER); } CosTrading::Admin::OctetSeq* -TAO_Policies::request_id (TAO_ENV_SINGLE_ARG_DECL) const +TAO_Policies::request_id (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) const CORBA::TypeCode_var type = value.type (); CORBA::Boolean equal_octetseq = - type->equal (CosTrading::Admin::_tc_OctetSeq TAO_ENV_ARG_PARAMETER); + type->equal (CosTrading::Admin::_tc_OctetSeq ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (request_id); if (!equal_octetseq) @@ -862,7 +862,7 @@ void TAO_Policies:: copy_in_follow_option (CosTrading::PolicySeq& policy_seq, const CosTrading::Link::LinkInfo& link_info - TAO_ENV_ARG_DECL) const + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->link_follow_rule (ACE_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?) - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; new_policy.name = POLICY_NAMES[HOP_COUNT]; - new_policy.value <<= this->hop_count (TAO_ENV_SINGLE_ARG_PARAMETER) - 1; + new_policy.value <<= this->hop_count (ACE_ENV_SINGLE_ARG_PARAMETER) - 1; // Don't count hop count twice. if (this->policies_[i] == 0) @@ -1088,7 +1088,7 @@ TAO_Offer_Modifier::~TAO_Offer_Modifier (void) void TAO_Offer_Modifier:: delete_properties (const CosTrading::PropertyNameSeq& deletes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, CosTrading::Register::MandatoryProperty, CosTrading::IllegalPropertyName, @@ -1128,7 +1128,7 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes void TAO_Offer_Modifier:: merge_properties (const CosTrading::PropertySeq& modifies - TAO_ENV_ARG_DECL) + ACE_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 () TAO_ENV_ARG_PARAMETER); + type_def->equal (prop_type.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!td_equal) @@ -1249,25 +1249,25 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies) } TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - search_card_ = policies.search_card (TAO_ENV_SINGLE_ARG_PARAMETER); + search_card_ = policies.search_card (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - match_card_ = policies.match_card (TAO_ENV_SINGLE_ARG_PARAMETER); + match_card_ = policies.match_card (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - return_card_ = policies.return_card (TAO_ENV_SINGLE_ARG_PARAMETER); + return_card_ = policies.return_card (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - dp_ = policies.use_dynamic_properties (TAO_ENV_SINGLE_ARG_PARAMETER); + dp_ = policies.use_dynamic_properties (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - mod_ = policies.use_modifiable_properties (TAO_ENV_SINGLE_ARG_PARAMETER); + mod_ = policies.use_modifiable_properties (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Boolean exact_type_match = - policies.exact_type_match (TAO_ENV_SINGLE_ARG_PARAMETER); + policies.exact_type_match (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (exact_type_match == 1) @@ -1423,7 +1423,7 @@ TAO_Offer_Filter::limits_applied (void) TAO_Property_Filter:: TAO_Property_Filter (const SPECIFIED_PROPS& desired_props - TAO_ENV_ARG_DECL) + ACE_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 f7e52735058..43a71265ba9 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 TAO_ENV_ARG_DECL) + CORBA::Any* property_value(int index ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); // Returns value of the property whose index is <index>. If the @@ -130,7 +130,7 @@ class TAO_Trading_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Ev public: TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties - TAO_ENV_ARG_DECL , + ACE_ENV_ARG_DECL , CORBA::Boolean supports_dp = 1) ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName, CosTrading::IllegalPropertyName)); @@ -147,7 +147,7 @@ public: // will throw a Property_Undefined exception with impunity. CORBA::Any* property_value(const char* property_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); // This method is identical to its counterpart in @@ -188,7 +188,7 @@ public: virtual CORBA::Any* evalDP(const char* name, CORBA::TypeCode_ptr returned_type, const CORBA::Any& extra_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTradingDynamic::DPEvalFailure)) = 0; // Dynamic property evaluation call-back method. @@ -246,7 +246,7 @@ public: TAO_Policies (TAO_Trader_Base& trader, const CosTrading::PolicySeq& policies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName, CosTrading::DuplicatePolicyName)); @@ -274,7 +274,7 @@ public: ~TAO_Policies (void); - CORBA::ULong search_card (TAO_ENV_SINGLE_ARG_DECL) const + CORBA::ULong search_card (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) const + CORBA::ULong match_card (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) const + CORBA::ULong return_card (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) const + CORBA::Boolean use_modifiable_properties (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) const + CORBA::Boolean use_dynamic_properties (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) const + CORBA::Boolean use_proxy_offers (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) const + CORBA::Boolean exact_type_match (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) const + CosTrading::TraderName* starting_trader (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) const + CosTrading::FollowOption link_follow_rule (ACE_ENV_SINGLE_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // Determine the link follow policy for this query overall. @@ -393,7 +393,7 @@ public: CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info - TAO_ENV_ARG_DECL) const + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) const + CORBA::ULong hop_count (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) const + CosTrading::Admin::OctetSeq* request_id (ACE_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. @@ -437,7 +437,7 @@ public: void copy_in_follow_option (CosTrading::PolicySeq& policy_seq, const CosTrading::Link::LinkInfo& link_info - TAO_ENV_ARG_DECL) const + ACE_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>. @@ -452,12 +452,12 @@ public: private: CORBA::ULong ulong_prop (POLICY_TYPE pol - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // Reconclile a ULong property with its default. CORBA::Boolean boolean_prop (POLICY_TYPE pol - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch)); // Reconcile a Boolean property with its debault. @@ -568,7 +568,7 @@ public: ~TAO_Offer_Modifier (void); void delete_properties (const CosTrading::PropertyNameSeq& deletes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName, CosTrading::Register::MandatoryProperty, CosTrading::IllegalPropertyName, @@ -577,7 +577,7 @@ public: // constructor. Ensure we don't delete mandatory properties. void merge_properties (const CosTrading::PropertySeq& modifies - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CosTrading::IllegalPropertyName, CosTrading::DuplicatePropertyName, CosTrading::PropertyTypeMismatch, @@ -639,7 +639,7 @@ class TAO_Offer_Filter public: TAO_Offer_Filter (TAO_Policies& policies - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Glean from the TypeStruct and Policy setting the appropriate way // to screen unsuitable offers from consideration. @@ -717,7 +717,7 @@ public: // An accomplice to g++'s insane lust for copy constructors. TAO_Property_Filter (const SPECIFIED_PROPS& desired_props - TAO_ENV_ARG_DECL) + ACE_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 9074816f56b..d1ea2076b89 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[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB Manager this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_PARAMETER); + this->create_object (orb.in (), argc, argv ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + our_link->list_links (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -132,7 +132,7 @@ TAO_Trading_Loader::fini (void) "*** Describing the next link.\n")); CosTrading::Link::LinkInfo_var link_info = our_link->describe_link (link_name_seq[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -140,7 +140,7 @@ TAO_Trading_Loader::fini (void) ACE_static_cast (const char *, link_name_seq[i]))); our_link->remove_link (link_name_seq[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosTrading::Lookup_ptr remote_lookup; @@ -150,7 +150,7 @@ TAO_Trading_Loader::fini (void) ACE_DEBUG ((LM_DEBUG, "*** Retrieving its link interface.\n")); CosTrading::Link_var remote_link = - remote_lookup->link_if (TAO_ENV_SINGLE_ARG_PARAMETER); + remote_lookup->link_if (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -158,10 +158,10 @@ TAO_Trading_Loader::fini (void) if (this->bootstrapper_) remote_link->remove_link ("Bootstrap" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); else remote_link->remove_link (this->name_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -176,10 +176,10 @@ TAO_Trading_Loader::fini (void) } int -TAO_Trading_Loader::run (TAO_ENV_SINGLE_ARG_DECL) +TAO_Trading_Loader::run (ACE_ENV_SINGLE_ARG_DECL) { int return_value = - this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return return_value; @@ -188,14 +188,14 @@ TAO_Trading_Loader::run (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_ptr TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr, int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.activate_poa_manager (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER)); + sup_attr.type_repos (this->type_repos_._this (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // The Spec says: return a reference to the Lookup interface from @@ -219,7 +219,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr, this->ior_ = orb->object_to_string (lookup - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + int rc = this->bootstrap_to_federation (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +TAO_Trading_Loader::bootstrap_to_federation (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "*** Bootstrapping to another Trading Service.\n")); CORBA::Object_var trading_obj = - orb->resolve_initial_references ("TradingService" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("TradingService" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (trading_obj.in ())) @@ -278,13 +278,13 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL) "*** Narrowing the lookup interface.\n")); CosTrading::Lookup_var lookup_if = CosTrading::Lookup::_narrow (trading_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + lookup_if->link_if (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); TAO_Trading_Components_i &trd_comp = @@ -300,7 +300,7 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL) our_lookup, CosTrading::always, CosTrading::always - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -309,13 +309,13 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL) lookup_if.in (), CosTrading::always, CosTrading::always - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -335,7 +335,7 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL) link_name_seq[i]))); CosTrading::Link::LinkInfo_var link_info = link_if->describe_link (link_name_seq[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CosTrading::Lookup_ptr remote_lookup; @@ -344,7 +344,7 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "*** Retrieving its link interface.\n")); CosTrading::Link_var remote_link = - remote_lookup->link_if (TAO_ENV_SINGLE_ARG_PARAMETER); + remote_lookup->link_if (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -353,7 +353,7 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL) our_lookup, CosTrading::always, CosTrading::always - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -362,7 +362,7 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL) remote_lookup, CosTrading::always, CosTrading::always - TAO_ENV_ARG_PARAMETER); + ACE_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 7b994f6d36d..364b11a840a 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 (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the Trading Service CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + int bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL); // Bootstrap to another trader, and attach to its trader network. int parse_args (int &argc, char *argv []); |