diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
| commit | 63165b00e2d667e39e15cf084128d94a563d484e (patch) | |
| tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/orbsvcs/tests | |
| parent | 6579bccb3a3f22f882ef908ad5f7e1a65b00b133 (diff) | |
| download | ATCD-63165b00e2d667e39e15cf084128d94a563d484e.tar.gz | |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/orbsvcs/tests')
281 files changed, 6539 insertions, 6528 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp index 8f0e3c8c523..2e4d40d71d6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp @@ -24,8 +24,8 @@ Connection_Manager::init (CORBA::ORB_ptr orb) void Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, - AVStreams::MMDevice_ptr sender, - CORBA::Environment &ACE_TRY_ENV) + AVStreams::MMDevice_ptr sender + TAO_ENV_ARG_DECL) { this->sender_name_ = sender_name; @@ -43,8 +43,8 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, CORBA::string_dup (this->sender_name_.c_str ()); this->sender_context_ = - this->naming_client_->bind_new_context (name, - ACE_TRY_ENV); + this->naming_client_->bind_new_context (name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ -58,8 +58,8 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, // Try binding the receivers context under the sender context. this->receiver_context_ = - this->sender_context_->bind_new_context (name, - ACE_TRY_ENV); + this->sender_context_->bind_new_context (name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex) @@ -74,8 +74,8 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, CORBA::string_dup (this->sender_name_.c_str ()); CORBA::Object_var object = - this->naming_client_->resolve (name, - ACE_TRY_ENV); + this->naming_client_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->sender_context_ = @@ -86,14 +86,14 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, CORBA::string_dup ("Receivers"); object = - this->sender_context_->resolve (name, - ACE_TRY_ENV); + this->sender_context_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->receiver_context_ = CosNaming::NamingContext::_narrow (object.in ()); - this->find_receivers (ACE_TRY_ENV); + this->find_receivers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } ACE_ENDTRY; @@ -104,13 +104,13 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, // Register the sender object with the sender context. this->sender_context_->rebind (name, - sender, - ACE_TRY_ENV); + sender + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Connection_Manager::find_receivers (CORBA::Environment &ACE_TRY_ENV) +Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::BindingIterator_var iterator; CosNaming::BindingList_var binding_list; @@ -119,13 +119,13 @@ Connection_Manager::find_receivers (CORBA::Environment &ACE_TRY_ENV) // Get the list of receivers registered for this sender. this->receiver_context_->list (chunk, binding_list, - iterator, - ACE_TRY_ENV); + iterator + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Add the receivers found in the bindinglist to the <receivers>. - this->add_to_receivers (binding_list, - ACE_TRY_ENV); + this->add_to_receivers (binding_list + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (iterator.in ())) @@ -136,20 +136,20 @@ Connection_Manager::find_receivers (CORBA::Environment &ACE_TRY_ENV) while (more) { more = iterator->next_n (chunk, - binding_list, - ACE_TRY_ENV); + binding_list + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->add_to_receivers (binding_list, - ACE_TRY_ENV); + this->add_to_receivers (binding_list + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } } void -Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list, - CORBA::Environment& ACE_TRY_ENV) +Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list + TAO_ENV_ARG_DECL) { for (CORBA::ULong i = 0; i < binding_list.length (); @@ -167,8 +167,8 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list, // Resolve the reference of the receiver from the receiver // context. CORBA::Object_var obj = - this->receiver_context_->resolve (name, - ACE_TRY_ENV); + this->receiver_context_->resolve (name + TAO_ENV_ARG_PARAMETER); AVStreams::MMDevice_var receiver_device = AVStreams::MMDevice::_narrow (obj.in ()); @@ -184,7 +184,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list, } void -Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV) +Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL) { // Connect to all receivers that we know about. for (Receivers::iterator iterator = this->receivers_.begin (); @@ -223,7 +223,7 @@ Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV) // Register streamctrl. AVStreams::StreamCtrl_var streamctrl_object = - streamctrl->_this (ACE_TRY_ENV); + streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Bind the flowname and the corresponding stream controller to @@ -235,8 +235,8 @@ Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV) (void) streamctrl->bind_devs (this->sender_.in (), (*iterator).int_id_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -244,8 +244,8 @@ Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV) void Connection_Manager::bind_to_sender (const ACE_CString &sender_name, const ACE_CString &receiver_name, - AVStreams::MMDevice_ptr receiver, - CORBA::Environment &ACE_TRY_ENV) + AVStreams::MMDevice_ptr receiver + TAO_ENV_ARG_DECL) { this->sender_name_ = sender_name; @@ -268,8 +268,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, CORBA::string_dup (this->sender_name_.c_str ()); CORBA::Object_var object = - this->naming_client_->resolve (name, - ACE_TRY_ENV); + this->naming_client_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ -286,8 +286,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Find the receivers context under the sender's context object = - this->sender_context_->resolve (name, - ACE_TRY_ENV); + this->sender_context_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->receiver_context_ = @@ -300,8 +300,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Create the sender context this->sender_context_ = - this->naming_client_->bind_new_context (name, - ACE_TRY_ENV); + this->naming_client_->bind_new_context (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; name [0].id = @@ -309,8 +309,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Create the receivers context under the sender's context this->receiver_context_ = - this->sender_context_->bind_new_context (name, - ACE_TRY_ENV); + this->sender_context_->bind_new_context (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_ENDTRY; @@ -325,8 +325,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Register this receiver object under the receiver context. this->receiver_context_->rebind (name, - receiver, - ACE_TRY_ENV); + receiver + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // @@ -342,12 +342,12 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, CORBA::string_dup (this->sender_name_.c_str ()); CORBA::Object_var object = - this->sender_context_->resolve (name, - ACE_TRY_ENV); + this->sender_context_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS); this->sender_ = - AVStreams::MMDevice::_narrow (object.in (), ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS); } ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex) @@ -360,7 +360,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, } void -Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV) +Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->sender_.in ())) return; @@ -396,7 +396,7 @@ Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV) // Register streamctrl. AVStreams::StreamCtrl_var streamctrl_object = - streamctrl->_this (ACE_TRY_ENV); + streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // @@ -414,8 +414,8 @@ Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV) streamctrl->bind_devs (this->sender_.in (), this->receiver_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (result == 0) @@ -424,20 +424,20 @@ Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV) // Start the data sending. AVStreams::flowSpec start_spec; - streamctrl->start (start_spec, - ACE_TRY_ENV); + streamctrl->start (start_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void Connection_Manager::add_streamctrl (const ACE_CString &flowname, - TAO_StreamEndPoint *endpoint, - CORBA::Environment &ACE_TRY_ENV) + TAO_StreamEndPoint *endpoint + TAO_ENV_ARG_DECL) { // Get the stream controller for this endpoint. CORBA::Any_ptr streamctrl_any = - endpoint->get_property_value ("Related_StreamCtrl", - ACE_TRY_ENV); + endpoint->get_property_value ("Related_StreamCtrl" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; AVStreams::StreamCtrl_ptr streamctrl; @@ -449,7 +449,7 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname, } void -Connection_Manager::destroy (CORBA::Environment &ACE_TRY_ENV) +Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL) { AVStreams::flowSpec stop_spec; @@ -458,15 +458,15 @@ Connection_Manager::destroy (CORBA::Environment &ACE_TRY_ENV) iterator != this->streamctrls_.end (); ++iterator) { - (*iterator).int_id_->destroy (stop_spec, - ACE_TRY_ENV); + (*iterator).int_id_->destroy (stop_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -Connection_Manager::destroy (const ACE_CString &flowname, - CORBA::Environment &ACE_TRY_ENV) +Connection_Manager::destroy (const ACE_CString &flowname + TAO_ENV_ARG_DECL) { this->protocol_objects_.unbind (flowname); this->receivers_.unbind (flowname); @@ -476,8 +476,8 @@ Connection_Manager::destroy (const ACE_CString &flowname, streamctrl); AVStreams::flowSpec stop_spec; - streamctrl->destroy (stop_spec, - ACE_TRY_ENV); + streamctrl->destroy (stop_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h index c121456931a..6db0ebd24bb 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h @@ -44,33 +44,33 @@ public: // Initialize this class. void bind_to_receivers (const ACE_CString &sender_name, - AVStreams::MMDevice_ptr sender, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + AVStreams::MMDevice_ptr sender + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Method that binds the sender to the Naming Service and retreives // the references of any registered receivers. - void connect_to_receivers (CORBA::Environment& ACE_TRY_ENV = TAO_default_environment ()); + void connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Connect to the receivers that we found. void bind_to_sender (const ACE_CString &sender_name, const ACE_CString &receiver_name, - AVStreams::MMDevice_ptr receiver, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + AVStreams::MMDevice_ptr receiver + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Bind receiver to the sender. - void connect_to_sender (CORBA::Environment& ACE_TRY_ENV = TAO_default_environment ()); + void connect_to_sender (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Connect to the sender that we found. - void destroy (CORBA::Environment & = TAO_default_environment ()); + void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Destroy all streams. - void destroy (const ACE_CString &flowname, - CORBA::Environment & = TAO_default_environment ()); + void destroy (const ACE_CString &flowname + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Destroy streams associated with <flowname>. void add_streamctrl (const ACE_CString &flowname, - TAO_StreamEndPoint *endpoint, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_StreamEndPoint *endpoint + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Add new streamctrl. // Map of receivers. @@ -98,10 +98,10 @@ public: protected: - void find_receivers (CORBA::Environment &ACE_TRY_ENV); + void find_receivers (TAO_ENV_SINGLE_ARG_DECL); - void add_to_receivers (CosNaming::BindingList &binding_list, - CORBA::Environment& ACE_TRY_ENV); + void add_to_receivers (CosNaming::BindingList &binding_list + TAO_ENV_ARG_DECL); TAO_Naming_Client naming_client_; // The Naming Service client. diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp index d24a84b2951..4a9892f4428 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp @@ -90,7 +90,7 @@ Distributer_Receiver_Callback::handle_destroy (void) ACE_DEBUG ((LM_DEBUG, "Distributer_Callback::end_stream\n")); - DISTRIBUTER::instance ()->connection_manager ().destroy (ACE_TRY_ENV); + DISTRIBUTER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // We can close down now. @@ -153,8 +153,8 @@ Distributer::parse_args (int argc, int Distributer::init (int argc, - char ** argv, - CORBA::Environment &ACE_TRY_ENV) + char ** argv + TAO_ENV_ARG_DECL) { // Initialize the connection class. int result = @@ -191,7 +191,7 @@ Distributer::init (int argc, this->distributer_sender_mmdevice_; AVStreams::MMDevice_var distributer_sender_mmdevice = - this->distributer_sender_mmdevice_->_this (ACE_TRY_ENV); + this->distributer_sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->distributer_receiver_mmdevice_, @@ -203,28 +203,28 @@ Distributer::init (int argc, this->distributer_receiver_mmdevice_; AVStreams::MMDevice_var distributer_receiver_mmdevice = - this->distributer_receiver_mmdevice_->_this (ACE_TRY_ENV); + this->distributer_receiver_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Bind to receivers. this->connection_manager_.bind_to_receivers (this->distributer_name_, - distributer_sender_mmdevice.in (), - ACE_TRY_ENV); + distributer_sender_mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Connect to receivers - this->connection_manager_.connect_to_receivers (ACE_TRY_ENV); + this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Bind to sender. this->connection_manager_.bind_to_sender (this->sender_name_, this->distributer_name_, - distributer_receiver_mmdevice.in (), - ACE_TRY_ENV); + distributer_receiver_mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Connect to sender. - this->connection_manager_.connect_to_sender (ACE_TRY_ENV); + this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -246,46 +246,46 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Distributer int result = DISTRIBUTER::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -293,7 +293,7 @@ main (int argc, while (!DISTRIBUTER::instance ()->done ()) { - orb->perform_work (ACE_TRY_ENV); + orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h index a6e73b7e911..83e7ec81eea 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h @@ -115,8 +115,8 @@ public: // Destructor. int init (int argc, - char **argv, - CORBA::Environment &); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Initialize data components. int parse_args (int argc, diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp index e1b130cb3e2..4bcedbd078b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp @@ -63,8 +63,8 @@ Receiver_Callback::handle_destroy (void) ACE_TRY_NEW_ENV { - TAO_AV_CORE::instance ()->orb ()->shutdown (0, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->shutdown (0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -93,8 +93,8 @@ Receiver::~Receiver (void) int Receiver::init (int, - char **, - CORBA::Environment &ACE_TRY_ENV) + char ** + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -119,18 +119,18 @@ Receiver::init (int, this->mmdevice_; AVStreams::MMDevice_var mmdevice = - this->mmdevice_->_this (ACE_TRY_ENV); + this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Bind to sender. this->connection_manager_.bind_to_sender (this->sender_name_, this->receiver_name_, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Connect to the sender. - this->connection_manager_.connect_to_sender (ACE_TRY_ENV); + this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -179,39 +179,39 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Receiver receiver; @@ -237,20 +237,20 @@ main (int argc, result = receiver.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Hack for now.... ACE_OS::sleep (1); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h index 48724fc7ce3..c38cb18815a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h @@ -83,8 +83,8 @@ public: // Destructor. int init (int argc, - char **argv, - CORBA::Environment &); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Initialize data components. int parse_args (int argc, diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp index a96e4e49c71..dd8678dd200 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp @@ -81,8 +81,8 @@ Sender::parse_args (int argc, int Sender::init (int argc, - char **argv, - CORBA::Environment& ACE_TRY_ENV) + char **argv + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -128,18 +128,18 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (ACE_TRY_ENV); + this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the object reference with the Naming Service and bind to // the receivers this->connection_manager_.bind_to_receivers (this->sender_name_, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Connect to the receivers - this->connection_manager_.connect_to_receivers (ACE_TRY_ENV); + this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -147,7 +147,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) +Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -224,8 +224,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // Run the orb for the wait time so the sender can // continue other orb requests. - TAO_AV_CORE::instance ()->orb ()->run (wait_time, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->run (wait_time + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -280,54 +280,54 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; //Get the POA_var object from Object_var PortableServer::POA_var root_poa - = PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + = PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Client. int result = 0; result = SENDER::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, "client::init failed\n"), -1); - SENDER::instance ()->pace_data (ACE_TRY_ENV); + SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - SENDER::instance ()->connection_manager ().destroy (ACE_TRY_ENV); + SENDER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h index 22038260fa8..58468c578b6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h @@ -62,11 +62,11 @@ public: // Constructor int init (int argc, - char **argv, - CORBA::Environment&); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Method to initialize the various data components. - int pace_data (CORBA::Environment &); + int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Method to pace and send data from a file. Connection_Manager &connection_manager (void); diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp index 6bceacbf55b..7c8defb9058 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp @@ -26,7 +26,7 @@ Receiver_StreamEndPoint::get_callback (const char *, int Receiver_StreamEndPoint::set_protocol_object (const char * flowname, - TAO_AV_Protocol_Object *object) + TAO_AV_Protocol_Object *object) { // Set the sender protocol object corresponding to the transport // protocol selected. @@ -70,17 +70,17 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, frame = frame->cont (); } - + // Read from the file into a message block. int n = ACE_OS::fread (this->mb_.wr_ptr (), - 1, - this->mb_.size (), - RECEIVER::instance ()->input_file ()); - + 1, + this->mb_.size (), + RECEIVER::instance ()->input_file ()); + if (n < 0) ACE_DEBUG ((LM_DEBUG, - "Receiver::receive_frame fread failed\n")); - + "Receiver::receive_frame fread failed\n")); + if (n == 0) { // At end of file break the loop and end the sender. @@ -89,15 +89,15 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, else { this->mb_.wr_ptr (n); - + // Send frame. int result = - RECEIVER::instance ()->protocol_object ()->send_frame (&this->mb_); - + RECEIVER::instance ()->protocol_object ()->send_frame (&this->mb_); + if (result < 0) - ACE_DEBUG ((LM_DEBUG, - "Send Frame Failed\n")); - + ACE_DEBUG ((LM_DEBUG, + "Send Frame Failed\n")); + // Reset the message block. this->mb_.reset (); } @@ -117,18 +117,18 @@ Receiver_Callback::handle_destroy (void) if (count < 2) { ACE_TRY_NEW_ENV - { - TAO_AV_CORE::instance ()->orb ()->shutdown (0, - ACE_TRY_ENV); - ACE_TRY_CHECK; - } + { + TAO_AV_CORE::instance ()->orb ()->shutdown (0 + TAO_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Receiver_Callback::handle_destroy Failed\n"); + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Receiver_Callback::handle_destroy Failed\n"); return -1; - - } + + } ACE_ENDTRY; } @@ -160,7 +160,7 @@ Receiver::protocol_object (TAO_AV_Protocol_Object *object) int Receiver::parse_args (int argc, - char **argv) + char **argv) { // Parse command line arguments ACE_Get_Opt opts (argc, argv, "f:r:d"); @@ -189,8 +189,8 @@ Receiver::parse_args (int argc, int Receiver::init (int argc, - char ** argv, - CORBA::Environment &ACE_TRY_ENV) + char ** argv + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -205,7 +205,7 @@ Receiver::init (int argc, argv); if (result != 0) return result; - + // Open file to read. this->input_file_ = ACE_OS::fopen (this->filename_.c_str (), @@ -230,7 +230,7 @@ Receiver::init (int argc, this->mmdevice_; CORBA::Object_var mmdevice = - this->mmdevice_->_this (ACE_TRY_ENV); + this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the mmdevice with the naming service. @@ -248,8 +248,8 @@ Receiver::init (int argc, // Register the receiver object with the naming server. this->naming_client_->rebind (name, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -278,32 +278,32 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. - TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in (), ACE_TRY_ENV); + TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + // Make sure we have a valid <output_file> output_file = ACE_OS::fopen (output_file_name, "w"); @@ -319,24 +319,24 @@ main (int argc, int result = RECEIVER::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + // // Start sending data. - // result = SENDER::instance ()->pace_data (ACE_TRY_ENV); + // result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); // ACE_TRY_CHECK; - + if (result != 0) return result; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + // Hack for now.... ACE_OS::sleep (1); - - //orb->destroy (ACE_TRY_ENV); + + //orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h index 4511d5f7710..8050232c5b7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h @@ -49,7 +49,7 @@ public: private: int frame_count_; // Keeping a count of the incoming frames. - + ACE_Message_Block mb_; // Message block into which data is read from a file and then sent. }; @@ -93,8 +93,8 @@ public: // Destructor. int init (int argc, - char **argv, - CORBA::Environment &); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Initialize data components. void protocol_object (TAO_AV_Protocol_Object *protocol_object); @@ -130,7 +130,7 @@ protected: ACE_CString filename_; // File from which data is read. - + int parse_args (int argc, char **argv); // Method to parse the command line arguments. diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl index 28372903db4..e5b712073f8 100755 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl @@ -28,7 +28,7 @@ $NS->Spawn (); if (PerlACE::waitforfile_timed ($nsior, 5) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp index 63dab991dd3..bdc873a3ac6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp @@ -42,8 +42,8 @@ Sender_Callback::Sender_Callback (void) int Sender_Callback::receive_frame (ACE_Message_Block *frame, - TAO_AV_frame_info *, - const ACE_Addr &) + TAO_AV_frame_info *, + const ACE_Addr &) { // // Upcall from the AVStreams when there is data to be received from @@ -52,7 +52,7 @@ Sender_Callback::receive_frame (ACE_Message_Block *frame, ACE_DEBUG ((LM_DEBUG, "Sender_Callback::receive_frame for frame %d\n", this->frame_count_++)); - + while (frame != 0) { // Write the received data to the file. @@ -108,15 +108,15 @@ Sender::shutdown (void) ACE_DECLARE_NEW_CORBA_ENV; // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; - this->streamctrl_->destroy (stop_spec, - ACE_TRY_ENV); + this->streamctrl_->destroy (stop_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + // Shut the orb down. - TAO_AV_CORE::instance ()->orb ()->shutdown (0, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->shutdown (0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + } int @@ -153,7 +153,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) +Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -162,13 +162,13 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) // Resolve the receiver object reference from the Naming Service CORBA::Object_var receiver_mmdevice_obj = - this->naming_client_->resolve (name, - ACE_TRY_ENV); + this->naming_client_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->receiver_mmdevice_ = - AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in (), - ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->receiver_mmdevice_.in ())) @@ -181,8 +181,8 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) int Sender::init (int argc, - char **argv, - CORBA::Environment &ACE_TRY_ENV) + char **argv + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -219,9 +219,9 @@ Sender::init (int argc, "File opened successfully\n")); // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (ACE_TRY_ENV); + result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - + if (result != 0) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), @@ -263,7 +263,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (ACE_TRY_ENV); + this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->streamctrl_, @@ -278,8 +278,8 @@ Sender::init (int argc, this->streamctrl_->bind_devs (mmdevice.in (), this->receiver_mmdevice_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (bind_result == 0) @@ -292,7 +292,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) +Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -330,7 +330,7 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) { // At end of file break the loop and end the sender. ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n")); - this->eof_ = 1; + this->eof_ = 1; break; } @@ -369,8 +369,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // Run the orb for the wait time so the sender can // continue other orb requests. - TAO_AV_CORE::instance ()->orb ()->run (wait_time, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->run (wait_time + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -399,13 +399,13 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; - this->streamctrl_->destroy (stop_spec, - ACE_TRY_ENV); + this->streamctrl_->destroy (stop_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Shut the orb down. //TAO_AV_CORE::instance ()->orb ()->shutdown (1, - // ACE_TRY_ENV); + // TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -428,42 +428,42 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa - = PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + = PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. /* TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); */ + root_poa.in () + TAO_ENV_ARG_PARAMETER); */ ACE_TRY_CHECK; // Initialize the AVStreams components. - TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in (), ACE_TRY_ENV); + TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) @@ -483,9 +483,9 @@ main (int argc, else ACE_DEBUG ((LM_DEBUG, "File Opened Successfull\n")); - + // Start sending data. - result = SENDER::instance ()->pace_data (ACE_TRY_ENV); + result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv(3,0); orb->run (tv); diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h index 8188b7f49f7..fbe82c9e994 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h @@ -89,25 +89,25 @@ public: // Constructor int init (int argc, - char **argv, - CORBA::Environment&); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Method to initialize the various data components. - int pace_data (CORBA::Environment &); + int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Method to pace and send data from a file. void protocol_object (TAO_AV_Protocol_Object *protocol_object); // Set the protocol object corresponding to the transport protocol chosen. int eof (void); - + void shutdown (void); private: int parse_args (int argc, char **argv); // Method to parse the command line arguments. - int bind_to_receiver (CORBA::Environment& ACE_TRY_ENV); + int bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL); // Method that binds the sender to the receiver. SENDER_ENDPOINT_STRATEGY endpoint_strategy_; @@ -145,6 +145,6 @@ private: TAO_AV_Protocol_Object *protocol_object_; // Protocol object corresponding to the transport protocol selected. - + int eof_; }; diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp index 796b6e40464..b6a3c85341c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp @@ -25,8 +25,8 @@ Connection_Manager::init (CORBA::ORB_ptr orb) void Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, - AVStreams::MMDevice_ptr sender, - CORBA::Environment &ACE_TRY_ENV) + AVStreams::MMDevice_ptr sender + TAO_ENV_ARG_DECL) { this->sender_name_ = sender_name; @@ -44,8 +44,8 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, CORBA::string_dup (this->sender_name_.c_str ()); this->sender_context_ = - this->naming_client_->bind_new_context (name, - ACE_TRY_ENV); + this->naming_client_->bind_new_context (name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ -59,8 +59,8 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, // Try binding the receivers context under the sender context. this->receiver_context_ = - this->sender_context_->bind_new_context (name, - ACE_TRY_ENV); + this->sender_context_->bind_new_context (name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex) @@ -75,8 +75,8 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, CORBA::string_dup (this->sender_name_.c_str ()); CORBA::Object_var object = - this->naming_client_->resolve (name, - ACE_TRY_ENV); + this->naming_client_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->sender_context_ = @@ -87,14 +87,14 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, CORBA::string_dup ("Receivers"); object = - this->sender_context_->resolve (name, - ACE_TRY_ENV); + this->sender_context_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->receiver_context_ = CosNaming::NamingContext::_narrow (object.in ()); - this->find_receivers (ACE_TRY_ENV); + this->find_receivers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } ACE_ENDTRY; @@ -105,13 +105,13 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, // Register the sender object with the sender context. this->sender_context_->rebind (name, - sender, - ACE_TRY_ENV); + sender + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Connection_Manager::find_receivers (CORBA::Environment &ACE_TRY_ENV) +Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::BindingIterator_var iterator; CosNaming::BindingList_var binding_list; @@ -120,13 +120,13 @@ Connection_Manager::find_receivers (CORBA::Environment &ACE_TRY_ENV) // Get the list of receivers registered for this sender. this->receiver_context_->list (chunk, binding_list, - iterator, - ACE_TRY_ENV); + iterator + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Add the receivers found in the bindinglist to the <receivers>. - this->add_to_receivers (binding_list, - ACE_TRY_ENV); + this->add_to_receivers (binding_list + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (iterator.in ())) @@ -137,20 +137,20 @@ Connection_Manager::find_receivers (CORBA::Environment &ACE_TRY_ENV) while (more) { more = iterator->next_n (chunk, - binding_list, - ACE_TRY_ENV); + binding_list + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->add_to_receivers (binding_list, - ACE_TRY_ENV); + this->add_to_receivers (binding_list + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } } void -Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list, - CORBA::Environment& ACE_TRY_ENV) +Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list + TAO_ENV_ARG_DECL) { for (CORBA::ULong i = 0; i < binding_list.length (); @@ -168,8 +168,8 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list, // Resolve the reference of the receiver from the receiver // context. CORBA::Object_var obj = - this->receiver_context_->resolve (name, - ACE_TRY_ENV); + this->receiver_context_->resolve (name + TAO_ENV_ARG_PARAMETER); AVStreams::MMDevice_var receiver_device = AVStreams::MMDevice::_narrow (obj.in ()); @@ -185,7 +185,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list, } void -Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV) +Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL) { // Connect to all receivers that we know about. for (Receivers::iterator iterator = this->receivers_.begin (); @@ -224,7 +224,7 @@ Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV) // Register streamctrl. AVStreams::StreamCtrl_var streamctrl_object = - streamctrl->_this (ACE_TRY_ENV); + streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Bind the flowname and the corresponding stream controller to @@ -236,8 +236,8 @@ Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV) (void) streamctrl->bind_devs (this->sender_.in (), (*iterator).int_id_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -245,8 +245,8 @@ Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV) void Connection_Manager::bind_to_sender (const ACE_CString &sender_name, const ACE_CString &receiver_name, - AVStreams::MMDevice_ptr receiver, - CORBA::Environment &ACE_TRY_ENV) + AVStreams::MMDevice_ptr receiver + TAO_ENV_ARG_DECL) { this->sender_name_ = sender_name; @@ -271,8 +271,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, CORBA::string_dup (this->sender_name_.c_str ()); CORBA::Object_var object = - this->naming_client_->resolve (name, - ACE_TRY_ENV); + this->naming_client_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ -289,8 +289,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Find the receivers context under the sender's context object = - this->sender_context_->resolve (name, - ACE_TRY_ENV); + this->sender_context_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->receiver_context_ = @@ -303,8 +303,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Create the sender context this->sender_context_ = - this->naming_client_->bind_new_context (name, - ACE_TRY_ENV); + this->naming_client_->bind_new_context (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; name [0].id = @@ -312,8 +312,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Create the receivers context under the sender's context this->receiver_context_ = - this->sender_context_->bind_new_context (name, - ACE_TRY_ENV); + this->sender_context_->bind_new_context (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_ENDTRY; @@ -328,8 +328,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Register this receiver object under the receiver context. this->receiver_context_->rebind (name, - receiver, - ACE_TRY_ENV); + receiver + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // @@ -345,12 +345,12 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, CORBA::string_dup (this->sender_name_.c_str ()); CORBA::Object_var object = - this->sender_context_->resolve (name, - ACE_TRY_ENV); + this->sender_context_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS); this->sender_ = - AVStreams::MMDevice::_narrow (object.in (), ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS); } ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex) @@ -363,7 +363,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, } void -Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV) +Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->sender_.in ())) return; @@ -399,7 +399,7 @@ Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV) // Register streamctrl. AVStreams::StreamCtrl_var streamctrl_object = - streamctrl->_this (ACE_TRY_ENV); + streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // @@ -417,8 +417,8 @@ Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV) streamctrl->bind_devs (this->sender_.in (), this->receiver_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (result == 0) @@ -427,20 +427,20 @@ Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV) // Start the data sending. AVStreams::flowSpec start_spec; - streamctrl->start (start_spec, - ACE_TRY_ENV); + streamctrl->start (start_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void Connection_Manager::add_streamctrl (const ACE_CString &flowname, - TAO_StreamEndPoint *endpoint, - CORBA::Environment &ACE_TRY_ENV) + TAO_StreamEndPoint *endpoint + TAO_ENV_ARG_DECL) { // Get the stream controller for this endpoint. CORBA::Any_ptr streamctrl_any = - endpoint->get_property_value ("Related_StreamCtrl", - ACE_TRY_ENV); + endpoint->get_property_value ("Related_StreamCtrl" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; AVStreams::StreamCtrl_ptr streamctrl; @@ -452,33 +452,33 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname, } void -Connection_Manager::destroy (CORBA::Environment &ACE_TRY_ENV) +Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL) { AVStreams::flowSpec stop_spec; - + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "Connection_Manager::destroy\n")); - + "Connection_Manager::destroy\n")); + StreamCtrls::iterator iterator = this->streamctrls_.begin (); int size = this->streamctrls_.current_size (); for (int i = 0 ; i < size; i++) { - (*iterator).int_id_->destroy (stop_spec, - ACE_TRY_ENV); + (*iterator).int_id_->destroy (stop_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; iterator.advance (); } - + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "Finished with the destroy\n")); + "Finished with the destroy\n")); } void -Connection_Manager::destroy (const ACE_CString &flowname, - CORBA::Environment &ACE_TRY_ENV) +Connection_Manager::destroy (const ACE_CString &flowname + TAO_ENV_ARG_DECL) { this->protocol_objects_.unbind (flowname); this->receivers_.unbind (flowname); @@ -488,163 +488,163 @@ Connection_Manager::destroy (const ACE_CString &flowname, streamctrl); AVStreams::flowSpec stop_spec; - streamctrl->destroy (stop_spec, - ACE_TRY_ENV); + streamctrl->destroy (stop_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Connection_Manager::unbind_sender (const ACE_CString &sender_name, - AVStreams::MMDevice_ptr sender_mmdevice_obj, - CORBA::Environment &ACE_TRY_ENV) +Connection_Manager::unbind_sender (const ACE_CString &sender_name, + AVStreams::MMDevice_ptr sender_mmdevice_obj + TAO_ENV_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "Connection_Manager::unbind_sender\n")); - + "Connection_Manager::unbind_sender\n")); + CosNaming::Name name (1); name.length (1); // Try binding the sender context in the NS name [0].id = CORBA::string_dup (sender_name.c_str ()); - + ACE_TRY { CORBA::Object_var object = - this->naming_client_->resolve (name, - ACE_TRY_ENV); + this->naming_client_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + CosNaming::NamingContext_var sender_context = - CosNaming::NamingContext::_narrow (object.in ()); - + CosNaming::NamingContext::_narrow (object.in ()); + if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Sender Context Found\n")); - + ACE_DEBUG ((LM_DEBUG, + "Sender Context Found\n")); + ACE_TRY_EX (Resolve_Sender) - { - object = - sender_context->resolve (name, - ACE_TRY_ENV); - ACE_TRY_CHECK_EX (Resolve_Sender); - - AVStreams::MMDevice_var mmdevice = - AVStreams::MMDevice::_narrow (object.in ()); - - if (mmdevice->_is_equivalent (sender_mmdevice_obj)) - { - sender_context->unbind (name, - ACE_TRY_ENV); - ACE_TRY_CHECK_EX (Resolve_Sender); - - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Sender Unbound\n")); - } - } + { + object = + sender_context->resolve (name + TAO_ENV_ARG_PARAMETER); + ACE_TRY_CHECK_EX (Resolve_Sender); + + AVStreams::MMDevice_var mmdevice = + AVStreams::MMDevice::_narrow (object.in ()); + + if (mmdevice->_is_equivalent (sender_mmdevice_obj)) + { + sender_context->unbind (name + TAO_ENV_ARG_PARAMETER); + ACE_TRY_CHECK_EX (Resolve_Sender); + + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Sender Unbound\n")); + } + } ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex) - { - ACE_DEBUG ((LM_DEBUG, - "Sender object not found\n")); - // Do not have to unbind. - } + { + ACE_DEBUG ((LM_DEBUG, + "Sender object not found\n")); + // Do not have to unbind. + } ACE_ENDTRY; } ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex) { ACE_DEBUG ((LM_DEBUG, - "Sender Context Not Found\n")); + "Sender Context Not Found\n")); // Do not have to unbind. } ACE_ENDTRY; - + } void Connection_Manager::unbind_receiver (const ACE_CString &sender_name, - const ACE_CString &receiver_name, - AVStreams::MMDevice_ptr receiver_mmdevice) + const ACE_CString &receiver_name, + AVStreams::MMDevice_ptr receiver_mmdevice) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "Connection_Manager::unbind_receiver\n")); - + "Connection_Manager::unbind_receiver\n")); + CosNaming::Name name (1); name.length (1); // Try binding the sender context in the NS name [0].id = CORBA::string_dup (sender_name.c_str ()); - + ACE_TRY_NEW_ENV { CORBA::Object_var object = - this->naming_client_->resolve (name, - ACE_TRY_ENV); + this->naming_client_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + CosNaming::NamingContext_var sender_context = - CosNaming::NamingContext::_narrow (object.in ()); - + CosNaming::NamingContext::_narrow (object.in ()); + if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Sender Context Found\n")); - + ACE_DEBUG ((LM_DEBUG, + "Sender Context Found\n")); + ACE_TRY_EX (Resolve_Receiver) - { - name [0].id = - CORBA::string_dup ("Receivers"); - - object = - sender_context->resolve (name, - ACE_TRY_ENV); - ACE_TRY_CHECK_EX (Resolve_Receiver); - - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Receivers Context Found\n")); - - CosNaming::NamingContext_var receivers_context = - CosNaming::NamingContext::_narrow (object.in ()); - - name [0].id = - CORBA::string_dup (receiver_name.c_str ()); - - object = - receivers_context->resolve (name, - ACE_TRY_ENV); - ACE_TRY_CHECK_EX (Resolve_Receiver); - - AVStreams::MMDevice_var mmdevice = - AVStreams::MMDevice::_narrow (object.in ()); - - if (mmdevice->_is_equivalent (receiver_mmdevice)) - { - receivers_context->unbind (name, - ACE_TRY_ENV); - ACE_TRY_CHECK_EX (Resolve_Receiver); - - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Receiver Unbound\n")); - } - } + { + name [0].id = + CORBA::string_dup ("Receivers"); + + object = + sender_context->resolve (name + TAO_ENV_ARG_PARAMETER); + ACE_TRY_CHECK_EX (Resolve_Receiver); + + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Receivers Context Found\n")); + + CosNaming::NamingContext_var receivers_context = + CosNaming::NamingContext::_narrow (object.in ()); + + name [0].id = + CORBA::string_dup (receiver_name.c_str ()); + + object = + receivers_context->resolve (name + TAO_ENV_ARG_PARAMETER); + ACE_TRY_CHECK_EX (Resolve_Receiver); + + AVStreams::MMDevice_var mmdevice = + AVStreams::MMDevice::_narrow (object.in ()); + + if (mmdevice->_is_equivalent (receiver_mmdevice)) + { + receivers_context->unbind (name + TAO_ENV_ARG_PARAMETER); + ACE_TRY_CHECK_EX (Resolve_Receiver); + + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "Receiver Unbound\n")); + } + } ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex) - { - ACE_DEBUG ((LM_DEBUG, - "Receiver Not found\n")); - // Do not have to unbind. - } + { + ACE_DEBUG ((LM_DEBUG, + "Receiver Not found\n")); + // Do not have to unbind. + } ACE_ENDTRY; - + } ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex) { ACE_DEBUG ((LM_DEBUG, - "Sender Context Not Found\n")); + "Sender Context Not Found\n")); // Do not have to unbind. } ACE_ENDTRY; diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h index 83d71d94977..f7f44716a56 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h @@ -47,43 +47,43 @@ public: // Initialize this class. void bind_to_receivers (const ACE_CString &sender_name, - AVStreams::MMDevice_ptr sender, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + AVStreams::MMDevice_ptr sender + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Method that binds the sender to the Naming Service and retreives // the references of any registered receivers. - void connect_to_receivers (CORBA::Environment& ACE_TRY_ENV = TAO_default_environment ()); + void connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Connect to the receivers that we found. void bind_to_sender (const ACE_CString &sender_name, const ACE_CString &receiver_name, - AVStreams::MMDevice_ptr receiver, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + AVStreams::MMDevice_ptr receiver + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Bind receiver to the sender. - void connect_to_sender (CORBA::Environment& ACE_TRY_ENV = TAO_default_environment ()); + void connect_to_sender (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Connect to the sender that we found. - void destroy (CORBA::Environment & = TAO_default_environment ()); + void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Destroy all streams. - void destroy (const ACE_CString &flowname, - CORBA::Environment & = TAO_default_environment ()); + void destroy (const ACE_CString &flowname + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Destroy streams associated with <flowname>. - void unbind_sender (const ACE_CString &sender_name, - AVStreams::MMDevice_ptr sender_mmdevice, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ; + void unbind_sender (const ACE_CString &sender_name, + AVStreams::MMDevice_ptr sender_mmdevice + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ; // Unbind the sender from the Naming Service - void unbind_receiver (const ACE_CString &sender_name, - const ACE_CString &receiver_name, - AVStreams::MMDevice_ptr receiver_mmdevice); + void unbind_receiver (const ACE_CString &sender_name, + const ACE_CString &receiver_name, + AVStreams::MMDevice_ptr receiver_mmdevice); // Unbind the Receiver from the Naming Service void add_streamctrl (const ACE_CString &flowname, - TAO_StreamEndPoint *endpoint, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + TAO_StreamEndPoint *endpoint + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Add new streamctrl. // Map of receivers. @@ -111,10 +111,10 @@ public: protected: - void find_receivers (CORBA::Environment &ACE_TRY_ENV); + void find_receivers (TAO_ENV_SINGLE_ARG_DECL); - void add_to_receivers (CosNaming::BindingList &binding_list, - CORBA::Environment& ACE_TRY_ENV); + void add_to_receivers (CosNaming::BindingList &binding_list + TAO_ENV_ARG_DECL); TAO_Naming_Client naming_client_; // The Naming Service client. diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index a3c6579f6be..5720e0a6cb6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -21,12 +21,12 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*) if (signum == SIGINT) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "In the signal handler\n")); - + ACE_DEBUG ((LM_DEBUG, + "In the signal handler\n")); + DISTRIBUTER::instance ()->done (1); - - } + + } return 0; } @@ -37,7 +37,7 @@ Distributer_Sender_StreamEndPoint::get_callback (const char *flow_name, /// Create and return the sender application callback to AVStreams /// for further upcalls. callback = &this->callback_; - + ACE_CString fname = flow_name; this->callback_.flowname (fname); @@ -59,7 +59,7 @@ Distributer_Sender_StreamEndPoint::set_protocol_object (const char *flowname, /// Store the related streamctrl. connection_manager.add_streamctrl (flowname, this); - + return 0; } @@ -87,17 +87,17 @@ Distributer_Receiver_StreamEndPoint::set_protocol_object (const char *, return 0; } -CORBA::Boolean -Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec, - CORBA::Environment &) +CORBA::Boolean +Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec + TAO_ENV_ARG_DECL_NOT_USED) { //if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "Distributer_Receiver_StreamEndPoint::handle_connection_requested\n")); - + "Distributer_Receiver_StreamEndPoint::handle_connection_requested\n")); + Connection_Manager &connection_manager = DISTRIBUTER::instance ()->connection_manager (); - + /// Check to see if the flow already exists. If it does then close the /// old connection and setup a new one with the new sender. @@ -107,34 +107,34 @@ Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flo { TAO_Forward_FlowSpec_Entry entry; entry.parse (flowspec[i].in ()); - + //if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "Handle Conection Requested flowname %s \n", - entry.flowname ())); - + ACE_DEBUG ((LM_DEBUG, + "Handle Conection Requested flowname %s \n", + entry.flowname ())); + ACE_CString flowname (entry.flowname ()); - + int result = connection_manager.streamctrls ().find (flowname); - + /// If the flowname is found. if (result == 0) - { - ACE_DEBUG ((LM_DEBUG, "\nDistributer switching senders handle connection requested\n\n")); - - ///Destroy old stream with the same flowname. - connection_manager.destroy (flowname); - - } - + { + ACE_DEBUG ((LM_DEBUG, "\nDistributer switching senders handle connection requested\n\n")); + + ///Destroy old stream with the same flowname. + connection_manager.destroy (flowname); + + } + /// Store the related streamctrl. connection_manager.add_streamctrl (flowname.c_str (), - this); - + this); + } return 1; - + } @@ -149,7 +149,7 @@ Distributer_Receiver_Callback::flowname (void) return this->flowname_; } -void +void Distributer_Receiver_Callback::flowname (const ACE_CString &flowname) { this->flowname_ = flowname; @@ -193,13 +193,13 @@ Distributer_Receiver_Callback::handle_destroy (void) { /// Called when the sender requests the stream to be shutdown. ACE_DEBUG ((LM_DEBUG, - "Distributer_Receiver_Callback::end_stream\n")); - + "Distributer_Receiver_Callback::end_stream\n")); + DISTRIBUTER::instance ()->connection_manager ().streamctrls ().unbind (this->flowname_.c_str ()); - + /// Decrement the stream count. DISTRIBUTER::instance ()->stream_destroyed (); - + return 0; } @@ -209,7 +209,7 @@ Distributer_Sender_Callback::flowname (void) return this->flowname_; } -void +void Distributer_Sender_Callback::flowname (const ACE_CString &flowname) { this->flowname_ = flowname; @@ -222,11 +222,11 @@ Distributer_Sender_Callback::handle_destroy (void) ACE_DEBUG ((LM_DEBUG, "Distributer_Sender_Callback::end_stream\n")); - + DISTRIBUTER::instance ()->connection_manager ().protocol_objects ().unbind (this->flowname_.c_str ()); - + DISTRIBUTER::instance ()->connection_manager ().streamctrls ().unbind (this->flowname_.c_str ()); - + DISTRIBUTER::instance ()->connection_manager ().receivers ().unbind (this->flowname_.c_str ()); return 0; @@ -244,17 +244,17 @@ Distributer::~Distributer (void) { } -void +void Distributer::stream_created (void) { this->stream_count_++; } -void +void Distributer::stream_destroyed (void) { this->stream_count_--; - + if (this->stream_count_ == 0) this->done_ = 1; } @@ -295,8 +295,8 @@ Distributer::parse_args (int argc, int Distributer::init (int argc, - char ** argv, - CORBA::Environment &ACE_TRY_ENV) + char ** argv + TAO_ENV_ARG_DECL) { /// Initialize the connection class. int result = @@ -324,15 +324,15 @@ Distributer::init (int argc, if (result != 0) return result; - ACE_Reactor *reactor = + ACE_Reactor *reactor = TAO_AV_CORE::instance ()->reactor (); - + if (reactor->register_handler (SIGINT, - &this->signal_handler_) == -1) + &this->signal_handler_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "Error in handler register\n"), - -1); - /// Register the signal handler for clean termination of the process. + "Error in handler register\n"), + -1); + /// Register the signal handler for clean termination of the process. ACE_NEW_RETURN (this->distributer_sender_mmdevice_, TAO_MMDevice (&this->sender_endpoint_strategy_), @@ -343,7 +343,7 @@ Distributer::init (int argc, this->distributer_sender_mmdevice_; AVStreams::MMDevice_var distributer_sender_mmdevice = - this->distributer_sender_mmdevice_->_this (ACE_TRY_ENV); + this->distributer_sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->distributer_receiver_mmdevice_, @@ -355,31 +355,31 @@ Distributer::init (int argc, this->distributer_receiver_mmdevice_; AVStreams::MMDevice_var distributer_receiver_mmdevice = - this->distributer_receiver_mmdevice_->_this (ACE_TRY_ENV); + this->distributer_receiver_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); /// Bind to sender. this->connection_manager_.bind_to_sender (this->sender_name_, this->distributer_name_, - distributer_receiver_mmdevice.in (), - ACE_TRY_ENV); + distributer_receiver_mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - + /// Connect to sender. - this->connection_manager_.connect_to_sender (ACE_TRY_ENV); + this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - + /// Bind to receivers. this->connection_manager_.bind_to_receivers (this->distributer_name_, - distributer_sender_mmdevice.in (), - ACE_TRY_ENV); + distributer_sender_mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - + /// Connect to receivers - this->connection_manager_.connect_to_receivers (ACE_TRY_ENV); + this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - + return 0; } @@ -390,25 +390,25 @@ Distributer::done (void) const } void -Distributer::shut_down (CORBA::Environment &ACE_TRY_ENV) +Distributer::shut_down (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { - AVStreams::MMDevice_var receiver_mmdevice = - this->distributer_receiver_mmdevice_->_this (ACE_TRY_ENV); + AVStreams::MMDevice_var receiver_mmdevice = + this->distributer_receiver_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; DISTRIBUTER::instance ()->connection_manager ().unbind_receiver (this->sender_name_, - this->distributer_name_, - receiver_mmdevice.in ()); - AVStreams::MMDevice_var sender_mmdevice = - this->distributer_sender_mmdevice_->_this (ACE_TRY_ENV); + this->distributer_name_, + receiver_mmdevice.in ()); + AVStreams::MMDevice_var sender_mmdevice = + this->distributer_sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + DISTRIBUTER::instance ()->connection_manager ().unbind_sender (this->distributer_name_, - sender_mmdevice.in ()); - - DISTRIBUTER::instance ()->connection_manager ().destroy (ACE_TRY_ENV); + sender_mmdevice.in ()); + + DISTRIBUTER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -429,60 +429,60 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { /// Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; /// Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Initialize the Distributer int result = DISTRIBUTER::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; while (!DISTRIBUTER::instance ()->done ()) - { - orb->perform_work (ACE_TRY_ENV); - ACE_TRY_CHECK; - } + { + orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + } - DISTRIBUTER::instance ()->shut_down (ACE_TRY_ENV); + DISTRIBUTER::instance ()->shut_down (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + } ACE_CATCHANY { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h index 4f1a2e96c3c..b410f8a662e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h @@ -30,7 +30,7 @@ class Signal_Handler : public ACE_Event_Handler // Useful to gracefully release the process public: - + Signal_Handler (void); int handle_signal(int signum, siginfo_t*,ucontext_t*); @@ -64,7 +64,7 @@ public: /// Accessor methods for the flowname of the callback. ACE_CString &flowname (void); void flowname (const ACE_CString &flowname); - + private: int frame_count_; /// Count of the frames passing through us. @@ -80,9 +80,9 @@ class Distributer_Sender_Callback : public TAO_AV_Callback // for receiving data. // // = DESCRIPTION - // This class overides the methods of the TAO_AV_Callback so the + // This class overides the methods of the TAO_AV_Callback so the // AVStreams can make upcalls to the application. - + public: int handle_destroy (void); @@ -94,9 +94,9 @@ public: void flowname (const ACE_CString &flowname); private: - + ACE_CString flowname_; - + }; class Distributer_Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint @@ -110,14 +110,14 @@ public: /// Create a receiver application callback. int get_callback (const char *flowname, TAO_AV_Callback *&callback); - + int set_protocol_object (const char *, - TAO_AV_Protocol_Object *object); + TAO_AV_Protocol_Object *object); /// Store the reference to the protocol object corresponding /// to the transport - virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec, - CORBA::Environment &); + virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_NOT_USED); /// Called when a sender makes a connection request. private: @@ -139,7 +139,7 @@ public: TAO_AV_Protocol_Object *object); /// Set protocol object corresponding to the transport protocol /// chosen. - + protected: Distributer_Sender_Callback callback_; /// Application callback. @@ -173,8 +173,8 @@ public: /// Destructor. int init (int argc, - char **argv, - CORBA::Environment &); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); /// Initialize data components. int parse_args (int argc, @@ -190,11 +190,11 @@ public: void stream_created (void); /// Called when stream created - + void stream_destroyed (void); /// Called when stream destroyed - void shut_down (CORBA::Environment &); + void shut_down (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); ///Unbind the sender and receiver from the Naming Service protected: @@ -221,13 +221,13 @@ protected: int done_; /// Flag to know when we are done. - + int stream_count_; - /// Number of active streams. When a stream is disconnected this + /// Number of active streams. When a stream is disconnected this /// count is decremented. Signal_Handler signal_handler_; /// Reference to the signal handler. - + }; diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp index a33af2bec29..afede31f802 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp @@ -23,11 +23,11 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*) if (signum == SIGINT) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "In the signal handler\n")); - + ACE_DEBUG ((LM_DEBUG, + "In the signal handler\n")); + done = 1; - } + } return 0; } @@ -41,54 +41,54 @@ Receiver_StreamEndPoint::get_callback (const char *flow_name, /// Return the receiver application callback to the AVStreams for /// future upcalls. callback = &this->callback_; - + ACE_CString fname = flow_name; this->callback_.flowname (fname); return 0; } -CORBA::Boolean -Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec, - CORBA::Environment &) +CORBA::Boolean +Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec + TAO_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "In Handle Conection Requested \n")); - + "In Handle Conection Requested \n")); + for (CORBA::ULong i = 0; i < flowspec.length (); i++) { TAO_Forward_FlowSpec_Entry entry; entry.parse (flowspec[i].in ()); - + ACE_DEBUG ((LM_DEBUG, - "Handle Conection Requested flowname %s \n", - entry.flowname ())); - + "Handle Conection Requested flowname %s \n", + entry.flowname ())); + ACE_CString flowname (entry.flowname ()); - + int result = - connection_manager->streamctrls ().find (flowname); - + connection_manager->streamctrls ().find (flowname); + /// If the flowname is found. if (result == 0) - { - ACE_DEBUG ((LM_DEBUG, "\nReceiver switching distributers handle connection requested\n\n")); - - ///Destroy old stream with the same flowname. - - connection_manager->destroy (flowname); - - } - + { + ACE_DEBUG ((LM_DEBUG, "\nReceiver switching distributers handle connection requested\n\n")); + + ///Destroy old stream with the same flowname. + + connection_manager->destroy (flowname); + + } + /// Store the related streamctrl. connection_manager->add_streamctrl (flowname.c_str (), - this); - + this); + } return 1; - + } Receiver_Callback::Receiver_Callback (void) @@ -102,7 +102,7 @@ Receiver_Callback::flowname (void) return this->flowname_; } -void +void Receiver_Callback::flowname (const ACE_CString &flowname) { this->flowname_ = flowname; @@ -113,11 +113,11 @@ Receiver_Callback::handle_destroy (void) { /// Called when the sender requests the stream to be shutdown. ACE_DEBUG ((LM_DEBUG, - "Receiver_Callback::end_stream\n")); + "Receiver_Callback::end_stream\n")); /// Remove the related stream control reference. connection_manager->streamctrls ().unbind (this->flowname_.c_str ()); - + return 0; } int @@ -180,8 +180,8 @@ Receiver::receiver_name (void) int Receiver::init (int, - char **, - CORBA::Environment &ACE_TRY_ENV) + char ** + TAO_ENV_ARG_DECL) { /// Initialize the endpoint strategy with the orb and poa. int result = @@ -197,17 +197,17 @@ Receiver::init (int, return result; connection_manager = &this->connection_manager_; - - ACE_Reactor *reactor = + + ACE_Reactor *reactor = TAO_AV_CORE::instance ()->reactor (); - + if (reactor->register_handler (SIGINT, - &this->signal_handler_) == -1) + &this->signal_handler_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "Error in handler register\n"), - -1); + "Error in handler register\n"), + -1); /// Register the signal handler for clean termination of the process. - + /// Register the receiver mmdevice object with the ORB ACE_NEW_RETURN (this->mmdevice_, TAO_MMDevice (&this->reactive_strategy_), @@ -218,18 +218,18 @@ Receiver::init (int, this->mmdevice_; AVStreams::MMDevice_var mmdevice = - this->mmdevice_->_this (ACE_TRY_ENV); + this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); /// Bind to sender. this->connection_manager_.bind_to_sender (this->sender_name_, this->receiver_name_, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); /// Connect to the sender. - this->connection_manager_.connect_to_sender (ACE_TRY_ENV); + this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -275,20 +275,20 @@ Receiver::output_file_name (void) } void -Receiver::shut_down (CORBA::Environment &ACE_TRY_ENV) +Receiver::shut_down (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { AVStreams::MMDevice_var mmdevice_obj = - this->mmdevice_->_this (ACE_TRY_ENV); - + this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; this->connection_manager_.unbind_receiver (this->sender_name_, - this->receiver_name_, - mmdevice_obj.in ()); + this->receiver_name_, + mmdevice_obj.in ()); - this->connection_manager_.destroy (ACE_TRY_ENV); + this->connection_manager_.destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -297,46 +297,46 @@ Receiver::shut_down (CORBA::Environment &ACE_TRY_ENV) ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Receiver::unbind"); } ACE_ENDTRY; - + } int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { /// Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; /// Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Receiver receiver; @@ -362,20 +362,20 @@ main (int argc, result = receiver.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - while (!done) - { - orb->perform_work (ACE_TRY_ENV); - ACE_TRY_CHECK; - } + while (!done) + { + orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + } - receiver.shut_down (ACE_TRY_ENV); + receiver.shut_down (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::fclose (output_file); diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h index f193d072230..fe302b57523 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h @@ -30,7 +30,7 @@ class Signal_Handler : public ACE_Event_Handler // Useful to gracefully release the process public: - + Signal_Handler (void); int handle_signal(int signum, siginfo_t*,ucontext_t*); @@ -61,7 +61,7 @@ public: /// Accessor methods for the flowname of the callback. ACE_CString &flowname (void); void flowname (const ACE_CString &flowname); - + private: int frame_count_; /// Keeping a count of the incoming frames. @@ -81,9 +81,9 @@ public: /// Create a receiver application callback. int get_callback (const char *flowname, TAO_AV_Callback *&callback); - - virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec, - CORBA::Environment &); + + virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec + TAO_ENV_ARG_DECL_NOT_USED); /// Called when a distributor tries to connect to the receiver private: @@ -107,8 +107,8 @@ public: /// Destructor. int init (int argc, - char **argv, - CORBA::Environment &); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); /// Initialize data components. int parse_args (int argc, @@ -117,11 +117,11 @@ public: ACE_CString output_file_name (void); /// Name of the output file. - + ACE_CString sender_name (void); ACE_CString receiver_name (void); - void shut_down (CORBA::Environment &); + void shut_down (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); protected: Connection_Manager connection_manager_; diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp index 71588022d7c..833a089cae7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp @@ -25,12 +25,12 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*) if (signum == SIGINT) { if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - "In the signal handler\n")); - + ACE_DEBUG ((LM_DEBUG, + "In the signal handler\n")); + g_shutdown = 1; - - } + + } return 0; } @@ -40,7 +40,7 @@ Sender_Callback::flowname (void) return this->flowname_; } -void +void Sender_Callback::flowname (const ACE_CString &flowname) { this->flowname_ = flowname; @@ -51,11 +51,11 @@ int Sender_Callback::handle_destroy (void) { SENDER::instance ()->connection_manager ().protocol_objects ().unbind (this->flowname_.c_str ()); - + SENDER::instance ()->connection_manager ().streamctrls ().unbind (this->flowname_.c_str ()); SENDER::instance ()->connection_manager ().receivers ().unbind (this->flowname_.c_str ()); - + // SENDER::instance ()->remove_stream (); return 0; @@ -66,14 +66,14 @@ Sender_StreamEndPoint::get_callback (const char * flowname, TAO_AV_Callback *&callback) { //SENDER::instance ()->add_stream (); - + /// Create and return the client application callback and return to the AVStreams /// for further upcalls. callback = &this->callback_; ACE_CString flow_name (flowname); this->callback_.flowname (flow_name); - + return 0; } @@ -142,24 +142,24 @@ Sender::~Sender (void) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "Sender destructor\n")); + "Sender destructor\n")); } void -Sender::shut_down (CORBA::Environment &ACE_TRY_ENV) +Sender::shut_down (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (ACE_TRY_ENV); + this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + SENDER::instance ()->connection_manager ().unbind_sender (this->sender_name_, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - - SENDER::instance ()->connection_manager ().destroy (ACE_TRY_ENV); + + SENDER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -204,8 +204,8 @@ Sender::parse_args (int argc, int Sender::init (int argc, - char **argv, - CORBA::Environment& ACE_TRY_ENV) + char **argv + TAO_ENV_ARG_DECL) { /// Initialize the endpoint strategy with the orb and poa. int result = @@ -226,15 +226,15 @@ Sender::init (int argc, argv); if (result != 0) return result; - - ACE_Reactor *reactor = + + ACE_Reactor *reactor = TAO_AV_CORE::instance ()->reactor (); - + if (reactor->register_handler (SIGINT, - &this->signal_handler_) == -1) + &this->signal_handler_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "Error in handler register\n"), - -1); + "Error in handler register\n"), + -1); /// Register the signal handler for clean termination of the process. /// Open file to read. @@ -261,18 +261,18 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (ACE_TRY_ENV); + this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); /// Register the object reference with the Naming Service and bind to /// the receivers this->connection_manager_.bind_to_receivers (this->sender_name_, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); /// Connect to the receivers - this->connection_manager_.connect_to_receivers (ACE_TRY_ENV); + this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -280,7 +280,7 @@ Sender::init (int argc, /// Method to send data at the specified rate int -Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) +Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) { /// The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -304,16 +304,16 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) while (1) { - if (g_shutdown == 1) - { - ACE_DEBUG ((LM_DEBUG, - "Shut Down called\n")); + if (g_shutdown == 1) + { + ACE_DEBUG ((LM_DEBUG, + "Shut Down called\n")); - this->shut_down (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->shut_down (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; - break; - } + break; + } /// Read from the file into a message block. int n = ACE_OS::fread (this->mb_.wr_ptr (), @@ -329,16 +329,16 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) if (n == 0) { /// At end of file break the loop and end the sender. - if (TAO_debug_level > 0) + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n")); - this->shut_down (ACE_TRY_ENV); - ACE_TRY_CHECK; + this->shut_down (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + + break; - break; - } - + this->mb_.wr_ptr (n); if (this->frame_count_ > 1) @@ -374,9 +374,9 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) /// Run the orb for the wait time so the sender can /// continue other orb requests. - TAO_AV_CORE::instance ()->orb ()->run (wait_time, - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_AV_CORE::instance ()->orb ()->run (wait_time + TAO_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; } } @@ -450,51 +450,51 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ///Get the POA_var object from Object_var PortableServer::POA_var root_poa - = PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + = PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; /// Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Initialize the Client. int result = 0; result = SENDER::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, "client::init failed\n"), -1); - SENDER::instance ()->pace_data (ACE_TRY_ENV); + SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; orb->destroy (); diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h index 9e64e1ee716..a28a58fc69f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h @@ -30,7 +30,7 @@ class Signal_Handler : public ACE_Event_Handler // Useful to gracefully release the process public: - + Signal_Handler (void); int handle_signal(int signum, siginfo_t*,ucontext_t*); @@ -45,11 +45,11 @@ class Sender_Callback : public TAO_AV_Callback // Defines a class for the sender application callback. // // = DESCRIPTION - // This class overides the methods of the TAO_AV_Callback so the + // This class overides the methods of the TAO_AV_Callback so the // AVStreams can make upcalls to the application. public: - + int handle_destroy (void); /// Called when the sender has finished reading the file and wants /// to close down the connection. Also called when the distributer @@ -58,7 +58,7 @@ public: ACE_CString &flowname (void); void flowname (const ACE_CString &flowname); /// Accessor methods for the flowname of the callback - + private: ACE_CString flowname_; /// Flowname of the callback. @@ -109,14 +109,14 @@ public: ~Sender (void); /// Destructor - void shut_down (CORBA::Environment &); + void shut_down (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); int init (int argc, - char **argv, - CORBA::Environment&); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); /// Method to initialize the various data components. - int pace_data (CORBA::Environment &); + int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); /// Method to pace and send data from a file. Connection_Manager &connection_manager (void); @@ -152,10 +152,10 @@ private: Connection_Manager connection_manager_; /// Connection manager. - + // int stream_count_; /// Teh count of the number of streams that are active - + Signal_Handler signal_handler_; /// Reference to the signal handler. }; diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp index a64c2ff9856..ab852c5c2de 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp @@ -49,9 +49,9 @@ FTP_Client_Callback::handle_timeout (void *) { ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n")); AVStreams::flowSpec stop_spec (1); - CLIENT::instance ()->streamctrl ()->stop (stop_spec,ACE_TRY_ENV); + CLIENT::instance ()->streamctrl ()->stop (stop_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - //CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV); + //CLIENT::instance ()->streamctrl ()->destroy (stop_spec TAO_ENV_ARG_PARAMETER); TAO_AV_CORE::instance ()->orb ()->shutdown (0); ACE_TRY_CHECK; return 0; @@ -192,7 +192,7 @@ Client::Client (void) int Client::bind_to_server (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -207,13 +207,13 @@ Client::bind_to_server (void) server_mmdevice_name.length (1); server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice"); CORBA::Object_var server_mmdevice_obj = - my_naming_client_->resolve (server_mmdevice_name, - ACE_TRY_ENV); + my_naming_client_->resolve (server_mmdevice_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->server_mmdevice_ = - AVStreams::MMDevice::_narrow (server_mmdevice_obj.in (), - ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (server_mmdevice_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->server_mmdevice_.in ())) @@ -238,7 +238,7 @@ Client::init (int argc,char **argv) this->argv_ = argv; CORBA::String_var ior; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -261,12 +261,12 @@ Client::init (int argc,char **argv) "Data"); this->fdev_->flowname (this->flowname ()); - AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (ACE_TRY_ENV); + AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - AVStreams::FDev_var fdev = this->fdev_->_this (ACE_TRY_ENV); + AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mmdevice->add_fdev (fdev.in (), - ACE_TRY_ENV); + mmdevice->add_fdev (fdev.in () + TAO_ENV_ARG_PARAMETER); if (this->my_naming_client_.init (this->orb_.in ()) != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -299,7 +299,7 @@ Client::init (int argc,char **argv) int Client::run (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { char flow_protocol_str [BUFSIZ]; @@ -324,16 +324,16 @@ Client::run (void) timer.start (); AVStreams::MMDevice_var client_mmdevice - = this->client_mmdevice_._this (ACE_TRY_ENV); + = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + // Bind the client and server mmdevices. CORBA::Boolean result = this->streamctrl_.bind_devs (client_mmdevice.in (), this->server_mmdevice_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); timer.stop (); timer.elapsed_time (elapsed); elapsed.dump (); @@ -341,12 +341,12 @@ Client::run (void) if (result == 0) ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs failed\n"),-1); AVStreams::flowSpec start_spec (1); - this->streamctrl_.start (start_spec,ACE_TRY_ENV); + this->streamctrl_.start (start_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Schedule a timer for the for the flow handler. ACE_Time_Value tv (10000,0); - this->orb_->run (tv, ACE_TRY_ENV); + this->orb_->run (tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); @@ -366,21 +366,21 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ()); TAO_AV_CORE::instance ()->init (orb.in (), - poa.in (), - ACE_TRY_ENV); + poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -390,10 +390,10 @@ main (int argc, ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1); result = CLIENT::instance ()->run (); - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result < 0) diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp index d396833b908..aac3bf6209c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp @@ -10,11 +10,11 @@ FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void) protocols [0] = CORBA::string_dup ("TCP"); protocols [1] = CORBA::string_dup ("UDP"); protocols [2] = CORBA::string_dup ("RTP/UDP"); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - this->set_protocol_restriction (protocols, - ACE_TRY_ENV); + this->set_protocol_restriction (protocols + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -103,7 +103,7 @@ int Server::init (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { PortableServer::POAManager_var mgr @@ -133,10 +133,10 @@ Server::init (int argc, this->fdev_->flowname ("Data"); - AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_TRY_ENV); + AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - AVStreams::FDev_var fdev = this->fdev_->_this (ACE_TRY_ENV); + AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (fdev.in ())) @@ -145,7 +145,7 @@ Server::init (int argc, if (CORBA::is_nil (mmdevice.in ())) cout << "MMDevice is nil" << endl; - mmdevice->add_fdev (fdev.in (), ACE_TRY_ENV); + mmdevice->add_fdev (fdev.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register the mmdevice with the naming service. @@ -155,8 +155,8 @@ Server::init (int argc, // Register the video control object with the naming server. this->my_naming_client_->rebind (server_mmdevice_name, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -172,10 +172,10 @@ Server::init (int argc, int Server::run (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -226,22 +226,22 @@ main (int argc, char **argv) { int result = 0; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ()); TAO_AV_CORE::instance ()->init (orb.in (), - poa.in (), - ACE_TRY_ENV); + poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp index fcfa07ea215..6f7c7af972f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp @@ -85,7 +85,7 @@ int main (int argc, char *argv[]) argv); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa @@ -97,8 +97,8 @@ int main (int argc, char *argv[]) mgr->activate (); TAO_AV_CORE::instance ()->init (orb.in (), - poa.in (), - ACE_TRY_ENV); + poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Connect the two streams and run them... @@ -128,19 +128,19 @@ int main (int argc, char *argv[]) TAO_StreamCtrl stream_control_impl; AVStreams::StreamCtrl_var stream_control = - stream_control_impl._this (ACE_TRY_ENV); + stream_control_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - obj = orb->string_to_object (ping_ior, ACE_TRY_ENV); + obj = orb->string_to_object (ping_ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::MMDevice_var ping_sender = - AVStreams::MMDevice::_narrow (obj.in (), ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - obj = orb->string_to_object (pong_ior, ACE_TRY_ENV); + obj = orb->string_to_object (pong_ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::MMDevice_var pong_sender = - AVStreams::MMDevice::_narrow (obj.in (), ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::streamQoS_var the_qos = @@ -149,29 +149,29 @@ int main (int argc, char *argv[]) stream_control->bind_devs (pong_sender.in (), ping_sender.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; flow_spec.length (0); - stream_control->start (flow_spec, ACE_TRY_ENV); + stream_control->start (flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (100, 0); - orb->run (tv, ACE_TRY_ENV); + orb->run (tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); // flow_spec.length (0); - // stream_control->stop (flow_spec, ACE_TRY_ENV); + // stream_control->stop (flow_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Catched exception:"); + "Caught exception:"); return 1; } ACE_ENDTRY; diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp index 98d415865df..3a061df9629 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp @@ -101,7 +101,7 @@ int main (int argc, char *argv[]) argv); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa @@ -113,8 +113,8 @@ int main (int argc, char *argv[]) mgr->activate (); TAO_AV_CORE::instance ()->init (orb.in (), - poa.in (), - ACE_TRY_ENV); + poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register the video mmdevice object with the ORB @@ -129,11 +129,11 @@ int main (int argc, char *argv[]) 1); AVStreams::MMDevice_var mmdevice = - mmdevice_impl->_this (ACE_TRY_ENV); + mmdevice_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (mmdevice.in (), ACE_TRY_ENV); + orb->object_to_string (mmdevice.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -161,18 +161,18 @@ int main (int argc, char *argv[]) 1); AVStreams::FDev_var ping_fdev = - ping_fdev_impl->_this (ACE_TRY_ENV); + ping_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::FDev_var pong_fdev = - pong_fdev_impl->_this (ACE_TRY_ENV); + pong_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mmdevice->add_fdev (ping_fdev.in (), ACE_TRY_ENV); + mmdevice->add_fdev (ping_fdev.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (respond == 1) { - mmdevice->add_fdev (pong_fdev.in (), ACE_TRY_ENV); + mmdevice->add_fdev (pong_fdev.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -190,7 +190,7 @@ int main (int argc, char *argv[]) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Catched exception:"); + "Caught exception:"); return 1; } ACE_ENDTRY; diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index bd50c1f2842..2ab4114cd1e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp @@ -118,7 +118,7 @@ int main (int argc, char *argv[]) argv); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa @@ -130,8 +130,8 @@ int main (int argc, char *argv[]) mgr->activate (); TAO_AV_CORE::instance ()->init (orb.in (), - poa.in (), - ACE_TRY_ENV); + poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Reactive_Strategy *reactive_strategy; @@ -145,11 +145,11 @@ int main (int argc, char *argv[]) 1); AVStreams::MMDevice_var mmdevice = - mmdevice_impl->_this (ACE_TRY_ENV); + mmdevice_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (mmdevice.in (), ACE_TRY_ENV); + orb->object_to_string (mmdevice.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -177,17 +177,17 @@ int main (int argc, char *argv[]) 1); AVStreams::FDev_var ping_fdev = - ping_fdev_impl->_this (ACE_TRY_ENV); + ping_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::FDev_var pong_fdev = - pong_fdev_impl->_this (ACE_TRY_ENV); + pong_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mmdevice->add_fdev (ping_fdev.in (), ACE_TRY_ENV); + mmdevice->add_fdev (ping_fdev.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (respond == 1) { - mmdevice->add_fdev (pong_fdev.in (), ACE_TRY_ENV); + mmdevice->add_fdev (pong_fdev.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -208,7 +208,7 @@ int main (int argc, char *argv[]) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Catched exception:"); + "Caught exception:"); return 1; } ACE_ENDTRY; diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp index 6210c289a7b..027a15f2ee3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp @@ -1,4 +1,4 @@ -// $Id$ +// $Id$ #include "receiver.h" #include "ace/Get_Opt.h" @@ -25,13 +25,13 @@ Receiver_StreamEndPoint::get_callback (const char *, ACE_TRY_NEW_ENV { CORBA::Any_ptr streamctrl_any = - this->get_property_value ("Related_StreamCtrl", - ACE_TRY_ENV); + this->get_property_value ("Related_StreamCtrl" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + AVStreams::StreamCtrl_ptr streamctrl; *streamctrl_any >>= streamctrl; - + // Store the stream control for the stream with the callback. this->callback_.streamctrl (streamctrl); } @@ -39,11 +39,11 @@ Receiver_StreamEndPoint::get_callback (const char *, { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Sender_StreamEndPoint::get_callback failed"); - + return -1; } ACE_ENDTRY; - + return 0; } @@ -73,7 +73,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, ACE_DEBUG ((LM_DEBUG, "Receiver_Callback::receive_frame for frame %d\n", ++this->frame_count_)); - + if (this->streamctrl_ != 0) { @@ -86,27 +86,27 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, "", "", 0); - + AVStreams::flowSpec flow_spec (1); flow_spec.length (1); flow_spec [0] = CORBA::string_dup (entry.entry_to_string ()); - - // Initialize the qos parameter(s) that need to be changed + + // Initialize the qos parameter(s) that need to be changed // with the corresponding value. AVStreams::streamQoS qos; qos.length (1); - + // The QoS Type that needs to be changed. qos [0].QoSType = CORBA::string_dup ("video_qos"); - + qos [0].QoSParams.length (1); qos [0].QoSParams [0].property_name = CORBA::string_dup ("video_frame_rate"); qos [0].QoSParams [0].property_value <<= (CORBA::Short) 30; ACE_DECLARE_NEW_CORBA_ENV; - + // Initiate the modifying of the qos for the flows. - this->streamctrl_->modify_QoS (qos, flow_spec, ACE_TRY_ENV); + this->streamctrl_->modify_QoS (qos, flow_spec TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, @@ -115,7 +115,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, } else ACE_DEBUG ((LM_DEBUG, "No Stream Ctrl\n")); - + while (frame != 0) { // Write the received data to the file. @@ -145,8 +145,8 @@ Receiver_Callback::handle_destroy (void) ACE_TRY_NEW_ENV { - TAO_AV_CORE::instance ()->orb ()->shutdown (0, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->shutdown (0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -174,8 +174,8 @@ Receiver::~Receiver (void) int Receiver::init (int, - char **, - CORBA::Environment &ACE_TRY_ENV) + char ** + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -194,7 +194,7 @@ Receiver::init (int, this->mmdevice_; CORBA::Object_var mmdevice = - this->mmdevice_->_this (ACE_TRY_ENV); + this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the mmdevice with the naming service. @@ -212,8 +212,8 @@ Receiver::init (int, // Register the receiver object with the naming server. this->naming_client_->rebind (name, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -250,39 +250,39 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -308,20 +308,20 @@ main (int argc, Receiver receiver; result = receiver.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Hack for now.... ACE_OS::sleep (1); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h index 9fba843cfa1..11e76614d32 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h @@ -6,7 +6,7 @@ * @file receiver.h * * receiver.h,v 1.1 2001/04/15 02:56:26 yamuna Exp - * + * * @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu> */ //============================================================================= @@ -36,14 +36,14 @@ public: /// Set the related stream control for this flow. void streamctrl (AVStreams::StreamCtrl_ptr streamctrl); - + private: int frame_count_; /// Keeping a count of the incoming frames. - + /// Related stream control. AVStreams::StreamCtrl_ptr streamctrl_; - + }; // = AVStreams calls this class during connection setup. @@ -54,7 +54,7 @@ public: /// Create a receiver application callback. int get_callback (const char *flowname, TAO_AV_Callback *&callback); - + private: Receiver_Callback callback_; /// Receiver application callback. @@ -71,11 +71,11 @@ public: /// Destructor. int init (int argc, - char **argv, - CORBA::Environment &); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); /// Initialize data components. - - + + protected: TAO_Naming_Client naming_client_; /// The Naming Service Client. diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index 3a73cc54205..b06449a23e8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -33,15 +33,15 @@ Sender_StreamEndPoint::set_protocol_object (const char *, CORBA::Boolean Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &/* the_flows */, - CORBA::Environment &/* ACE_TRY_ENV */) + const AVStreams::flowSpec &/* the_flows */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed )) { ACE_DEBUG ((LM_DEBUG, "Sender_StreamEndPoint::modify_QoS\n")); - + // Check if the qos for the flow has changed. if (new_qos.length () != 0) { @@ -53,10 +53,10 @@ Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, // Get the new value of the frame rate. CORBA::Any frame_rate_any = new_qos [0].QoSParams [0].property_value; - + CORBA::Short frame_rate; frame_rate_any >>= frame_rate; - + // Calculate the new inter frame time. inter_frame_time.set (1 / (double) frame_rate); } @@ -119,7 +119,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) +Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -128,13 +128,13 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) // Resolve the receiver object reference from the Naming Service CORBA::Object_var receiver_mmdevice_obj = - this->naming_client_->resolve (name, - ACE_TRY_ENV); + this->naming_client_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->receiver_mmdevice_ = - AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in (), - ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->receiver_mmdevice_.in ())) @@ -147,8 +147,8 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) int Sender::init (int argc, - char **argv, - CORBA::Environment &ACE_TRY_ENV) + char **argv + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -185,9 +185,9 @@ Sender::init (int argc, "File opened successfully\n")); // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (ACE_TRY_ENV); + result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - + if (result != 0) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), @@ -219,7 +219,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (ACE_TRY_ENV); + this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->streamctrl_, @@ -234,8 +234,8 @@ Sender::init (int argc, this->streamctrl_->bind_devs (mmdevice.in (), this->receiver_mmdevice_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (bind_result == 0) @@ -248,7 +248,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) +Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) { @@ -324,8 +324,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // Run the orb for the wait time so the sender can // continue other orb requests. - TAO_AV_CORE::instance ()->orb ()->run (wait_time, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->run (wait_time + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -354,13 +354,11 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; - this->streamctrl_->destroy (stop_spec, - ACE_TRY_ENV); + this->streamctrl_->destroy (stop_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + // Shut the orb down. - TAO_AV_CORE::instance ()->orb ()->shutdown (1, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->shutdown (1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -377,44 +375,44 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa - = PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + = PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) @@ -423,7 +421,7 @@ main (int argc, -1); // Start sending data. - result = SENDER::instance ()->pace_data (ACE_TRY_ENV); + result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h index 9f3b47cd9a8..21ea6e49778 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h @@ -5,7 +5,7 @@ * @file sender.h * * $Id$ - * + * * @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu> */ //============================================================================= @@ -28,13 +28,13 @@ class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint TAO_AV_Protocol_Object *object); /// Set protocol object corresponding to the transport protocol /// chosen. - + CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &flow_spec, - CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC((CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed )); + const AVStreams::flowSpec &flow_spec + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC((CORBA::SystemException, + AVStreams::noSuchFlow, + AVStreams::QoSRequestFailed )); /// The over-ridden modify_qos method to change the qos of the /// flows specified in the flow spec to that in the new_qos. @@ -64,11 +64,11 @@ public: /// Constructor int init (int argc, - char **argv, - CORBA::Environment&); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); /// Method to initialize the various data components. - int pace_data (CORBA::Environment &); + int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); /// Method to pace and send data from a file. void protocol_object (TAO_AV_Protocol_Object *protocol_object); @@ -78,7 +78,7 @@ private: int parse_args (int argc, char **argv); /// Method to parse the command line arguments. - int bind_to_receiver (CORBA::Environment& ACE_TRY_ENV); + int bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL); /// Method that binds the sender to the receiver. SENDER_ENDPOINT_STRATEGY endpoint_strategy_; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp index 2d8f75ff7a7..0161ba2d659 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -53,10 +53,10 @@ FTP_Client_Callback::handle_timeout (void *) { ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n")); AVStreams::flowSpec stop_spec (1); - //ACE_DECLARE_NEW_CORBA_ENV; - CLIENT::instance ()->streamctrl ()->stop (stop_spec,ACE_TRY_ENV); + //TAO_ENV_DECLARE_NEW_ENV; + CLIENT::instance ()->streamctrl ()->stop (stop_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; -// CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV); +// CLIENT::instance ()->streamctrl ()->destroy (stop_spec TAO_ENV_ARG_PARAMETER); // ACE_TRY_CHECK; TAO_AV_CORE::instance ()->orb ()->shutdown (0); ACE_TRY_CHECK; @@ -186,7 +186,7 @@ Client::Client (void) int Client::bind_to_server (const char *name) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -195,13 +195,13 @@ Client::bind_to_server (const char *name) server_mmdevice_name.length (1); server_mmdevice_name [0].id = name; CORBA::Object_var server_mmdevice_obj = - my_naming_client_->resolve (server_mmdevice_name, - ACE_TRY_ENV); + my_naming_client_->resolve (server_mmdevice_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->server_mmdevice_ = - AVStreams::MMDevice::_narrow (server_mmdevice_obj.in (), - ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (server_mmdevice_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->server_mmdevice_.in ())) @@ -252,7 +252,7 @@ Client::init (int argc,char **argv) int Client::run (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { char flow_protocol_str [BUFSIZ]; @@ -280,16 +280,16 @@ Client::run (void) flow_spec [0] = entry.entry_to_string (); flow_spec.length (1); - AVStreams::MMDevice_var client_mmdevice - = this->client_mmdevice_._this (ACE_TRY_ENV); + AVStreams::MMDevice_var client_mmdevice + = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean result = this->streamctrl_.bind_devs (client_mmdevice.in (), AVStreams::MMDevice::_nil (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->bind_to_server ("Server_MMDevice1") == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -298,8 +298,8 @@ Client::run (void) result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (), this->server_mmdevice_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->bind_to_server ("Server_MMDevice2") == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -308,8 +308,8 @@ Client::run (void) result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (), this->server_mmdevice_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == 0) @@ -317,13 +317,13 @@ Client::run (void) AVStreams::flowSpec start_spec (1); start_spec.length (1); start_spec [0] = CORBA::string_dup (this->flowname_); - this->streamctrl_.start (start_spec,ACE_TRY_ENV); + this->streamctrl_.start (start_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Schedule a timer for the for the flow handler. //TAO_AV_CORE::instance ()->run (); ACE_Time_Value tv (10000,0); - TAO_AV_CORE::instance ()->orb ()->run (tv, ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->run (tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); @@ -344,21 +344,21 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ()); TAO_AV_CORE::instance ()->init (orb.in (), - poa.in (), - ACE_TRY_ENV); + poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = 0; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp index 4c5f0ec212d..4fa4582f4b2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp @@ -65,7 +65,7 @@ int Server::init (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -94,23 +94,23 @@ Server::init (int argc, CosNaming::Name server_mmdevice_name (1); server_mmdevice_name.length (1); server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice1"); - AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_TRY_ENV); + AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_TRY_EX (bind) { // Register the video control object with the naming server. this->my_naming_client_->bind (server_mmdevice_name, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (bind); } ACE_CATCH (CosNaming::NamingContext::AlreadyBound,al_ex) { server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice2"); this->my_naming_client_->bind (server_mmdevice_name, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -129,10 +129,10 @@ Server::init (int argc, int Server::run (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - TAO_AV_CORE::instance ()->orb ()->run (ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -186,20 +186,20 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ()); TAO_AV_CORE::instance ()->init (orb.in (), - poa.in (), - ACE_TRY_ENV); + poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp index 50247d880d6..d624906a378 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp @@ -48,10 +48,10 @@ FTP_Client_Callback::handle_timeout (void *) { ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n")); AVStreams::flowSpec stop_spec (1); - //ACE_DECLARE_NEW_CORBA_ENV; - CLIENT::instance ()->streamctrl ()->stop (stop_spec,ACE_TRY_ENV); + //TAO_ENV_DECLARE_NEW_ENV; + CLIENT::instance ()->streamctrl ()->stop (stop_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - // CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV); + // CLIENT::instance ()->streamctrl ()->destroy (stop_spec TAO_ENV_ARG_PARAMETER); //ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Just before Orb Shutdown\n")); TAO_AV_CORE::instance ()->orb ()->shutdown (0); @@ -196,7 +196,7 @@ Client::Client (void) int Client::bind_to_server (const char *name) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -211,13 +211,13 @@ Client::bind_to_server (const char *name) server_mmdevice_name.length (1); server_mmdevice_name [0].id = name; CORBA::Object_var server_mmdevice_obj = - my_naming_client_->resolve (server_mmdevice_name, - ACE_TRY_ENV); + my_naming_client_->resolve (server_mmdevice_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->server_mmdevice_ = - AVStreams::MMDevice::_narrow (server_mmdevice_obj.in (), - ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (server_mmdevice_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->server_mmdevice_.in ())) @@ -241,7 +241,7 @@ Client::init (int argc,char **argv) this->argc_ = argc; this->argv_ = argv; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { PortableServer::POAManager_var mgr @@ -263,12 +263,12 @@ Client::init (int argc,char **argv) ACE_OS::sprintf (this->flowname_, "Data"); this->fdev_->flowname (this->flowname ()); - AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (ACE_TRY_ENV); + AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - AVStreams::FDev_var fdev = this->fdev_->_this (ACE_TRY_ENV); + AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mmdevice->add_fdev (fdev.in (), - ACE_TRY_ENV); + mmdevice->add_fdev (fdev.in () + TAO_ENV_ARG_PARAMETER); if (this->my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -295,7 +295,7 @@ Client::init (int argc,char **argv) int Client::run (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { char flow_protocol_str [BUFSIZ]; @@ -316,17 +316,17 @@ Client::run (void) &addr); flow_spec [0] = CORBA::string_dup (entry.entry_to_string ()); flow_spec.length (1); - + AVStreams::MMDevice_var client_mmdevice = - this->client_mmdevice_._this (ACE_TRY_ENV); + this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean result = this->streamctrl_.bind_devs (client_mmdevice.in (), AVStreams::MMDevice::_nil (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Suuceessful ONE\n")); if (result == 0) @@ -338,8 +338,8 @@ Client::run (void) result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (), this->server_mmdevice_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Suuceessful TWO\n")); @@ -354,8 +354,8 @@ Client::run (void) result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (), this->server_mmdevice_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Suuceessful THREE\n")); if (result == 0) @@ -363,13 +363,13 @@ Client::run (void) AVStreams::flowSpec start_spec (1); start_spec.length (1); start_spec [0] = CORBA::string_dup (this->flowname_); - this->streamctrl_.start (start_spec,ACE_TRY_ENV); + this->streamctrl_.start (start_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Schedule a timer for the for the flow handler. //TAO_AV_CORE::instance ()->run (); ACE_Time_Value tv (10000,0); - TAO_AV_CORE::instance ()->orb ()->run (tv, ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->run (tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); @@ -394,20 +394,20 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ()); TAO_AV_CORE::instance ()->init (orb.in (), - poa.in (), - ACE_TRY_ENV); + poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp index c639a4897f8..5c1275ac3bd 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp @@ -9,11 +9,11 @@ FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void) protocols.length (2); protocols [0] = CORBA::string_dup ("TCP"); protocols [1] = CORBA::string_dup ("UDP"); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - this->set_protocol_restriction (protocols, - ACE_TRY_ENV); + this->set_protocol_restriction (protocols + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -82,14 +82,14 @@ FTP_Server_Callback::handle_end_stream (void) // AVStreams::QoS & the_qos, // CORBA::Boolean_out met_qos, // char *& named_fdev, -// CORBA::Environment &ACE_TRY_ENV) +// TAO_ENV_SINGLE_ARG_DECL) // { // ACE_DEBUG ((LM_DEBUG,"FTP_Server_FDev::make_consumer")); // FTP_Server_FlowEndPoint *endpoint; // ACE_NEW_RETURN (endpoint, // FTP_Server_FlowEndPoint, // 0); -// return endpoint->_this (ACE_TRY_ENV); +// return endpoint->_this (TAO_ENV_SINGLE_ARG_PARAMETER); // ACE_CHECK_RETURN (0); // } @@ -119,7 +119,7 @@ int Server::init (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -148,12 +148,12 @@ Server::init (int argc, FTP_Server_FDev, -1); this->fdev_->flowname ("Data"); - AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_TRY_ENV); + AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - AVStreams::FDev_var fdev = this->fdev_->_this (ACE_TRY_ENV); + AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mmdevice->add_fdev (fdev.in (), - ACE_TRY_ENV); + mmdevice->add_fdev (fdev.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register the mmdevice with the naming service. @@ -164,16 +164,16 @@ Server::init (int argc, { // Register the video control object with the naming server. this->my_naming_client_->bind (server_mmdevice_name, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (bind); } ACE_CATCH (CosNaming::NamingContext::AlreadyBound,al_ex) { server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice2"); this->my_naming_client_->bind (server_mmdevice_name, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -192,10 +192,10 @@ Server::init (int argc, int Server::run (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - TAO_AV_CORE::instance ()->orb ()->run (ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -249,20 +249,20 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ()); TAO_AV_CORE::instance ()->init (orb.in (), - poa.in (), - ACE_TRY_ENV); + poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h index 74c5b78db9f..7faf6c5e555 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h @@ -39,7 +39,7 @@ public: // AVStreams::QoS & the_qos, // CORBA::Boolean_out met_qos, // char *& named_fdev, -// CORBA::Environment &env = CORBA::Environment::default_environment ()); +// TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // // bridge method for the application to override the consumer object // // creation. Default implementation creates a TAO_FlowConsumer. diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp index 4106f1c5e07..2219157b301 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp @@ -15,9 +15,9 @@ Receiver_StreamEndPoint::get_callback (const char *flow_name, { Receiver_Callback *callback_; ACE_NEW_RETURN (callback_, - Receiver_Callback, - -1); - + Receiver_Callback, + -1); + // Return the receiver application callback to the AVStreams for // future upcalls. callback = callback_; @@ -28,7 +28,7 @@ Receiver_StreamEndPoint::get_callback (const char *flow_name, int Receiver_StreamEndPoint::set_protocol_object (const char * flowname, - TAO_AV_Protocol_Object *object) + TAO_AV_Protocol_Object *object) { // Set the sender protocol object corresponding to the transport // protocol selected. @@ -42,28 +42,28 @@ Receiver_Callback::Receiver_Callback (void) mb_ (BUFSIZ) { ACE_DEBUG ((LM_DEBUG, - "Receiver_Callback::Receiver_Callback\n")); + "Receiver_Callback::Receiver_Callback\n")); } void Receiver_Callback::flowname (const char* flow_name) { this->flowname_ = flow_name; - + // Make sure we have a valid <output_file> this->output_file_ = ACE_OS::fopen (this->flowname_.c_str (), - "w"); + "w"); if (this->output_file_ == 0) ACE_ERROR ((LM_DEBUG, - "Cannot open output file %s\n", - this->flowname_.c_str ())); - + "Cannot open output file %s\n", + this->flowname_.c_str ())); + else ACE_DEBUG ((LM_DEBUG, - "%s File Opened Successfully\n", - this->flowname_.c_str ())); - - + "%s File Opened Successfully\n", + this->flowname_.c_str ())); + + } int @@ -78,7 +78,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, ACE_DEBUG ((LM_DEBUG, "Receiver_Callback::receive_frame for frame %d for flow %s\n", this->frame_count_++, - this->flowname_.c_str ())); + this->flowname_.c_str ())); while (frame != 0) { @@ -96,7 +96,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, frame = frame->cont (); } - + return 0; } @@ -135,7 +135,7 @@ Receiver::protocol_object (TAO_AV_Protocol_Object *object) int Receiver::parse_args (int argc, - char **argv) + char **argv) { // Parse command line arguments ACE_Get_Opt opts (argc, argv, "f:r:d"); @@ -164,8 +164,8 @@ Receiver::parse_args (int argc, int Receiver::init (int argc, - char ** argv, - CORBA::Environment &ACE_TRY_ENV) + char ** argv + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -180,7 +180,7 @@ Receiver::init (int argc, argv); if (result != 0) return result; - + // Register the receiver mmdevice object with the ORB ACE_NEW_RETURN (this->mmdevice_, @@ -192,7 +192,7 @@ Receiver::init (int argc, this->mmdevice_; CORBA::Object_var mmdevice = - this->mmdevice_->_this (ACE_TRY_ENV); + this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the mmdevice with the naming service. @@ -210,8 +210,8 @@ Receiver::init (int argc, // Register the receiver object with the naming server. this->naming_client_->rebind (name, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -234,53 +234,53 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = RECEIVER::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (result != 0) return result; - + while (endstream != 2) - { - orb->perform_work (ACE_TRY_ENV); - ACE_TRY_CHECK; - } + { + orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + } // Hack for now.... ACE_OS::sleep (1); - - orb->destroy (ACE_TRY_ENV); + + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h index 45d6b6586a4..b15d676d68f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h @@ -47,11 +47,11 @@ public: int handle_destroy (void); void flowname (const char*); - + private: int frame_count_; // Keeping a count of the incoming frames. - + ACE_Message_Block mb_; // Message block into which data is read from a file and then sent. @@ -96,8 +96,8 @@ public: // Destructor. int init (int argc, - char **argv, - CORBA::Environment &); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Initialize data components. void protocol_object (TAO_AV_Protocol_Object *protocol_object); @@ -128,7 +128,7 @@ protected: ACE_CString filename_; // File from which data is read. - + int parse_args (int argc, char **argv); // Method to parse the command line arguments. diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl index 3f07d66d5c9..6d63232651b 100755 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl @@ -28,7 +28,7 @@ $NS->Spawn (); if (PerlACE::waitforfile_timed ($nsior, 5) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp index fbdb0919dbb..52d9ea10836 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp @@ -55,15 +55,15 @@ Sender::shutdown (void) ACE_DECLARE_NEW_CORBA_ENV; // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; - this->streamctrl_->destroy (stop_spec, - ACE_TRY_ENV); + this->streamctrl_->destroy (stop_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + // Shut the orb down. - TAO_AV_CORE::instance ()->orb ()->shutdown (0, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->shutdown (0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + } int @@ -100,7 +100,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) +Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -109,13 +109,13 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) // Resolve the receiver object reference from the Naming Service CORBA::Object_var receiver_mmdevice_obj = - this->naming_client_->resolve (name, - ACE_TRY_ENV); + this->naming_client_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->receiver_mmdevice_ = - AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in (), - ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->receiver_mmdevice_.in ())) @@ -128,8 +128,8 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) int Sender::init (int argc, - char **argv, - CORBA::Environment &ACE_TRY_ENV) + char **argv + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -166,9 +166,9 @@ Sender::init (int argc, "File opened successfully\n")); // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (ACE_TRY_ENV); + result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - + if (result != 0) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), @@ -210,7 +210,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (ACE_TRY_ENV); + this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->streamctrl_, @@ -225,8 +225,8 @@ Sender::init (int argc, this->streamctrl_->bind_devs (mmdevice.in (), this->receiver_mmdevice_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (bind_result == 0) @@ -239,7 +239,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) +Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -316,8 +316,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // Run the orb for the wait time so the sender can // continue other orb requests. - TAO_AV_CORE::instance ()->orb ()->run (wait_time, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->run (wait_time + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -325,31 +325,31 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // Start timer before sending the frame. elapsed_timer.start (); - ProtocolObject_SetItor end = this->protocol_object_.end (); - for (ProtocolObject_SetItor begin = this->protocol_object_.begin (); - begin != end; ++begin) - { - // Send frame. - int result = - (*begin)->send_frame (&this->mb_); - - if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, - "send failed:%p", - "Sender::pace_data send\n"), - -1); - } - - + ProtocolObject_SetItor end = this->protocol_object_.end (); + for (ProtocolObject_SetItor begin = this->protocol_object_.begin (); + begin != end; ++begin) + { + // Send frame. + int result = + (*begin)->send_frame (&this->mb_); + + if (result < 0) + ACE_ERROR_RETURN ((LM_ERROR, + "send failed:%p", + "Sender::pace_data send\n"), + -1); + } + + ACE_DEBUG ((LM_DEBUG, "Sender::pace_data frame %d was sent succesfully\n", ++this->frame_count_)); - + // Reset the message block. this->mb_.reset (); - + } // end while - + this->shutdown (); } ACE_CATCHANY @@ -372,38 +372,38 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa - = PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + = PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) @@ -412,7 +412,7 @@ main (int argc, -1); // Start sending data. - result = SENDER::instance ()->pace_data (ACE_TRY_ENV); + result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h index a95d6827065..50e1c1fb481 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h @@ -65,11 +65,11 @@ public: // Constructor int init (int argc, - char **argv, - CORBA::Environment&); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Method to initialize the various data components. - int pace_data (CORBA::Environment &); + int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Method to pace and send data from a file. void protocol_object (TAO_AV_Protocol_Object *protocol_object); @@ -81,7 +81,7 @@ private: int parse_args (int argc, char **argv); // Method to parse the command line arguments. - int bind_to_receiver (CORBA::Environment& ACE_TRY_ENV); + int bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL); // Method that binds the sender to the receiver. SENDER_ENDPOINT_STRATEGY endpoint_strategy_; @@ -119,5 +119,5 @@ private: ProtocolObject_Set protocol_object_; // Protocol object corresponding to the transport protocol selected. - + }; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp index 354ea8d2b3a..969f9c8d451 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp @@ -79,9 +79,9 @@ Client::parse_args (int argc, case 'p': this->protocol_ = ACE_OS::strdup (opts.optarg); break; - case 'r': - this->frame_rate_ = ACE_OS::atoi (opts.optarg); - break; + case 'r': + this->frame_rate_ = ACE_OS::atoi (opts.optarg); + break; case 's': this->use_sfp_ = 1; break; @@ -124,14 +124,14 @@ Client::frame_rate (void) // Method to get the object reference of the server int -Client::bind_to_server (CORBA::Environment &ACE_TRY_ENV) +Client::bind_to_server (TAO_ENV_SINGLE_ARG_DECL) { // Initialize the naming services if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0) ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize " - "the TAO_Naming_Client. \n"), - -1); + " (%P|%t) Unable to initialize " + "the TAO_Naming_Client. \n"), + -1); CosNaming::Name server_mmdevice_name (1); server_mmdevice_name.length (1); @@ -139,27 +139,27 @@ Client::bind_to_server (CORBA::Environment &ACE_TRY_ENV) // Resolve the server object reference from the Naming Service CORBA::Object_var server_mmdevice_obj = - my_naming_client_->resolve (server_mmdevice_name, - ACE_TRY_ENV); + my_naming_client_->resolve (server_mmdevice_name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->server_mmdevice_ = - AVStreams::MMDevice::_narrow (server_mmdevice_obj.in (), - ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (server_mmdevice_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->server_mmdevice_.in ())) ACE_ERROR_RETURN ((LM_ERROR, - "Could not resolve Server_MMdevice in Naming service <%s>\n"), - -1); + "Could not resolve Server_MMdevice in Naming service <%s>\n"), + -1); return 0; } int Client::init (int argc, - char **argv, - CORBA::Environment& ACE_TRY_ENV) + char **argv + TAO_ENV_ARG_DECL) { this->argc_ = argc; this->argv_ = argv; @@ -179,15 +179,15 @@ Client::init (int argc, // Open file to read. this->fp_ = ACE_OS::fopen (this->filename_, - "r"); + "r"); if (this->fp_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, - "Cannot open output file %s\n", - this->filename_), - -1); + "Cannot open output file %s\n", + this->filename_), + -1); - result - = this->bind_to_server (ACE_TRY_ENV); + result + = this->bind_to_server (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Resolve the object reference of the server from the Naming Service. @@ -195,15 +195,15 @@ Client::init (int argc, ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), -1); - + // Create the Flow protocol name char flow_protocol_str [BUFSIZ]; if (this->use_sfp_) ACE_OS::strcpy (flow_protocol_str, - "sfp:1.0"); + "sfp:1.0"); else ACE_OS::strcpy (flow_protocol_str, - ""); + ""); // Initialize the QoS AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS); @@ -213,36 +213,36 @@ Client::init (int argc, // Initialize the flowname ACE_NEW_RETURN (this->flowname_, - char [BUFSIZ], - 0); + char [BUFSIZ], + 0); ACE_OS::sprintf (this->flowname_, - "Data_%s", - this->protocol_); + "Data_%s", + this->protocol_); // Create the forward flow specification to describe the flow. TAO_Forward_FlowSpec_Entry entry (this->flowname_, - "IN", - "USER_DEFINED", - flow_protocol_str, - this->protocol_, - &addr); + "IN", + "USER_DEFINED", + flow_protocol_str, + this->protocol_, + &addr); AVStreams::flowSpec flow_spec (1); flow_spec [0] = CORBA::string_dup (entry.entry_to_string ()); flow_spec.length (1); - AVStreams::MMDevice_var client_mmdevice = - this->client_mmdevice_._this (ACE_TRY_ENV); + AVStreams::MMDevice_var client_mmdevice = + this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Bind/Connect the client and server MMDevices. CORBA::Boolean bind_result = this->streamctrl_.bind_devs (client_mmdevice.in (), - this->server_mmdevice_.in (), - the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + this->server_mmdevice_.in (), + the_qos.inout (), + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (bind_result == 0) @@ -253,7 +253,7 @@ Client::init (int argc, // Method to send data at the specified rate int -Client::pace_data (CORBA::Environment& ACE_TRY_ENV) +Client::pace_data (TAO_ENV_SINGLE_ARG_DECL) { // Rate at which frames of data need to be sent. @@ -281,45 +281,45 @@ Client::pace_data (CORBA::Environment& ACE_TRY_ENV) // Continue to send data till the file is read to the end. while (1) - { + { // Count the frames sent. - count_++; + count_++; // Read from the file into a message block. - int n = ACE_OS::fread(this->mb.rd_ptr (), - 1, - this->mb.size (), - CLIENT::instance ()->file ()); - - if (n < 0) - ACE_ERROR_RETURN ((LM_ERROR, - "FTP_Client_Flow_Handler::fread end of file\n"), - -1); - - if (n == 0) - { - if (feof (CLIENT::instance ()->file ())) - { + int n = ACE_OS::fread(this->mb.rd_ptr (), + 1, + this->mb.size (), + CLIENT::instance ()->file ()); + + if (n < 0) + ACE_ERROR_RETURN ((LM_ERROR, + "FTP_Client_Flow_Handler::fread end of file\n"), + -1); + + if (n == 0) + { + if (feof (CLIENT::instance ()->file ())) + { // At end of file break the loop and end the client. if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n")); break; } - } + } - this->mb.wr_ptr (n); + this->mb.wr_ptr (n); - if ( this->count_ > 1) - { + if ( this->count_ > 1) + { // Greater than the first frame. // Stop the timer that was started just before the previous frame was sent. - last_frame_sent_time.stop (); + last_frame_sent_time.stop (); // Get the time elapsed after sending the previous frame. - ACE_Time_Value tv; - last_frame_sent_time.elapsed_time (tv); + ACE_Time_Value tv; + last_frame_sent_time.elapsed_time (tv); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -327,12 +327,12 @@ Client::pace_data (CORBA::Environment& ACE_TRY_ENV) tv.msec ())); // Check to see if the inter frame time has elapsed. - if (tv < inter_frame_time) - { + if (tv < inter_frame_time) + { // Inter frame time has not elapsed. // Claculate the time to wait before the next frame needs to be sent. - ACE_Time_Value wait_time (inter_frame_time - tv); + ACE_Time_Value wait_time (inter_frame_time - tv); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -340,32 +340,32 @@ Client::pace_data (CORBA::Environment& ACE_TRY_ENV) wait_time.msec ())); // run the orb for the wait time so the client can continue other orb requests. - TAO_AV_CORE::instance ()->orb ()->run (wait_time, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->run (wait_time + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - } - } + } + } // Start timer before sending the frame. - last_frame_sent_time.start (); + last_frame_sent_time.start (); // Send frame. int result = this->protocol_object_->send_frame (&this->mb); - if (result < 0) - ACE_ERROR_RETURN ((LM_ERROR, - "send failed:%p","FTP_Client_Flow_Handler::send\n"), - -1); + if (result < 0) + ACE_ERROR_RETURN ((LM_ERROR, + "send failed:%p","FTP_Client_Flow_Handler::send\n"), + -1); ACE_DEBUG ((LM_DEBUG,"Client::pace_data buffer sent succesfully\n")); // Reset the mb. this->mb.reset (); - } // end while + } // end while // Since the file is read stop the stream. AVStreams::flowSpec stop_spec (1); - CLIENT::instance ()->streamctrl ()->destroy (stop_spec, - ACE_TRY_ENV); + CLIENT::instance ()->streamctrl ()->destroy (stop_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Shut the orb down. @@ -376,7 +376,7 @@ Client::pace_data (CORBA::Environment& ACE_TRY_ENV) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Client::pace_data Failed"); + "Client::pace_data Failed"); return -1; } ACE_ENDTRY; @@ -387,52 +387,52 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; //Get the POA_var object from Object_var PortableServer::POA_var root_poa - = PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + = PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV STream components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // INitialize the Client. int result = 0; result = CLIENT::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, - "client::init failed\n"),1); + "client::init failed\n"),1); // Start sending data. - result = CLIENT::instance ()->pace_data (ACE_TRY_ENV); + result = CLIENT::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h index 24f43d7664c..386dd169b7f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h @@ -33,11 +33,11 @@ class FTP_Client_Callback : public TAO_AV_Callback { // = TITLE // Defines the client applcation callback. - // + // // = DESCRIPTION - // This class can override the methods of - // the TAO_AV_Callback to do application - // specific processing. + // This class can override the methods of + // the TAO_AV_Callback to do application + // specific processing. public: FTP_Client_Callback (void); //Constructor @@ -48,25 +48,25 @@ class FTP_Client_StreamEndPoint : public TAO_Client_StreamEndPoint { // = TITLE // Defines the client stream endpoint. - // + // // = DESCRIPTION - // This class overrides the methods of TAO_ClientStreamendpoint + // This class overrides the methods of TAO_ClientStreamendpoint // so the application can perform its processing during post and pre // connection set up. - + public: FTP_Client_StreamEndPoint (void); //Contructor virtual int get_callback (const char *flowname, TAO_AV_Callback *&callback); - // Create the application client callback and return its handle to the + // Create the application client callback and return its handle to the // AVSTreams for further application callbacks virtual int set_protocol_object (const char *flowname, TAO_AV_Protocol_Object *object); // Set protocol object corresponding to the transport protocol chosen. - + protected: FTP_Client_Callback callback_; // reference to the cllient application callback. @@ -79,7 +79,7 @@ class Client { // = TITLE // Defines the Client Application - // + // // = DESCRIPTION // The actual client program that acts as the ftp client that streams data // to the ftp servers that are waiting for data. @@ -87,15 +87,15 @@ public: Client (void); // Constructor - int init (int argc, - char **argv, - CORBA::Environment&); + int init (int argc, + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Method to initialize the various data components. - + void set_protocol_object (TAO_AV_Protocol_Object *protocol_object); // Set the protocol object corresponding to the transport protocol chosen. - - int pace_data (CORBA::Environment&); + + int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Method to pace and send data from a file. FILE *file (void); @@ -106,17 +106,17 @@ public: char *flowname (void); // name of the flow set up. - + int frame_rate (void); // The requested frame rate for sending each frame of data read from the file. - + private: int parse_args (int argc, char **argv); // Method to parse the command line arguments. - - int bind_to_server (CORBA::Environment& ACE_TRY_ENV); + + int bind_to_server (TAO_ENV_SINGLE_ARG_DECL); // Method that binds the ftp client to the server - + ENDPOINT_STRATEGY endpoint_strategy_; // The reacfive strategy of the client. @@ -131,7 +131,7 @@ private: int count_; // Number of frames sent. - + int argc_; char **argv_; @@ -152,7 +152,7 @@ private: // Selected protocol - default is UDP char *flowname_; - + int use_sfp_; // If set to 1 then use sfp as the flow carrier protocol. diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp index 5d58b1db246..3a98209ae10 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp @@ -38,12 +38,12 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame, frame->length (), 1, output_file); - + if (result == frame->length ()) ACE_ERROR_RETURN ((LM_ERROR, "FTP_Server_Flow_Handler::fwrite failed\n"), -1); - + frame = frame->cont (); } return 0; @@ -71,8 +71,8 @@ Server::~Server (void) int Server::init (int, - char **, - CORBA::Environment &ACE_TRY_ENV) + char ** + TAO_ENV_ARG_DECL) { int result = this->reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (), @@ -80,7 +80,7 @@ Server::init (int, if (result != 0) return result; - // Register the server mmdevice object with the ORB + // Register the server mmdevice object with the ORB ACE_NEW_RETURN (this->mmdevice_, TAO_MMDevice (&this->reactive_strategy_), -1); @@ -91,7 +91,7 @@ Server::init (int, server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice"); CORBA::Object_var mmdevice = - this->mmdevice_->_this (ACE_TRY_ENV); + this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(-1); // Initialize the naming services @@ -103,8 +103,8 @@ Server::init (int, // Register the server object with the naming server. this->my_naming_client_->rebind (server_mmdevice_name, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -140,14 +140,14 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -167,43 +167,43 @@ main (int argc, -1); else ACE_DEBUG ((LM_DEBUG, - "File Opened Successfull\n")); + "File Opened Successfull\n")); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Server server; result = server.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (result != 0) return result; - - orb->run (ACE_TRY_ENV); + + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h index 4f442c7af4e..107e468f4d9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h @@ -28,9 +28,9 @@ class FTP_Server_Callback : public TAO_AV_Callback // Defines a class for the server application callback. // // = DESCRIPTION - // This class overides the methods of the TAO_AV_Callback so the + // This class overides the methods of the TAO_AV_Callback so the // AVStreams can make upcalls to the application. - + public: // Method that is called when there is data to be received from the ftp client. @@ -65,7 +65,7 @@ class Server { // = TITLE // Defines the server application class. - // + // // = DESCRIPOTION // The actual server progarm that acts as the ftp server that receives data // sent by the ftp client. @@ -77,10 +77,10 @@ public: // Deestructor. int init (int argc, - char **argv, - CORBA::Environment &); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Initialize data components. - + protected: TAO_Naming_Client my_naming_client_; // The Naming Service Client. @@ -88,7 +88,7 @@ protected: TAO_AV_Endpoint_Reactive_Strategy_B <FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_; // The endpoint reacxtive strategy. - + TAO_MMDevice *mmdevice_; // The server MMDevice. }; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp index 1004ea6ffa3..2a6a7dbb84b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp @@ -6,19 +6,19 @@ //TimeStamp Protocol Object TimeStamp_Protocol_Object::TimeStamp_Protocol_Object (TAO_AV_Callback *callback, - TAO_AV_Transport *transport) + TAO_AV_Transport *transport) :TAO_AV_Protocol_Object (callback,transport) { ACE_DEBUG ((LM_DEBUG, - "TimeStamp_Protocol_Object::TimeStamp_Protocol_Object\n")); + "TimeStamp_Protocol_Object::TimeStamp_Protocol_Object\n")); ACE_NEW (this->frame_, - ACE_Message_Block); + ACE_Message_Block); this->frame_->size (4 * this->transport_->mtu ()); } - -int + +int TimeStamp_Protocol_Object::handle_input (void) { int n = this->transport_->recv (this->frame_->rd_ptr (), @@ -28,11 +28,11 @@ TimeStamp_Protocol_Object::handle_input (void) if (n == -1) ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_UDP_Flow_Handler::handle_input connection closed\n"),-1); this->frame_->wr_ptr (this->frame_->rd_ptr () + n); - + return this->callback_->receive_frame (this->frame_); } -// int +// int // TimeStamp_Protocol_Object::handle_input (void) // { // iovec iov; @@ -40,125 +40,125 @@ TimeStamp_Protocol_Object::handle_input (void) // int n = this->transport_->recv (&iov, iovcnt); // int frame_size = BUFSIZ; - + // int begin = 1; // ACE_Message_Block* prev; // int iov_base = 0; // while (n >= frame_size) // { // ACE_DEBUG ((LM_DEBUG, -// "(%N|%l) Frame Size %d %d\n", -// n, -// frame_size)); +// "(%N|%l) Frame Size %d %d\n", +// n, +// frame_size)); // ACE_Message_Block* mb; // ACE_NEW_RETURN (mb, -// ACE_Message_Block(frame_size), -// -1); +// ACE_Message_Block(frame_size), +// -1); // ACE_OS_String::memmove (mb->rd_ptr (), iov.iov_base, frame_size); // mb->wr_ptr (mb->rd_ptr () + frame_size); // // iov_base += frame_size; - + // n -= frame_size; // if (begin) -// { -// prev = mb; -// this->frame_ = mb; -// begin = 0; -// } -// else -// { -// prev->cont (mb); -// prev = mb; - -// } +// { +// prev = mb; +// this->frame_ = mb; +// begin = 0; // } - +// else +// { +// prev->cont (mb); +// prev = mb; + +// } +// } + // if (n > 0) // if (begin) // { -// ACE_DEBUG ((LM_DEBUG, -// "(%N|%l) Frame Size %d\n", -// n)); -// ACE_OS_String::memmove (this->frame_->rd_ptr (), iov.iov_base, n); -// this->frame_->wr_ptr (this->frame_->rd_ptr () + n); +// ACE_DEBUG ((LM_DEBUG, +// "(%N|%l) Frame Size %d\n", +// n)); +// ACE_OS_String::memmove (this->frame_->rd_ptr (), iov.iov_base, n); +// this->frame_->wr_ptr (this->frame_->rd_ptr () + n); // } -// else +// else // { -// ACE_DEBUG ((LM_DEBUG, -// "(%N|%l) Frame Size %d\n", -// n)); - -// ACE_Message_Block* mb; -// ACE_NEW_RETURN (mb, -// ACE_Message_Block (frame_size), -// -1); - -// ACE_OS_String::memmove (mb->rd_ptr (), iov.iov_base, n); -// mb->wr_ptr (mb->rd_ptr () + n); -// prev->cont (mb); +// ACE_DEBUG ((LM_DEBUG, +// "(%N|%l) Frame Size %d\n", +// n)); + +// ACE_Message_Block* mb; +// ACE_NEW_RETURN (mb, +// ACE_Message_Block (frame_size), +// -1); + +// ACE_OS_String::memmove (mb->rd_ptr (), iov.iov_base, n); +// mb->wr_ptr (mb->rd_ptr () + n); +// prev->cont (mb); // } - + // ACE_DEBUG ((LM_DEBUG, -// "IOVEC SIZE %d %d\n", -// n, -// iov.iov_len)); +// "IOVEC SIZE %d %d\n", +// n, +// iov.iov_len)); // if (n == -1) // ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_TCP_Flow_Handler::handle_input recv failed\n"),-1); // if (n == 0) // ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_TCP_Flow_Handler::handle_input connection closed\n"),-1); - + // return this->callback_->receive_frame (this->frame_); // } - + /// send a data frame. -int +int TimeStamp_Protocol_Object::send_frame (ACE_Message_Block *frame, - TAO_AV_frame_info *) + TAO_AV_frame_info *) { ACE_DEBUG ((LM_DEBUG, - "TimeStamp_Protocol_Object::send_frame\n")); - + "TimeStamp_Protocol_Object::send_frame\n")); + ACE_Message_Block* timestamp; ACE_NEW_RETURN (timestamp, - ACE_Message_Block (BUFSIZ), - -1); + ACE_Message_Block (BUFSIZ), + -1); ACE_hrtime_t now = ACE_OS::gethrtime (); - + ACE_UINT64 usec = now; ACE_UINT32 val_1 = ACE_CU64_TO_CU32 (usec); ACE_DEBUG ((LM_DEBUG, - "Time Stamp %u usecs\n", - val_1)); + "Time Stamp %u usecs\n", + val_1)); ACE_OS_String::memcpy (timestamp->wr_ptr (), &now, sizeof (now)); timestamp->wr_ptr (sizeof (now)); - + frame->cont (timestamp); - + int result = this->transport_->send (frame); if (result < 0) return result; return 0; } - -int + +int TimeStamp_Protocol_Object::send_frame (iovec const* iov, - int iovcnt, - TAO_AV_frame_info *) + int iovcnt, + TAO_AV_frame_info *) { return this->transport_->send (iov,iovcnt); } -int +int TimeStamp_Protocol_Object::send_frame (const char* buf, - size_t len) + size_t len) { int result = this->transport_->send (buf, len, 0); if (result < 0) @@ -167,7 +167,7 @@ TimeStamp_Protocol_Object::send_frame (const char* buf, } /// end the stream. -int +int TimeStamp_Protocol_Object::destroy (void) { this->callback_->handle_destroy (); @@ -187,35 +187,35 @@ int TimeStamp_Protocol_Factory::init (int, char **) { ACE_DEBUG ((LM_DEBUG, - "TimeStamp_Protocol_Factory::init\n")); + "TimeStamp_Protocol_Factory::init\n")); return 0; } -int +int TimeStamp_Protocol_Factory::match_protocol (const char *flow_string) { ACE_DEBUG ((LM_DEBUG, - "TimeStamp_Protocol_Factory::match_protocol\n")); + "TimeStamp_Protocol_Factory::match_protocol\n")); if (ACE_OS::strcasecmp (flow_string,"TS") == 0) return 1; return 0; } -TimeStamp_Protocol_Object* +TimeStamp_Protocol_Object* TimeStamp_Protocol_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, - TAO_Base_StreamEndPoint *endpoint, - TAO_AV_Flow_Handler *handler, - TAO_AV_Transport *transport) + TAO_Base_StreamEndPoint *endpoint, + TAO_AV_Flow_Handler *handler, + TAO_AV_Transport *transport) { TAO_AV_Callback *callback = 0; endpoint->get_callback (entry->flowname (), callback); - - + + TimeStamp_Protocol_Object *object = 0; ACE_NEW_RETURN (object, TimeStamp_Protocol_Object (callback, - transport), + transport), 0); callback->open (object, handler); diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h index 2f7b2fc46be..7ee8b1c4f84 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h @@ -11,28 +11,28 @@ class TAO_AV_Export TimeStamp_Protocol_Object : public TAO_AV_Protocol_Object { public: TimeStamp_Protocol_Object (TAO_AV_Callback *callback, - TAO_AV_Transport *transport); - + TAO_AV_Transport *transport); + virtual int handle_input (void); - + /// send a data frame. virtual int send_frame (ACE_Message_Block *frame, TAO_AV_frame_info *frame_info = 0); - + virtual int send_frame (iovec const* iov, int iovcnt, TAO_AV_frame_info *frame_info = 0); virtual int send_frame (const char*buf, size_t len); - + /// end the stream. virtual int destroy (void); private: /// Pre-allocated memory to receive the data... ACE_Message_Block* frame_; - + }; class TAO_AV_Export TimeStamp_Protocol_Factory : public TAO_AV_Flow_Protocol_Factory @@ -44,15 +44,15 @@ class TAO_AV_Export TimeStamp_Protocol_Factory : public TAO_AV_Flow_Protocol_Fac virtual int init (int argc, char *argv[]); virtual int match_protocol (const char *flow_string); virtual TimeStamp_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, - TAO_Base_StreamEndPoint *endpoint, - TAO_AV_Flow_Handler *handler, - TAO_AV_Transport *transport); + TAO_Base_StreamEndPoint *endpoint, + TAO_AV_Flow_Handler *handler, + TAO_AV_Transport *transport); }; ACE_STATIC_SVC_DECLARE (TimeStamp_Protocol_Factory) ACE_FACTORY_DECLARE (TAO_AV, TimeStamp_Protocol_Factory) -#include "ace/post.h" +#include "ace/post.h" #endif /*TIMESTAMP_H*/ diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp index 706f47e93c6..f5ef0bf7a7b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp @@ -46,26 +46,26 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, // Write the received data to the file. size_t result = ACE_OS::fwrite (frame->rd_ptr (), - frame_size, - 1, - output_file); - + frame_size, + 1, + output_file); + if (result == frame->length ()) ACE_ERROR_RETURN ((LM_ERROR, - "Receiver_Callback::fwrite failed\n"), - -1); + "Receiver_Callback::fwrite failed\n"), + -1); frame->rd_ptr (frame_size); ACE_hrtime_t stamp; ACE_OS_String::memcpy (&stamp, frame->rd_ptr (), sizeof (stamp)); - + ACE_UINT64 usec = stamp; ACE_UINT32 val_1 = ACE_CU64_TO_CU32 (usec); - + ACE_DEBUG ((LM_DEBUG, - "Time Stamp %u\n", - val_1)); - + "Time Stamp %u\n", + val_1)); + frame->reset (); return 0; } @@ -92,8 +92,8 @@ Receiver::~Receiver (void) int Receiver::init (int, - char **, - CORBA::Environment &ACE_TRY_ENV) + char ** + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -112,7 +112,7 @@ Receiver::init (int, this->mmdevice_; CORBA::Object_var mmdevice = - this->mmdevice_->_this (ACE_TRY_ENV); + this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the mmdevice with the naming service. @@ -130,8 +130,8 @@ Receiver::init (int, // Register the receiver object with the naming server. this->naming_client_->rebind (name, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -177,32 +177,32 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -228,23 +228,23 @@ main (int argc, Receiver receiver; result = receiver.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - + while (!endstream) - { - orb->perform_work (ACE_TRY_ENV); - ACE_TRY_CHECK; - } + { + orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_TRY_CHECK; + } // Hack for now.... ACE_OS::sleep (1); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl index 3f07d66d5c9..6d63232651b 100755 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl @@ -28,7 +28,7 @@ $NS->Spawn (); if (PerlACE::waitforfile_timed ($nsior, 5) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; - $NS->Kill (); + $NS->Kill (); exit 1; } diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp index 04d695b79a9..2161de268e9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp @@ -82,7 +82,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) +Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -91,13 +91,13 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) // Resolve the receiver object reference from the Naming Service CORBA::Object_var receiver_mmdevice_obj = - this->naming_client_->resolve (name, - ACE_TRY_ENV); + this->naming_client_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->receiver_mmdevice_ = - AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in (), - ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->receiver_mmdevice_.in ())) @@ -110,8 +110,8 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) int Sender::init (int argc, - char **argv, - CORBA::Environment &ACE_TRY_ENV) + char **argv + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -148,9 +148,9 @@ Sender::init (int argc, "File opened successfully\n")); // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (ACE_TRY_ENV); + result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - + if (result != 0) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), @@ -182,7 +182,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (ACE_TRY_ENV); + this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->streamctrl_, @@ -197,8 +197,8 @@ Sender::init (int argc, this->streamctrl_->bind_devs (mmdevice.in (), this->receiver_mmdevice_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (bind_result == 0) @@ -211,7 +211,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) +Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -288,8 +288,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // Run the orb for the wait time so the sender can // continue other orb requests. - TAO_AV_CORE::instance ()->orb ()->run (wait_time, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->run (wait_time + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -318,13 +318,13 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; - this->streamctrl_->destroy (stop_spec, - ACE_TRY_ENV); + this->streamctrl_->destroy (stop_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Shut the orb down. - TAO_AV_CORE::instance ()->orb ()->shutdown (0, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->shutdown (0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -350,38 +350,38 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa - = PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + = PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) @@ -390,7 +390,7 @@ main (int argc, -1); // Start sending data. - result = SENDER::instance ()->pace_data (ACE_TRY_ENV); + result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp index 3b9ae525d88..e681eed4fc9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp @@ -77,8 +77,8 @@ Distributer_Receiver_Callback::handle_destroy (void) // Destroy the receiver stream AVStreams::flowSpec stop_spec; - DISTRIBUTER::instance ()->receiver_streamctrl ()->destroy (stop_spec, - ACE_TRY_ENV); + DISTRIBUTER::instance ()->receiver_streamctrl ()->destroy (stop_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We can close down now. @@ -126,8 +126,8 @@ Distributer::~Distributer (void) void Distributer::bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice, - const ACE_CString &mmdevice_name, - CORBA::Environment &ACE_TRY_ENV) + const ACE_CString &mmdevice_name + TAO_ENV_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -136,20 +136,20 @@ Distributer::bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice, // Resolve the mmdevice object reference from the Naming Service CORBA::Object_var mmdevice_obj = - this->naming_client_->resolve (name, - ACE_TRY_ENV); + this->naming_client_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; mmdevice = - AVStreams::MMDevice::_narrow (mmdevice_obj.in (), - ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (mmdevice_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } int Distributer::init (int /*argc*/, - char *[] /*argv*/, - CORBA::Environment &ACE_TRY_ENV) + char *[] /*argv*/ + TAO_ENV_ARG_DECL) { // Initialize the naming services int result = @@ -173,15 +173,15 @@ Distributer::init (int /*argc*/, // Bind to the receiver mmdevice ACE_CString mmdevice_name ("Receiver"); this->bind_to_mmdevice (this->receiver_mmdevice_.out (), - mmdevice_name, - ACE_TRY_ENV); + mmdevice_name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Bind to the sender mmdevice mmdevice_name = "Sender"; this->bind_to_mmdevice (this->sender_mmdevice_.out (), - mmdevice_name, - ACE_TRY_ENV); + mmdevice_name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Initialize the QoS @@ -210,7 +210,7 @@ Distributer::init (int /*argc*/, this->distributer_sender_mmdevice_; AVStreams::MMDevice_var distributer_sender_mmdevice = - this->distributer_sender_mmdevice_->_this (ACE_TRY_ENV); + this->distributer_sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->distributer_receiver_mmdevice_, @@ -222,7 +222,7 @@ Distributer::init (int /*argc*/, this->distributer_receiver_mmdevice_; AVStreams::MMDevice_var distributer_receiver_mmdevice = - this->distributer_receiver_mmdevice_->_this (ACE_TRY_ENV); + this->distributer_receiver_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->receiver_streamctrl_, @@ -238,8 +238,8 @@ Distributer::init (int /*argc*/, this->receiver_streamctrl_->bind_devs (distributer_sender_mmdevice.in (), this->receiver_mmdevice_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Create the forward flow specification to describe the flow. @@ -269,8 +269,8 @@ Distributer::init (int /*argc*/, sender_streamctrl->bind_devs (sender_mmdevice_.in (), distributer_receiver_mmdevice.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (res == 0) @@ -301,46 +301,46 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Distributer int result = DISTRIBUTER::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -348,7 +348,7 @@ main (int argc, while (!DISTRIBUTER::instance ()->done ()) { - orb->perform_work (ACE_TRY_ENV); + orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h index 061b5154500..8f003e75fd5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h @@ -115,13 +115,13 @@ public: // Destructor. int init (int argc, - char **argv, - CORBA::Environment &); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Initialize data components. void bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice, - const ACE_CString &mmdevice_name, - CORBA::Environment &ACE_TRY_ENV); + const ACE_CString &mmdevice_name + TAO_ENV_ARG_DECL); // Resolve the reference of the mmdevice from the naming service. TAO_StreamCtrl *receiver_streamctrl (void); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp index 724476074b1..815bf7fb79d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp @@ -66,8 +66,8 @@ Receiver_Callback::handle_destroy (void) ACE_TRY_NEW_ENV { - TAO_AV_CORE::instance ()->orb ()->shutdown (0, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->shutdown (0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -93,8 +93,8 @@ Receiver::~Receiver (void) int Receiver::init (int, - char **, - CORBA::Environment &ACE_TRY_ENV) + char ** + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -113,7 +113,7 @@ Receiver::init (int, this->mmdevice_; CORBA::Object_var mmdevice = - this->mmdevice_->_this (ACE_TRY_ENV); + this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the mmdevice with the naming service. @@ -131,8 +131,8 @@ Receiver::init (int, // Register the receiver object with the naming server. this->naming_client_->rebind (name, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -169,39 +169,39 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -227,20 +227,20 @@ main (int argc, Receiver receiver; result = receiver.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Hack for now.... ACE_OS::sleep (1); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h index f197cbae818..1a5fa37d3a8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h @@ -83,8 +83,8 @@ public: // Destructor. int init (int argc, - char **argv, - CORBA::Environment &); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Initialize data components. protected: diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp index 540eba5f801..777f3b0a4e0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp @@ -20,8 +20,8 @@ Sender_StreamEndPoint::get_callback (const char *, ACE_TRY_NEW_ENV { CORBA::Any_ptr streamctrl_any = - this->get_property_value ("Related_StreamCtrl", - ACE_TRY_ENV); + this->get_property_value ("Related_StreamCtrl" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::StreamCtrl_ptr streamctrl; @@ -111,8 +111,8 @@ Sender::parse_args (int argc, int Sender::init (int argc, - char **argv, - CORBA::Environment &ACE_TRY_ENV) + char **argv + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -158,7 +158,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (ACE_TRY_ENV); + this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(-1); CosNaming::Name name (1); @@ -168,8 +168,8 @@ Sender::init (int argc, // Register the sender object with the naming server. this->naming_client_->rebind (name, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -177,7 +177,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) +Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -254,8 +254,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // Run the orb for the wait time so the sender can // continue other orb requests. - TAO_AV_CORE::instance ()->orb ()->run (wait_time, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->run (wait_time + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -291,8 +291,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) { // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; - this->streamctrl_->destroy (stop_spec, - ACE_TRY_ENV); + this->streamctrl_->destroy (stop_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -310,44 +310,44 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa - = PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + = PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) @@ -355,7 +355,7 @@ main (int argc, "Sender::init failed\n"), -1); - SENDER::instance ()->pace_data (ACE_TRY_ENV); + SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (20); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h index 58c584efd0f..6619775927b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h @@ -62,11 +62,11 @@ public: // Constructor int init (int argc, - char **argv, - CORBA::Environment&); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Method to initialize the various data components. - int pace_data (CORBA::Environment &); + int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Method to pace and send data from a file. void protocol_object (TAO_AV_Protocol_Object *protocol_object); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp index 724476074b1..815bf7fb79d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp @@ -66,8 +66,8 @@ Receiver_Callback::handle_destroy (void) ACE_TRY_NEW_ENV { - TAO_AV_CORE::instance ()->orb ()->shutdown (0, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->shutdown (0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -93,8 +93,8 @@ Receiver::~Receiver (void) int Receiver::init (int, - char **, - CORBA::Environment &ACE_TRY_ENV) + char ** + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -113,7 +113,7 @@ Receiver::init (int, this->mmdevice_; CORBA::Object_var mmdevice = - this->mmdevice_->_this (ACE_TRY_ENV); + this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the mmdevice with the naming service. @@ -131,8 +131,8 @@ Receiver::init (int, // Register the receiver object with the naming server. this->naming_client_->rebind (name, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -169,39 +169,39 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -227,20 +227,20 @@ main (int argc, Receiver receiver; result = receiver.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Hack for now.... ACE_OS::sleep (1); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h index d117c273e90..507f6ec9ca7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h @@ -83,8 +83,8 @@ public: // Destructor. int init (int argc, - char **argv, - CORBA::Environment &); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Initialize data components. protected: diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp index 80819189f07..1f82e374339 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp @@ -82,7 +82,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) +Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -91,13 +91,13 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) // Resolve the receiver object reference from the Naming Service CORBA::Object_var receiver_mmdevice_obj = - this->naming_client_->resolve (name, - ACE_TRY_ENV); + this->naming_client_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->receiver_mmdevice_ = - AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in (), - ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->receiver_mmdevice_.in ())) @@ -110,8 +110,8 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) int Sender::init (int argc, - char **argv, - CORBA::Environment &ACE_TRY_ENV) + char **argv + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -148,9 +148,9 @@ Sender::init (int argc, "File opened successfully\n")); // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (ACE_TRY_ENV); + result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - + if (result != 0) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), @@ -182,7 +182,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (ACE_TRY_ENV); + this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->streamctrl_, @@ -197,8 +197,8 @@ Sender::init (int argc, this->streamctrl_->bind_devs (mmdevice.in (), this->receiver_mmdevice_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (bind_result == 0) @@ -211,7 +211,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) +Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -288,8 +288,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // Run the orb for the wait time so the sender can // continue other orb requests. - TAO_AV_CORE::instance ()->orb ()->run (wait_time, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->run (wait_time + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -318,13 +318,13 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; - this->streamctrl_->destroy (stop_spec, - ACE_TRY_ENV); + this->streamctrl_->destroy (stop_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Shut the orb down. - TAO_AV_CORE::instance ()->orb ()->shutdown (0, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->shutdown (0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -341,44 +341,44 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa - = PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + = PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) @@ -387,7 +387,7 @@ main (int argc, -1); // Start sending data. - result = SENDER::instance ()->pace_data (ACE_TRY_ENV); + result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h index 87b07bcb553..aa74b4b3319 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h @@ -62,11 +62,11 @@ public: // Constructor int init (int argc, - char **argv, - CORBA::Environment&); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Method to initialize the various data components. - int pace_data (CORBA::Environment &); + int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Method to pace and send data from a file. void protocol_object (TAO_AV_Protocol_Object *protocol_object); @@ -76,7 +76,7 @@ private: int parse_args (int argc, char **argv); // Method to parse the command line arguments. - int bind_to_receiver (CORBA::Environment& ACE_TRY_ENV); + int bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL); // Method that binds the sender to the receiver. SENDER_ENDPOINT_STRATEGY endpoint_strategy_; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp index 43e706c67f2..da934900655 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp @@ -74,8 +74,8 @@ Receiver::~Receiver (void) int Receiver::init (int, - char **, - CORBA::Environment &ACE_TRY_ENV) + char ** + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -94,7 +94,7 @@ Receiver::init (int, this->mmdevice_; CORBA::Object_var mmdevice = - this->mmdevice_->_this (ACE_TRY_ENV); + this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the mmdevice with the naming service. @@ -112,8 +112,8 @@ Receiver::init (int, // Register the receiver object with the naming server. this->naming_client_->rebind (name, - mmdevice.in (), - ACE_TRY_ENV); + mmdevice.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -150,39 +150,39 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -208,20 +208,20 @@ main (int argc, Receiver receiver; result = receiver.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Hack for now.... ACE_OS::sleep (1); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h index d4e04e5f782..0b617c4d7bc 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h @@ -80,8 +80,8 @@ public: // Destructor. int init (int argc, - char **argv, - CORBA::Environment &); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Initialize data components. protected: diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp index 33901f05a57..943390dd384 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp @@ -15,16 +15,16 @@ ACE_Time_Value inter_frame_time; CORBA::Boolean Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &the_flows, - CORBA::Environment &ACE_TRY_ENV) + const AVStreams::flowSpec &the_flows + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed )) + AVStreams::noSuchFlow, + AVStreams::QoSRequestFailed )) { ACE_DEBUG ((LM_DEBUG, - "Sender_StreamEndPoint::modify_QoS\n")); - - int result = this->change_qos (new_qos, the_flows, ACE_TRY_ENV); + "Sender_StreamEndPoint::modify_QoS\n")); + + int result = this->change_qos (new_qos, the_flows TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (result != 0) @@ -37,17 +37,17 @@ int Sender_StreamEndPoint::get_callback (const char *, TAO_AV_Callback *&callback) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; // Create and return the sender application callback to AVStreams // for further upcalls. callback = &this->callback_; - + TAO_Negotiator *negotiator; ACE_NEW_RETURN (negotiator, - TAO_Negotiator, - -1); + TAO_Negotiator, + -1); AVStreams::Negotiator_var negotiator_obj = - negotiator->_this (ACE_TRY_ENV); + negotiator->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->set_negotiator (negotiator_obj.in ()); @@ -110,9 +110,9 @@ Sender::parse_args (int argc, case 'd': TAO_debug_level++; break; - case 'a': - this->address_ = opts.optarg; - break; + case 'a': + this->address_ = opts.optarg; + break; default: ACE_DEBUG ((LM_DEBUG, "Unknown Option\n")); return -1; @@ -127,50 +127,50 @@ Sender::fill_qos (AVStreams::streamQoS &qos) peak_bandwidth += 100; ACE_DEBUG ((LM_DEBUG, - "Sender::fill_qos %d\n", - peak_bandwidth)); + "Sender::fill_qos %d\n", + peak_bandwidth)); qos.length (1); qos [0].QoSType = CORBA::string_dup ("Data_Receiver"); - + qos [0].QoSParams.length (10); - + qos [0].QoSParams [0].property_name = CORBA::string_dup ("Service_Type"); qos [0].QoSParams [0].property_value <<= (CORBA::Short) 1;//ACE_SERVICETYPE_CONTROLLEDLOAD; - + qos [0].QoSParams [1].property_name = CORBA::string_dup ("Token_Rate"); qos [0].QoSParams [1].property_value <<= (CORBA::ULong) 9200 ; - + qos [0].QoSParams [2].property_name = CORBA::string_dup ("Token_Bucket_Size"); qos [0].QoSParams [2].property_value <<= (CORBA::ULong) 708; - + qos [0].QoSParams [3].property_name = CORBA::string_dup ("Peak_Bandwidth"); qos [0].QoSParams [3].property_value <<= (CORBA::ULong) peak_bandwidth; - + qos [0].QoSParams [4].property_name = CORBA::string_dup ("Latency"); qos [0].QoSParams [4].property_value <<= (CORBA::ULong) 0; - + qos [0].QoSParams [5].property_name = CORBA::string_dup ("Delay_Variation"); qos [0].QoSParams [5].property_value <<= (CORBA::ULong) 0; - + qos [0].QoSParams [6].property_name = CORBA::string_dup ("Max_SDU_Size"); qos [0].QoSParams [6].property_value <<= (CORBA::ULong) 368; - + qos [0].QoSParams [7].property_name = CORBA::string_dup ("Minimum_Policed_Size"); qos [0].QoSParams [7].property_value <<= (CORBA::ULong) 368; - + qos [0].QoSParams [8].property_name = CORBA::string_dup ("TTL"); qos [0].QoSParams [8].property_value <<= (CORBA::ULong) 25; - + qos [0].QoSParams [9].property_name = CORBA::string_dup ("Priority"); qos [0].QoSParams [9].property_value <<= (CORBA::ULong) 1; - + } // Method to get the object reference of the receiver int -Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) +Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -179,13 +179,13 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) // Resolve the receiver object reference from the Naming Service CORBA::Object_var receiver_mmdevice_obj = - this->naming_client_->resolve (name, - ACE_TRY_ENV); + this->naming_client_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->receiver_mmdevice_ = - AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in (), - ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->receiver_mmdevice_.in ())) @@ -198,8 +198,8 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV) int Sender::init (int argc, - char **argv, - CORBA::Environment &ACE_TRY_ENV) + char **argv + TAO_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -236,9 +236,9 @@ Sender::init (int argc, "File opened successfully\n")); // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (ACE_TRY_ENV); + result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - + if (result != 0) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), @@ -269,7 +269,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (ACE_TRY_ENV); + this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->streamctrl_, @@ -280,7 +280,7 @@ Sender::init (int argc, this->streamctrl_; AVStreams::streamQoS qos; - + //this->fill_qos (qos); // Bind/Connect the sender and receiver MMDevices. @@ -288,8 +288,8 @@ Sender::init (int argc, this->streamctrl_->bind_devs (mmdevice.in (), this->receiver_mmdevice_.in (), qos, - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (bind_result == 0) @@ -302,7 +302,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) +Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) { @@ -323,7 +323,7 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // Continue to send data till the file is read to the end. while (1) - { + { // Read from the file into a message block. int n = ACE_OS::fread (this->mb_.wr_ptr (), 1, @@ -378,8 +378,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // Run the orb for the wait time so the sender can // continue other orb requests. - TAO_AV_CORE::instance ()->orb ()->run (wait_time, - ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->run (wait_time + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -403,28 +403,28 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV) // Reset the message block. this->mb_.reset (); - - if (this->frame_count_ == 25) - { - TAO_Forward_FlowSpec_Entry entry (this->flowname_.c_str (), - "IN", - "USER_DEFINED", - "", - "QoS_UDP", - 0); - AVStreams::flowSpec flow_spec (1); - flow_spec.length (1); - flow_spec [0] = CORBA::string_dup (entry.entry_to_string ()); - - AVStreams::streamQoS qos; - this->fill_qos (qos); - this->streamctrl_->modify_QoS (qos, - flow_spec, - ACE_TRY_ENV); - ACE_TRY_CHECK; - } - - } // end while + + if (this->frame_count_ == 25) + { + TAO_Forward_FlowSpec_Entry entry (this->flowname_.c_str (), + "IN", + "USER_DEFINED", + "", + "QoS_UDP", + 0); + AVStreams::flowSpec flow_spec (1); + flow_spec.length (1); + flow_spec [0] = CORBA::string_dup (entry.entry_to_string ()); + + AVStreams::streamQoS qos; + this->fill_qos (qos); + this->streamctrl_->modify_QoS (qos, + flow_spec + TAO_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } + + } // end while } ACE_CATCHANY @@ -441,44 +441,44 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa - = PortableServer::POA::_narrow (obj.in (), - ACE_TRY_ENV); + = PortableServer::POA::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (ACE_TRY_ENV); + = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (ACE_TRY_ENV); + mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in (), - ACE_TRY_ENV); + root_poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) @@ -487,9 +487,9 @@ main (int argc, -1); // Start sending data. - result = SENDER::instance ()->pace_data (ACE_TRY_ENV); + result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + orb->run (); } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h index c05e594af7c..c3875d517a2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h @@ -39,11 +39,11 @@ public: // chosen. CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &/* the_flows */, - CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC(( CORBA::SystemException, - AVStreams::noSuchFlow, - AVStreams::QoSRequestFailed )); + const AVStreams::flowSpec &/* the_flows */ + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC(( CORBA::SystemException, + AVStreams::noSuchFlow, + AVStreams::QoSRequestFailed )); protected: TAO_AV_Callback callback_; // Application callback. @@ -68,11 +68,11 @@ public: // Constructor int init (int argc, - char **argv, - CORBA::Environment&); + char **argv + TAO_ENV_ARG_DECL_NOT_USED); // Method to initialize the various data components. - int pace_data (CORBA::Environment &); + int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Method to pace and send data from a file. void protocol_object (TAO_AV_Protocol_Object *protocol_object); @@ -85,7 +85,7 @@ private: int parse_args (int argc, char **argv); // Method to parse the command line arguments. - int bind_to_receiver (CORBA::Environment& ACE_TRY_ENV); + int bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL); // Method that binds the sender to the receiver. SENDER_ENDPOINT_STRATEGY endpoint_strategy_; diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.cpp b/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.cpp index 64db7de821c..4f441ad8447 100644 --- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.cpp +++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.cpp @@ -59,7 +59,7 @@ Trader_Client::init (int argc, char** argv) //ACE_DEBUG ((LM_DEBUG, "Bootstrapping to the trading service")); CORBA::ORB_var orb = this->orb_manager_.orb (); CORBA::Object_var obj = - orb->resolve_initial_references ("TradingService", ACE_TRY_ENV); + orb->resolve_initial_references ("TradingService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the lookup interface. diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index a0e174b9ad1..9c6d58d3aec 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -357,14 +357,14 @@ CC_Client::print_usage (void) int CC_Client::init_naming_service (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { ACE_NEW_RETURN (naming_service_, CC_naming_service, -1); - this->naming_service_->Init (this->orb_, ACE_TRY_ENV); + this->naming_service_->Init (this->orb_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -382,14 +382,14 @@ CC_Client::init (int argc, char **argv) this->argc_ = argc; this->argv_ = argv; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Retrieve the ORB. this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, - "internet", - ACE_TRY_ENV); + "internet" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -412,15 +412,15 @@ CC_Client::init (int argc, char **argv) CORBA::Object_var factory_object = - this->orb_->string_to_object (this->cc_factory_key_, - ACE_TRY_ENV); + this->orb_->string_to_object (this->cc_factory_key_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if 0 // The test cannot currently run without the naming service. this->factory_ = CosConcurrencyControl::LockSetFactory::_narrow - (factory_object.in (), ACE_TRY_ENV); + (factory_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->factory_.in ())) diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp index cf44aa072cc..3023e65b043 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -40,8 +40,8 @@ CC_Command::CC_Command(void) } CosConcurrencyControl::LockSet_var -CC_Command::GetLockSet (const char *lock_set_name, - CORBA::Environment &ACE_TRY_ENV) +CC_Command::GetLockSet (const char *lock_set_name + TAO_ENV_ARG_DECL) { CosConcurrencyControl::LockSet_var ccls_ret; @@ -51,13 +51,13 @@ CC_Command::GetLockSet (const char *lock_set_name, { CORBA::Object_var ccls_obj = CC_naming_service::Instance()->get_obj_from_name ("", - lock_set_name, - ACE_TRY_ENV); + lock_set_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ccls_ret = - CosConcurrencyControl::LockSet::_narrow (ccls_obj.in (), - ACE_TRY_ENV); + CosConcurrencyControl::LockSet::_narrow (ccls_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -160,7 +160,7 @@ int CC_CreateLockSet_Cmd::execute(void) printf("Executing create command (lock set: %s)\n", name_); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CosConcurrencyControl::LockSet_ptr lock_set = @@ -168,7 +168,7 @@ int CC_CreateLockSet_Cmd::execute(void) if(ACE_OS::strcmp(name_,"")!=0)// Do not bind an empty name { CC_naming_service::Instance()->bind_name(name_, - lock_set, ACE_TRY_ENV); + lock_set TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -214,14 +214,14 @@ int CC_Lock_Cmd::execute(void) printf("Executing lock command (lock set: %s, mode: %s)\n", name_, CC_TestUtils::get_lock_mode_name(mode_)); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CosConcurrencyControl::LockSet_var ccls = - GetLockSet(name_, ACE_TRY_ENV); + GetLockSet(name_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ccls->lock (mode_, - ACE_TRY_ENV); + ccls->lock (mode_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -261,14 +261,14 @@ int CC_UnLock_Cmd::execute(void) printf("Executing unlock command (lock set: %s, mode: %s)\n", name_, CC_TestUtils::get_lock_mode_name(mode_)); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_, ACE_TRY_ENV); + CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ccls->unlock (mode_, - ACE_TRY_ENV); + ccls->unlock (mode_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -311,14 +311,14 @@ int CC_TryLock_Cmd::execute(void) CORBA::Boolean lock_not_held; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_, ACE_TRY_ENV); + CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - lock_not_held = ccls->try_lock (mode_, - ACE_TRY_ENV); + lock_not_held = ccls->try_lock (mode_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (lock_not_held) @@ -376,14 +376,14 @@ int CC_ChangeMode_Cmd::execute(void) name_, CC_TestUtils::get_lock_mode_name(held_mode_), CC_TestUtils::get_lock_mode_name(new_mode_)); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_, ACE_TRY_ENV); + CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ccls->change_mode (held_mode_, new_mode_, - ACE_TRY_ENV); + ccls->change_mode (held_mode_, new_mode_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -570,18 +570,18 @@ CC_Lookup_Cmd::execute(void) // Do the lookup if we haven't done it before if(cc_lockset_.in() == 0) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::Object_var ccls_obj = CC_naming_service::Instance()->get_obj_from_name ("", - name_, - ACE_TRY_ENV); + name_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosConcurrencyControl::LockSet_var ccls = - CosConcurrencyControl::LockSet::_narrow (ccls_obj.in (), - ACE_TRY_ENV); + CosConcurrencyControl::LockSet::_narrow (ccls_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; cc_lockset_ = ccls; diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h index d3b8fd49709..0d075725d06 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h @@ -44,8 +44,8 @@ class CC_Command protected: CosConcurrencyControl::LockSet_var - GetLockSet (const char *lock_set_name, - CORBA::Environment &_env); + GetLockSet (const char *lock_set_name + TAO_ENV_ARG_DECL); // Function to look up the lock set we are operating on, or if the // name is "" return the global lock set variable diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp index cff8cc5a554..7333698f6b6 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp @@ -21,13 +21,13 @@ ACE_RCSID(Concurrency, CC_naming_service, "$Id$") -CC_naming_service::CC_naming_service (CORBA::ORB_var orb, - CORBA::Environment &ACE_TRY_ENV) +CC_naming_service::CC_naming_service (CORBA::ORB_var orb + TAO_ENV_ARG_DECL) : cc_factory_key_ (0), orb_ (0), factory_ (0) { - this->Init(orb, ACE_TRY_ENV); + this->Init(orb TAO_ENV_ARG_PARAMETER); ACE_CHECK; instance_ = this; @@ -41,8 +41,8 @@ CC_naming_service::CC_naming_service(void) } void -CC_naming_service::Init(CORBA::ORB_var orb, - CORBA::Environment &ACE_TRY_ENV) +CC_naming_service::Init(CORBA::ORB_var orb + TAO_ENV_ARG_DECL) { this->orb_ = orb; @@ -70,8 +70,8 @@ CC_naming_service::Instance(void) CORBA::Object_var CC_naming_service::get_obj_from_name (const char *c_name, - const char *name, - CORBA::Environment &ACE_TRY_ENV) + const char *name + TAO_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "C: %s, N: %s\n", c_name, name)); CORBA::Object_var obj; @@ -83,7 +83,7 @@ CC_naming_service::get_obj_from_name (const char *c_name, CosNaming::Name ns_name (1); ns_name.length (1); ns_name[0].id = CORBA::string_dup (name); - obj = my_name_client_->resolve (ns_name, ACE_TRY_ENV); + obj = my_name_client_->resolve (ns_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -92,7 +92,7 @@ CC_naming_service::get_obj_from_name (const char *c_name, ns_name.length (2); ns_name[0].id = CORBA::string_dup (c_name); ns_name[1].id = CORBA::string_dup (name); - obj = my_name_client_->resolve (ns_name, ACE_TRY_ENV); + obj = my_name_client_->resolve (ns_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } if (CORBA::is_nil (obj.in ()) ) @@ -112,8 +112,8 @@ CC_naming_service::get_obj_from_name (const char *c_name, void CC_naming_service::bind_name (const char *n, - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "CC_Client::bind_name\n")); @@ -123,8 +123,8 @@ CC_naming_service::bind_name (const char *n, ns_name.length (1); ns_name[0].id = CORBA::string_dup (n); my_name_client_->bind (ns_name, - obj, - ACE_TRY_ENV); + obj + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -144,7 +144,7 @@ CC_naming_service::get_lock_set_factory (void) int CC_naming_service::init_naming_service (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the naming services @@ -155,13 +155,13 @@ CC_naming_service::init_naming_service (void) -1); CORBA::Object_var factory_obj = get_obj_from_name ("CosConcurrency", - "LockSetFactory", - ACE_TRY_ENV); + "LockSetFactory" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->factory_ = CosConcurrencyControl::LockSetFactory::_narrow - (factory_obj.in (),ACE_TRY_ENV); + (factory_obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->factory_.in ())) diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h index 5615ebed401..f86de983f9b 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h @@ -39,24 +39,24 @@ public: CC_naming_service (); // Default constructor - CC_naming_service (CORBA::ORB_var orb_, CORBA::Environment &_env); + CC_naming_service (CORBA::ORB_var orb_ TAO_ENV_ARG_DECL); // Constructor ~CC_naming_service (void); // Default destructor. - void Init (CORBA::ORB_var orb_, CORBA::Environment &_env); + void Init (CORBA::ORB_var orb_ TAO_ENV_ARG_DECL); // Initialization method must be called after first call of Instance() // in order to initialize the object correctly CORBA::Object_var get_obj_from_name (const char *c_name, - const char *name, - CORBA::Environment &_env); + const char *name + TAO_ENV_ARG_DECL); // Lookup a name in the naming service (context, name) void bind_name (const char *n, - CORBA::Object_ptr obj, - CORBA::Environment &_env); + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL); // Bind a name in the concurrency context. CosConcurrencyControl::LockSetFactory_var get_lock_set_factory (void); diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp index 5d9174c5da8..428869028e4 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp @@ -53,7 +53,7 @@ CC_TestUtils::create_lock_set (void) ACE_TRY { lock_set = - CC_naming_service::Instance()->get_lock_set_factory ()->create (ACE_TRY_ENV); + CC_naming_service::Instance()->get_lock_set_factory ()->create (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (lock_set)) diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp index 815a98cabcc..fdcddbb53bf 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp @@ -37,11 +37,11 @@ CC_Test::create_lock_set (void) // Create the lock set and return an obj ref corresponding to the // key. CosConcurrencyControl::LockSet_ptr lock_set(0); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { lock_set = - this->naming_service_->get_lock_set_factory ()->create (ACE_TRY_ENV); + this->naming_service_->get_lock_set_factory ()->create (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (lock_set)) @@ -101,18 +101,18 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */) CosConcurrencyControl::LockSet_ptr cc_lock_set_ = create_lock_set (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - cc_lock_set_->lock (mode_, ACE_TRY_ENV); + cc_lock_set_->lock (mode_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "%s lock set\n", get_lock_mode_name (mode_))); - lock_not_held = cc_lock_set_->try_lock (mode_, - ACE_TRY_ENV); + lock_not_held = cc_lock_set_->try_lock (mode_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (lock_not_held) @@ -127,14 +127,14 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */) "%s lock held\n", get_lock_mode_name (mode_))); - cc_lock_set_->unlock (mode_, - ACE_TRY_ENV); + cc_lock_set_->unlock (mode_ + TAO_ENV_ARG_PARAMETER); ACE_DEBUG ((LM_DEBUG, "%s lock released\n", get_lock_mode_name (mode_))); - lock_not_held = cc_lock_set_->try_lock (mode_, - ACE_TRY_ENV); + lock_not_held = cc_lock_set_->try_lock (mode_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (lock_not_held) @@ -179,20 +179,20 @@ Test_Setup_LockSet::~Test_Setup_LockSet (void) int Test_Setup_LockSet::run (int /* times_to_run */) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CosConcurrencyControl::LockSet_ptr cc_lock_set_ = create_lock_set (); - this->naming_service_->bind_name (my_name_, cc_lock_set_, - ACE_TRY_ENV); + this->naming_service_->bind_name (my_name_, cc_lock_set_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Name bound\n")); - cc_lock_set_->lock (CosConcurrencyControl::read, - ACE_TRY_ENV); + cc_lock_set_->lock (CosConcurrencyControl::read + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -226,22 +226,22 @@ Test_Use_Already_Created_LockSet::~Test_Use_Already_Created_LockSet (void) int Test_Use_Already_Created_LockSet::run (int /* times_to_run */) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::Object_var ccls_obj = this->naming_service_->get_obj_from_name (ACE_const_cast (char *, ""), - my_name_, - ACE_TRY_ENV); + my_name_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosConcurrencyControl::LockSet_var ccls = - CosConcurrencyControl::LockSet::_narrow (ccls_obj.in (), - ACE_TRY_ENV); + CosConcurrencyControl::LockSet::_narrow (ccls_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ccls->lock (CosConcurrencyControl::read, - ACE_TRY_ENV); + ccls->lock (CosConcurrencyControl::read + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -273,21 +273,21 @@ Test_Unlock_Already_Created_LockSet::~Test_Unlock_Already_Created_LockSet (void) int Test_Unlock_Already_Created_LockSet::run (int /* times_to_run */) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::Object_var ccls_obj = - this->naming_service_->get_obj_from_name (ACE_const_cast (char *, ""), my_name_, - ACE_TRY_ENV); + this->naming_service_->get_obj_from_name (ACE_const_cast (char *, ""), my_name_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosConcurrencyControl::LockSet_var ccls = - CosConcurrencyControl::LockSet::_narrow (ccls_obj.in (), - ACE_TRY_ENV); + CosConcurrencyControl::LockSet::_narrow (ccls_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ccls->unlock (CosConcurrencyControl::read, - ACE_TRY_ENV); + ccls->unlock (CosConcurrencyControl::read + TAO_ENV_ARG_PARAMETER); } ACE_CATCHANY { @@ -320,11 +320,11 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */) // Create the lock set CosConcurrencyControl::LockSet_ptr cc_lock_set_ = create_lock_set (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // lock the lock - cc_lock_set_->lock (mode_, ACE_TRY_ENV); + cc_lock_set_->lock (mode_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -332,8 +332,8 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */) get_lock_mode_name (mode_))); // check to see if the lock is held - lock_not_held = cc_lock_set_->try_lock (mode_, - ACE_TRY_ENV); + lock_not_held = cc_lock_set_->try_lock (mode_ + TAO_ENV_ARG_PARAMETER); if (lock_not_held) { @@ -348,15 +348,15 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */) get_lock_mode_name (mode_))); // release the lock - cc_lock_set_->unlock (mode_, - ACE_TRY_ENV); + cc_lock_set_->unlock (mode_ + TAO_ENV_ARG_PARAMETER); ACE_DEBUG ((LM_DEBUG, "%s lock released\n", get_lock_mode_name (mode_))); // release the lock again. this should raise an exception - cc_lock_set_->unlock (mode_, - ACE_TRY_ENV); + cc_lock_set_->unlock (mode_ + TAO_ENV_ARG_PARAMETER); ACE_DEBUG ((LM_DEBUG, "attemptet to release %s lock\n", diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp index 42612d8d35f..a2e9d894079 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp @@ -10,48 +10,48 @@ ACE_RCSID(CEC_Tests, Disconnect, "$Id$") static void run_test (PortableServer::POA_ptr poa, - int use_callbacks, - CORBA::Environment &ACE_TRY_ENV); + int use_callbacks + TAO_ENV_ARG_DECL); int main (int argc, char* argv[]) { TAO_CEC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - run_test (poa.in (), 0, ACE_TRY_ENV); + run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - run_test (poa.in (), 1, ACE_TRY_ENV); + run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -67,45 +67,45 @@ main (int argc, char* argv[]) // **************************************************************** void -deactivate_servant (PortableServer::Servant servant, - CORBA::Environment &ACE_TRY_ENV) +deactivate_servant (PortableServer::Servant servant + TAO_ENV_ARG_DECL) { PortableServer::POA_var poa = - servant->_default_POA (ACE_TRY_ENV); + servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (servant, ACE_TRY_ENV); + poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void run_test (PortableServer::POA_ptr poa, - int use_callbacks, - CORBA::Environment &ACE_TRY_ENV) + int use_callbacks + TAO_ENV_ARG_DECL) { TAO_CEC_EventChannel_Attributes attributes (poa, poa); attributes.disconnect_callbacks = use_callbacks; TAO_CEC_EventChannel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // **************************************************************** // Obtain the consumer admin.. CosEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // and the supplier admin.. CosEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // **************************************************************** @@ -119,51 +119,51 @@ run_test (PortableServer::POA_ptr poa, for (int i = 0; i != iterations; ++i) { - supplier_0.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_0.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_0.connect (consumer_admin.in (), - ACE_TRY_ENV); + consumer_0.connect (consumer_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (i % 2 == 1) { - supplier_1.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_1.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_1.connect (consumer_admin.in (), - ACE_TRY_ENV); + consumer_1.connect (consumer_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } - supplier_0.disconnect (ACE_TRY_ENV); + supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - consumer_0.disconnect (ACE_TRY_ENV); + consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (i % 2 == 1) { - consumer_1.disconnect (ACE_TRY_ENV); + consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - supplier_1.disconnect (ACE_TRY_ENV); + supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } - supplier_0.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_0.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_0.connect (consumer_admin.in (), - ACE_TRY_ENV); + consumer_0.connect (consumer_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&supplier_0, ACE_TRY_ENV); + deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&consumer_0, ACE_TRY_ENV); + deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&ec_impl, ACE_TRY_ENV); + deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ULong count_0 = 1; diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp index 5f817c207a5..2f661daad58 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp @@ -10,48 +10,48 @@ ACE_RCSID(CEC_Tests, MT_Disconnect, "$Id$") static void run_test (PortableServer::POA_ptr poa, - int use_callbacks, - CORBA::Environment &ACE_TRY_ENV); + int use_callbacks + TAO_ENV_ARG_DECL); int main (int argc, char* argv[]) { TAO_CEC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - run_test (poa.in (), 0, ACE_TRY_ENV); + run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - run_test (poa.in (), 1, ACE_TRY_ENV); + run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -67,33 +67,33 @@ main (int argc, char* argv[]) // **************************************************************** void -deactivate_servant (PortableServer::Servant servant, - CORBA::Environment &ACE_TRY_ENV) +deactivate_servant (PortableServer::Servant servant + TAO_ENV_ARG_DECL) { PortableServer::POA_var poa = - servant->_default_POA (ACE_TRY_ENV); + servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (servant, ACE_TRY_ENV); + poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void run_test (PortableServer::POA_ptr poa, - int use_callbacks, - CORBA::Environment &ACE_TRY_ENV) + int use_callbacks + TAO_ENV_ARG_DECL) { TAO_CEC_EventChannel_Attributes attributes (poa, poa); attributes.disconnect_callbacks = use_callbacks; TAO_CEC_EventChannel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Task task (event_channel.in (), use_callbacks); @@ -106,10 +106,10 @@ run_test (PortableServer::POA_ptr poa, // Wait for all the threads to complete and the return ACE_Thread_Manager::instance ()->wait (); - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&ec_impl, ACE_TRY_ENV); + deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -128,7 +128,7 @@ Task::svc () { ACE_TRY_NEW_ENV { - this->run_iteration (ACE_TRY_ENV); + this->run_iteration (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -141,16 +141,16 @@ Task::svc () } void -Task::run_iteration (CORBA::Environment &ACE_TRY_ENV) +Task::run_iteration (TAO_ENV_SINGLE_ARG_DECL) { // Obtain the consumer admin.. CosEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel->for_consumers (ACE_TRY_ENV); + this->event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // and the supplier admin.. CosEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->event_channel->for_suppliers (ACE_TRY_ENV); + this->event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // **************************************************************** @@ -164,38 +164,38 @@ Task::run_iteration (CORBA::Environment &ACE_TRY_ENV) for (int i = 0; i != iterations; ++i) { - supplier_0.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_0.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_0.connect (consumer_admin.in (), - ACE_TRY_ENV); + consumer_0.connect (consumer_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (i % 2 == 1) { - supplier_1.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_1.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_1.connect (consumer_admin.in (), - ACE_TRY_ENV); + consumer_1.connect (consumer_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } - supplier_0.disconnect (ACE_TRY_ENV); + supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - consumer_0.disconnect (ACE_TRY_ENV); + consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (i % 2 == 1) { - consumer_1.disconnect (ACE_TRY_ENV); + consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - supplier_1.disconnect (ACE_TRY_ENV); + supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } - deactivate_servant (&supplier_0, ACE_TRY_ENV); + deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&consumer_0, ACE_TRY_ENV); + deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ULong count_0 = 0; diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h index 683008151f8..10ad1725717 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h @@ -34,7 +34,7 @@ public: // = Check the ACE_Task_Base documentation. int svc (void); - void run_iteration (CORBA::Environment &ACE_TRY_ENV); + void run_iteration (TAO_ENV_SINGLE_ARG_DECL); // Run a single iteration of the test private: diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp index 72f83da7610..bce8e4efbc6 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp @@ -12,24 +12,24 @@ main (int argc, char* argv[]) { TAO_CEC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -38,23 +38,23 @@ main (int argc, char* argv[]) poa.in ()); TAO_CEC_EventChannel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** // Obtain the consumer admin.. CosEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. CosEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -63,32 +63,32 @@ main (int argc, char* argv[]) CEC_Counting_Supplier supplier_00; - supplier_00.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_00.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** CEC_Counting_Supplier supplier_01; - supplier_01.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_01.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** CEC_Pull_Counting_Supplier supplier_10; - supplier_10.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_10.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** CEC_Pull_Counting_Supplier supplier_11; - supplier_11.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_11.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -96,22 +96,22 @@ main (int argc, char* argv[]) // Create a consumer, intialize its RT_Info structures, and // connnect to the event channel.... CEC_Counting_Consumer consumer_00 ("Consumer/00"); - consumer_00.connect (consumer_admin.in (), - ACE_TRY_ENV); + consumer_00.connect (consumer_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** CEC_Pull_Counting_Consumer consumer_01 ("Consumer/01"); - consumer_01.connect (consumer_admin.in (), - ACE_TRY_ENV); + consumer_01.connect (consumer_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** CEC_Pull_Counting_Consumer consumer_10 ("Consumer/10"); - consumer_10.connect (consumer_admin.in (), - ACE_TRY_ENV); + consumer_10.connect (consumer_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -171,35 +171,35 @@ main (int argc, char* argv[]) // **************************************************************** - consumer_10.disconnect (ACE_TRY_ENV); + consumer_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_01.disconnect (ACE_TRY_ENV); + consumer_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_00.disconnect (ACE_TRY_ENV); + consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_11.disconnect (ACE_TRY_ENV); + supplier_11.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_10.disconnect (ACE_TRY_ENV); + supplier_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_01.disconnect (ACE_TRY_ENV); + supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_00.disconnect (ACE_TRY_ENV); + supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp index 7a3841f4f8e..cb46f224cc6 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp @@ -12,24 +12,24 @@ main (int argc, char* argv[]) { TAO_CEC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -38,23 +38,23 @@ main (int argc, char* argv[]) poa.in ()); TAO_CEC_EventChannel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** // Obtain the consumer admin.. CosEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. CosEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -63,32 +63,32 @@ main (int argc, char* argv[]) CEC_Counting_Supplier supplier_00; - supplier_00.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_00.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** CEC_Counting_Supplier supplier_01; - supplier_01.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_01.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** CEC_Counting_Supplier supplier_10; - supplier_10.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_10.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** CEC_Counting_Supplier supplier_11; - supplier_11.connect (supplier_admin.in (), - ACE_TRY_ENV); + supplier_11.connect (supplier_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -96,15 +96,15 @@ main (int argc, char* argv[]) // Create a consumer, intialize its RT_Info structures, and // connnect to the event channel.... CEC_Counting_Consumer consumer_00 ("Consumer/00"); - consumer_00.connect (consumer_admin.in (), - ACE_TRY_ENV); + consumer_00.connect (consumer_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** CEC_Counting_Consumer consumer_01 ("Consumer/01"); - consumer_01.connect (consumer_admin.in (), - ACE_TRY_ENV); + consumer_01.connect (consumer_admin.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -144,32 +144,32 @@ main (int argc, char* argv[]) // **************************************************************** - consumer_01.disconnect (ACE_TRY_ENV); + consumer_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_00.disconnect (ACE_TRY_ENV); + consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_11.disconnect (ACE_TRY_ENV); + supplier_11.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_10.disconnect (ACE_TRY_ENV); + supplier_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_01.disconnect (ACE_TRY_ENV); + supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_00.disconnect (ACE_TRY_ENV); + supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index eded9b188bf..7c3f444bf1d 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -17,16 +17,16 @@ main (int argc, char* argv[]) // **************************************************************** void -deactivate_servant (PortableServer::Servant servant, - CORBA::Environment &ACE_TRY_ENV) +deactivate_servant (PortableServer::Servant servant + TAO_ENV_ARG_DECL) { PortableServer::POA_var poa = - servant->_default_POA (ACE_TRY_ENV); + servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = - poa->servant_to_id (servant, ACE_TRY_ENV); + poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (oid.in (), ACE_TRY_ENV); + poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -42,11 +42,11 @@ RND_Driver::RND_Driver (void) int RND_Driver::run (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -103,15 +103,15 @@ RND_Driver::run (int argc, char *argv[]) // **************************************************************** CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -122,29 +122,29 @@ RND_Driver::run (int argc, char *argv[]) attributes.supplier_reconnect = 1; TAO_CEC_EventChannel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** // Obtain the consumer admin.. this->consumer_admin_ = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. this->supplier_admin_ = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - this->supplier_.connect (this->supplier_admin_.in (), - ACE_TRY_ENV); + this->supplier_.connect (this->supplier_admin_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -159,7 +159,7 @@ RND_Driver::run (int argc, char *argv[]) 1); CORBA::Object_var obj = - this->consumers_[i]->_this (ACE_TRY_ENV); + this->consumers_[i]->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -176,7 +176,7 @@ RND_Driver::run (int argc, char *argv[]) this->suppliers_[j]->activate (); CORBA::Object_var obj = - this->suppliers_[j]->_this (ACE_TRY_ENV); + this->suppliers_[j]->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -186,7 +186,7 @@ RND_Driver::run (int argc, char *argv[]) { ACE_Time_Value tv (0, 50000); orb->run (tv); - this->supplier_.push_new_event (ACE_TRY_ENV); + this->supplier_.push_new_event (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -197,10 +197,10 @@ RND_Driver::run (int argc, char *argv[]) { for (int k = 0; k != this->nsuppliers_; ++k) { - deactivate_servant (this->suppliers_[k], - ACE_TRY_ENV); + deactivate_servant (this->suppliers_[k] + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->suppliers_[k]->_remove_ref (ACE_TRY_ENV); + this->suppliers_[k]->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } delete[] this->suppliers_; @@ -211,7 +211,7 @@ RND_Driver::run (int argc, char *argv[]) // We destroy now to verify that the callbacks work and do not // produce any problems. - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -219,10 +219,10 @@ RND_Driver::run (int argc, char *argv[]) { for (int k = 0; k != this->nconsumers_; ++k) { - deactivate_servant (this->consumers_[k], - ACE_TRY_ENV); + deactivate_servant (this->consumers_[k] + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->consumers_[k]->_remove_ref (ACE_TRY_ENV); + this->consumers_[k]->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } delete[] this->consumers_; @@ -231,18 +231,18 @@ RND_Driver::run (int argc, char *argv[]) // **************************************************************** - deactivate_servant (&ec_impl, - ACE_TRY_ENV); + deactivate_servant (&ec_impl + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -255,8 +255,8 @@ RND_Driver::run (int argc, char *argv[]) } void -RND_Driver::timer (const CORBA::Any &e, - CORBA::Environment &ACE_TRY_ENV) +RND_Driver::timer (const CORBA::Any &e + TAO_ENV_ARG_DECL) { int r = ACE_OS::rand (); if (r < 0) @@ -277,7 +277,7 @@ RND_Driver::timer (const CORBA::Any &e, CORBA::Any new_event; recursion++; new_event <<= recursion; - this->supplier_.push (new_event, ACE_TRY_ENV); + this->supplier_.push (new_event TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -297,8 +297,8 @@ RND_Driver::timer (const CORBA::Any &e, // ACE_DEBUG ((LM_DEBUG, "Connecting supplier %d\n", n)); - this->suppliers_[n]->connect (this->supplier_admin_.in (), - ACE_TRY_ENV); + this->suppliers_[n]->connect (this->supplier_admin_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } break; @@ -309,8 +309,8 @@ RND_Driver::timer (const CORBA::Any &e, // ACE_DEBUG ((LM_DEBUG, "Connecting consumer %d\n", n)); - this->consumers_[n]->connect (this->consumer_admin_.in (), - ACE_TRY_ENV); + this->consumers_[n]->connect (this->consumer_admin_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } break; @@ -321,7 +321,7 @@ RND_Driver::timer (const CORBA::Any &e, // ACE_DEBUG ((LM_DEBUG, "Disconnecting supplier %d\n", n)); - this->suppliers_[n]->disconnect (ACE_TRY_ENV); + this->suppliers_[n]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } break; @@ -332,7 +332,7 @@ RND_Driver::timer (const CORBA::Any &e, // ACE_DEBUG ((LM_DEBUG, "Disconnecting consumer %d\n", n)); - this->consumers_[n]->disconnect (ACE_TRY_ENV); + this->consumers_[n]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } break; @@ -340,17 +340,17 @@ RND_Driver::timer (const CORBA::Any &e, } void -RND_Driver::event (const CORBA::Any &e, - CORBA::Environment &ACE_TRY_ENV) +RND_Driver::event (const CORBA::Any &e + TAO_ENV_ARG_DECL) { - this->timer (e, ACE_TRY_ENV); + this->timer (e TAO_ENV_ARG_PARAMETER); } // **************************************************************** void -RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin, - CORBA::Environment &ACE_TRY_ENV) +RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin + TAO_ENV_ARG_DECL) { CosEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -358,43 +358,43 @@ RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin, if (CORBA::is_nil (this->proxy_.in ())) { - this->proxy_ = admin->obtain_push_supplier (ACE_TRY_ENV); + this->proxy_ = admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } proxy = CosEventChannelAdmin::ProxyPushSupplier::_duplicate(this->proxy_.in ()); } CosEventComm::PushConsumer_var me = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - proxy->connect_push_consumer (me.in (), - ACE_TRY_ENV); + proxy->connect_push_consumer (me.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -RND_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +RND_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) return; - this->proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_ = CosEventChannelAdmin::ProxyPushSupplier::_nil (); } void -RND_Consumer::push (const CORBA::Any &event, - CORBA::Environment &ACE_TRY_ENV) +RND_Consumer::push (const CORBA::Any &event + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->event (event, ACE_TRY_ENV); + this->driver_->event (event TAO_ENV_ARG_PARAMETER); } void -RND_Consumer::disconnect_push_consumer (CORBA::Environment &) +RND_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -402,8 +402,8 @@ RND_Consumer::disconnect_push_consumer (CORBA::Environment &) // **************************************************************** void -RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin, - CORBA::Environment &ACE_TRY_ENV) +RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin + TAO_ENV_ARG_DECL) { CosEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -411,7 +411,7 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin, if (CORBA::is_nil (this->proxy_.in ())) { - this->proxy_ = admin->obtain_push_consumer (ACE_TRY_ENV); + this->proxy_ = admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -423,40 +423,40 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin, int r = ACE_OS::rand () % 2; if (r == 0) { - me = this->_this (ACE_TRY_ENV); + me = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - proxy->connect_push_supplier (me.in (), - ACE_TRY_ENV); + proxy->connect_push_supplier (me.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -RND_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +RND_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) return; - this->proxy_->disconnect_push_consumer (ACE_TRY_ENV); + this->proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_ = CosEventChannelAdmin::ProxyPushConsumer::_nil (); } void -RND_Supplier::push_new_event (CORBA::Environment &ACE_TRY_ENV) +RND_Supplier::push_new_event (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Any event; CORBA::Long recursion = 0; event <<= recursion; - this->push (event, ACE_TRY_ENV); + this->push (event TAO_ENV_ARG_PARAMETER); } void -RND_Supplier::push (CORBA::Any &event, - CORBA::Environment &ACE_TRY_ENV) +RND_Supplier::push (CORBA::Any &event + TAO_ENV_ARG_DECL) { CosEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -469,11 +469,11 @@ RND_Supplier::push (CORBA::Any &event, CosEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ()); } - proxy->push (event, ACE_TRY_ENV); + proxy->push (event TAO_ENV_ARG_PARAMETER); } void -RND_Supplier::disconnect_push_supplier (CORBA::Environment &) +RND_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -486,13 +486,13 @@ RND_Supplier::svc (void) int niterations = 5000; for (int i = 0; i != niterations; ++i) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { ACE_Time_Value tv (0, 10000); ACE_OS::sleep (tv); - this->push_new_event (ACE_TRY_ENV); + this->push_new_event (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h index 3a113cdee5a..d2ee42666bb 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h @@ -47,15 +47,15 @@ public: RND_Consumer (RND_Driver *driver); // Constructor - void push (const CORBA::Any &event, - CORBA::Environment &ACE_TRY_ENV) + void push (const CORBA::Any &event + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) + void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin, - CORBA::Environment &ACE_TRY_ENV); - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin + TAO_ENV_ARG_DECL); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); protected: RND_Driver *driver_; @@ -81,8 +81,8 @@ class RND_Timer : public RND_Consumer public: RND_Timer (RND_Driver *driver); - void push (const CORBA::Any &event, - CORBA::Environment &ACE_TRY_ENV) + void push (const CORBA::Any &event + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -108,16 +108,16 @@ public: RND_Supplier (void); // Constructor - void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin, - CORBA::Environment &ACE_TRY_ENV); - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin + TAO_ENV_ARG_DECL); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); - void push_new_event (CORBA::Environment &ACE_TRY_ENV); - void push (CORBA::Any &event, - CORBA::Environment &ACE_TRY_ENV); + void push_new_event (TAO_ENV_SINGLE_ARG_DECL); + void push (CORBA::Any &event + TAO_ENV_ARG_DECL); // Push a single event... - virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int svc (void); @@ -146,12 +146,12 @@ public: int run (int argc, char *argv[]); // Run the test - void timer (const CORBA::Any &e, - CORBA::Environment &ACE_TRY_ENV); + void timer (const CORBA::Any &e + TAO_ENV_ARG_DECL); // The main timer has expired - void event (const CORBA::Any &e, - CORBA::Environment &ACE_TRY_ENV); + void event (const CORBA::Any &e + TAO_ENV_ARG_DECL); // One of the consumers has received an event private: diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp index eb3cbcffe51..fa56d3cc978 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp @@ -8,48 +8,48 @@ ACE_RCSID(CEC_Tests_Basic, Shutdown, "$Id$") static void run_test (PortableServer::POA_ptr poa, - int with_callbacks, - CORBA::Environment &ACE_TRY_ENV); + int with_callbacks + TAO_ENV_ARG_DECL); int main (int argc, char* argv[]) { TAO_CEC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - run_test (poa.in (), 0, ACE_TRY_ENV); + run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - run_test (poa.in (), 1, ACE_TRY_ENV); + run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -62,46 +62,46 @@ main (int argc, char* argv[]) } void -deactivate_servant (PortableServer::Servant servant, - CORBA::Environment &ACE_TRY_ENV) +deactivate_servant (PortableServer::Servant servant + TAO_ENV_ARG_DECL) { PortableServer::POA_var poa = - servant->_default_POA (ACE_TRY_ENV); + servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (servant, ACE_TRY_ENV); + poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } static void run_test (PortableServer::POA_ptr poa, - int with_callbacks, - CORBA::Environment &ACE_TRY_ENV) + int with_callbacks + TAO_ENV_ARG_DECL) { TAO_CEC_EventChannel_Attributes attributes (poa, poa); attributes.disconnect_callbacks = with_callbacks; TAO_CEC_EventChannel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // **************************************************************** // Obtain the consumer admin.. CosEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Obtain the supplier admin.. CosEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // **************************************************************** @@ -126,10 +126,10 @@ run_test (PortableServer::POA_ptr poa, for (i = 0; i != n; ++i) { - consumer[i]->connect (consumer_admin.in (), ACE_TRY_ENV); + consumer[i]->connect (consumer_admin.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier[i]->connect (supplier_admin.in (), ACE_TRY_ENV); + supplier[i]->connect (supplier_admin.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -137,7 +137,7 @@ run_test (PortableServer::POA_ptr poa, // Destroy the event channel, *before* disconnecting the // clients. - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // **************************************************************** @@ -163,18 +163,18 @@ run_test (PortableServer::POA_ptr poa, for (i = 0; i != n; ++i) { - deactivate_servant (supplier[i], ACE_TRY_ENV); + deactivate_servant (supplier[i] TAO_ENV_ARG_PARAMETER); ACE_CHECK; delete supplier[i]; - deactivate_servant (consumer[i], ACE_TRY_ENV); + deactivate_servant (consumer[i] TAO_ENV_ARG_PARAMETER); ACE_CHECK; delete consumer[i]; } delete[] supplier; delete[] consumer; - deactivate_servant (&ec_impl, ACE_TRY_ENV); + deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp index 03b818763a6..997b18880c4 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp @@ -12,43 +12,43 @@ CEC_Counting_Consumer::CEC_Counting_Consumer (const char* name) } void -CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - CORBA::Environment &ACE_TRY_ENV) +CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin + TAO_ENV_ARG_DECL) { // The canonical protocol to connect to the EC CosEventComm::PushConsumer_var consumer = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->supplier_proxy_.in ())) { this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - this->supplier_proxy_->connect_push_consumer (consumer.in (), - ACE_TRY_ENV); + this->supplier_proxy_->connect_push_consumer (consumer.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -CEC_Counting_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +CEC_Counting_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->supplier_proxy_.in ())) { - this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } PortableServer::POA_var consumer_poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (this, ACE_TRY_ENV); + consumer_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_poa->deactivate_object (consumer_id.in (), ACE_TRY_ENV); + consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -76,8 +76,8 @@ CEC_Counting_Consumer::dump_results (int expected_count, int tolerance) } void -CEC_Counting_Consumer::push (const CORBA::Any&, - CORBA::Environment &) +CEC_Counting_Consumer::push (const CORBA::Any& + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->event_count ++; @@ -93,7 +93,7 @@ CEC_Counting_Consumer::push (const CORBA::Any&, } void -CEC_Counting_Consumer::disconnect_push_consumer (CORBA::Environment &) +CEC_Counting_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->disconnect_count++; @@ -111,43 +111,43 @@ CEC_Pull_Counting_Consumer::CEC_Pull_Counting_Consumer (const char* name) } void -CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - CORBA::Environment &ACE_TRY_ENV) +CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin + TAO_ENV_ARG_DECL) { // The canonical protocol to connect to the EC CosEventComm::PullConsumer_var consumer = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->supplier_proxy_.in ())) { this->supplier_proxy_ = - consumer_admin->obtain_pull_supplier (ACE_TRY_ENV); + consumer_admin->obtain_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - this->supplier_proxy_->connect_pull_consumer (consumer.in (), - ACE_TRY_ENV); + this->supplier_proxy_->connect_pull_consumer (consumer.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -CEC_Pull_Counting_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +CEC_Pull_Counting_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->supplier_proxy_.in ())) { - this->supplier_proxy_->disconnect_pull_supplier (ACE_TRY_ENV); + this->supplier_proxy_->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } PortableServer::POA_var consumer_poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (this, ACE_TRY_ENV); + consumer_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_poa->deactivate_object (consumer_id.in (), ACE_TRY_ENV); + consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -155,19 +155,19 @@ CEC_Pull_Counting_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) } CORBA::Any* -CEC_Pull_Counting_Consumer::pull (CORBA::Environment &ACE_TRY_ENV) +CEC_Pull_Counting_Consumer::pull (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ())) { return 0; } this->event_count++; - return this->supplier_proxy_->pull (ACE_TRY_ENV); + return this->supplier_proxy_->pull (TAO_ENV_SINGLE_ARG_PARAMETER); } CORBA::Any* -CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event, - CORBA::Environment &ACE_TRY_ENV) +CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event + TAO_ENV_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ())) { @@ -176,7 +176,7 @@ CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event, } CORBA::Any_var event = - this->supplier_proxy_->try_pull (has_event, ACE_TRY_ENV); + this->supplier_proxy_->try_pull (has_event TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (has_event) @@ -206,7 +206,7 @@ CEC_Pull_Counting_Consumer::dump_results (int expected_count, int tolerance) } void -CEC_Pull_Counting_Consumer::disconnect_pull_consumer (CORBA::Environment &) +CEC_Pull_Counting_Consumer::disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->disconnect_count++; @@ -231,7 +231,7 @@ CEC_Counting_Consumer_Task::svc () { ACE_TRY_NEW_ENV { - this->run (ACE_TRY_ENV); + this->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -256,7 +256,7 @@ CEC_Counting_Consumer_Task::pull_count (void) } void -CEC_Counting_Consumer_Task::run (CORBA::Environment &ACE_TRY_ENV) +CEC_Counting_Consumer_Task::run (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Any event; event <<= CORBA::Long(0); @@ -265,8 +265,8 @@ CEC_Counting_Consumer_Task::run (CORBA::Environment &ACE_TRY_ENV) do { CORBA::Boolean has_event; CORBA::Any_var event = - this->consumer_->try_pull (has_event, - ACE_TRY_ENV); + this->consumer_->try_pull (has_event + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->milliseconds_ != 0) diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h index 10c921c6693..2d6d5f671e2 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h @@ -39,9 +39,9 @@ public: CEC_Counting_Consumer (const char* name); // Constructor - void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - CORBA::Environment &ACE_TRY_ENV); - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin + TAO_ENV_ARG_DECL); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Simple connect/disconnect methods.. void dump_results (int expected_count, int tolerance); @@ -50,10 +50,10 @@ public: // = The CosEventComm::PushConsumer methods - virtual void push (const CORBA::Any& events, - CORBA::Environment &_env) + virtual void push (const CORBA::Any& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. @@ -85,21 +85,21 @@ public: CEC_Pull_Counting_Consumer (const char* name); // Constructor - void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - CORBA::Environment &ACE_TRY_ENV); - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin + TAO_ENV_ARG_DECL); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Simple connect/disconnect methods.. void dump_results (int expected_count, int tolerance); // Print out an error message if the event count is too far from the // expected count. - CORBA::Any *pull (CORBA::Environment &ACE_TRY_ENV); - CORBA::Any *try_pull (CORBA::Boolean_out has_event, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Any *pull (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Any *try_pull (CORBA::Boolean_out has_event + TAO_ENV_ARG_DECL); // = The CosEventComm::PullConsumer methods - virtual void disconnect_pull_consumer (CORBA::Environment &) + virtual void disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. @@ -132,7 +132,7 @@ public: void stop (void); CORBA::ULong pull_count (void); - void run (CORBA::Environment &ACE_TRY_ENV); + void run (TAO_ENV_SINGLE_ARG_DECL); // Run a single iteration of the test private: diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp index 774f3177df8..80f15496418 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp @@ -12,41 +12,41 @@ CEC_Counting_Supplier::CEC_Counting_Supplier (void) void CEC_Counting_Supplier::connect ( - CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - CORBA::Environment &ACE_TRY_ENV) + CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin + TAO_ENV_ARG_DECL) { CosEventComm::PushSupplier_var supplier = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->consumer_proxy_.in ())) { this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - this->consumer_proxy_->connect_push_supplier (supplier.in (), - ACE_TRY_ENV); + this->consumer_proxy_->connect_push_supplier (supplier.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -CEC_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +CEC_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->consumer_proxy_.in ())) { - this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV); + this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } PortableServer::POA_var supplier_poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var supplier_id = - supplier_poa->servant_to_id (this, ACE_TRY_ENV); + supplier_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_poa->deactivate_object (supplier_id.in (), ACE_TRY_ENV); + supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = @@ -54,8 +54,8 @@ CEC_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) } void -CEC_Counting_Supplier::push (const CORBA::Any&, - CORBA::Environment &ACE_TRY_ENV) +CEC_Counting_Supplier::push (const CORBA::Any& + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->consumer_proxy_.in ())) @@ -64,13 +64,13 @@ CEC_Counting_Supplier::push (const CORBA::Any&, CORBA::Any event; event <<= CORBA::Long(0); - this->consumer_proxy_->push (event, ACE_TRY_ENV); + this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->event_count++; } void -CEC_Counting_Supplier::disconnect_push_supplier (CORBA::Environment &) +CEC_Counting_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->disconnect_count++; @@ -95,7 +95,7 @@ CEC_Counting_Supplier_Task::svc () { ACE_TRY_NEW_ENV { - this->run (ACE_TRY_ENV); + this->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -120,14 +120,14 @@ CEC_Counting_Supplier_Task::push_count (void) } void -CEC_Counting_Supplier_Task::run (CORBA::Environment &ACE_TRY_ENV) +CEC_Counting_Supplier_Task::run (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Any event; event <<= CORBA::Long(0); int stop = 0; do { - this->supplier_->push (event, ACE_TRY_ENV); + this->supplier_->push (event TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->milliseconds_ != 0) @@ -159,41 +159,41 @@ CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier (void) void CEC_Pull_Counting_Supplier::connect ( - CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - CORBA::Environment &ACE_TRY_ENV) + CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin + TAO_ENV_ARG_DECL) { CosEventComm::PullSupplier_var supplier = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->consumer_proxy_.in ())) { this->consumer_proxy_ = - supplier_admin->obtain_pull_consumer (ACE_TRY_ENV); + supplier_admin->obtain_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - this->consumer_proxy_->connect_pull_supplier (supplier.in (), - ACE_TRY_ENV); + this->consumer_proxy_->connect_pull_supplier (supplier.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -CEC_Pull_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +CEC_Pull_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->consumer_proxy_.in ())) { - this->consumer_proxy_->disconnect_pull_consumer (ACE_TRY_ENV); + this->consumer_proxy_->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } PortableServer::POA_var supplier_poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var supplier_id = - supplier_poa->servant_to_id (this, ACE_TRY_ENV); + supplier_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_poa->deactivate_object (supplier_id.in (), ACE_TRY_ENV); + supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = @@ -201,7 +201,7 @@ CEC_Pull_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) } CORBA::Any* -CEC_Pull_Counting_Supplier::pull (CORBA::Environment &ACE_TRY_ENV) +CEC_Pull_Counting_Supplier::pull (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)) { if (CORBA::is_nil (this->consumer_proxy_.in ())) @@ -221,8 +221,8 @@ CEC_Pull_Counting_Supplier::pull (CORBA::Environment &ACE_TRY_ENV) } CORBA::Any* -CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event, - CORBA::Environment &ACE_TRY_ENV) +CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)) { if (CORBA::is_nil (this->consumer_proxy_.in ())) @@ -247,7 +247,7 @@ CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event, } void -CEC_Pull_Counting_Supplier::disconnect_pull_supplier (CORBA::Environment &) +CEC_Pull_Counting_Supplier::disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->disconnect_count++; diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h index 357714a81d5..41fd430d1e3 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h @@ -41,17 +41,17 @@ public: // = The CosEventComm::PushSupplier methods - void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - CORBA::Environment &ACE_TRY_ENV); - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin + TAO_ENV_ARG_DECL); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Simple connect/disconnect methods.. - void push (const CORBA::Any& events, - CORBA::Environment &_env) + void push (const CORBA::Any& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Push an event. - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. @@ -79,7 +79,7 @@ public: void stop (void); CORBA::ULong push_count (void); - void run (CORBA::Environment &ACE_TRY_ENV); + void run (TAO_ENV_SINGLE_ARG_DECL); // Run a single iteration of the test private: @@ -115,18 +115,18 @@ public: // = The CosEventComm::PullSupplier methods - void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - CORBA::Environment &ACE_TRY_ENV); - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin + TAO_ENV_ARG_DECL); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Simple connect/disconnect methods.. // The PullSupplier methods. - CORBA::Any* pull (CORBA::Environment &_env) + CORBA::Any* pull (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); - CORBA::Any* try_pull (CORBA::Boolean_out has_event, - CORBA::Environment &_env) + CORBA::Any* try_pull (CORBA::Boolean_out has_event + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected)); - virtual void disconnect_pull_supplier (CORBA::Environment &) + virtual void disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::ULong event_count; diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp index e79c368a94c..38e9df2019e 100644 --- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp +++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp @@ -39,19 +39,19 @@ ECB_Driver::ECB_Driver (void) int ECB_Driver::run (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { this->orb_ = CORBA::ORB_init (argc, argv, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -60,12 +60,12 @@ ECB_Driver::run (int argc, char* argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv)) @@ -91,12 +91,12 @@ ECB_Driver::run (int argc, char* argv[]) ACE_Config_Scheduler scheduler_impl; RtecScheduler::Scheduler_var scheduler = - scheduler_impl._this (ACE_TRY_ENV); + scheduler_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = - this->orb_->object_to_string (scheduler.in (), - ACE_TRY_ENV); + this->orb_->object_to_string (scheduler.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "EC_Basic: The (local) scheduler IOR is <%s>\n", @@ -112,22 +112,22 @@ ECB_Driver::run (int argc, char* argv[]) // Register Event_Service with the Naming Service. RtecEventChannelAdmin::EventChannel_var ec = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - str = this->orb_->object_to_string (ec.in (), - ACE_TRY_ENV); + str = this->orb_->object_to_string (ec.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "EC_Basic: The (local) EC IOR is <%s>\n", str.in ())); - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var local_ec = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ec_impl.activate (); @@ -141,8 +141,8 @@ ECB_Driver::run (int argc, char* argv[]) ECB_SupplierID_Test supplier_id_test; supplier_id_test.run (this->orb_.in (), local_ec.in (), - scheduler.in (), - ACE_TRY_ENV); + scheduler.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (supplier_id_test.dump_results () != 0) @@ -158,8 +158,8 @@ ECB_Driver::run (int argc, char* argv[]) ECB_Correlation_Test correlation_test; correlation_test.run (this->orb_.in (), local_ec.in (), - scheduler.in (), - ACE_TRY_ENV); + scheduler.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (correlation_test.dump_results () != 0) @@ -233,11 +233,11 @@ ECB_Consumer::ECB_Consumer (ECB_Test *test, void ECB_Consumer::open (const char* name, RtecEventChannelAdmin::EventChannel_ptr ec, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment& ACE_TRY_ENV) + RtecScheduler::Scheduler_ptr scheduler + TAO_ENV_ARG_DECL) { this->rt_info_ = - scheduler->create (name, ACE_TRY_ENV); + scheduler->create (name TAO_ENV_ARG_PARAMETER); ACE_CHECK; // The worst case execution time is far less than 2 @@ -252,37 +252,37 @@ ECB_Consumer::open (const char* name, RtecScheduler::VERY_LOW_IMPORTANCE, time, 0, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // = Connect as a consumer. - this->consumer_admin_ = ec->for_consumers (ACE_TRY_ENV); + this->consumer_admin_ = ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -ECB_Consumer::connect (const RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment& ACE_TRY_ENV) +ECB_Consumer::connect (const RtecEventChannelAdmin::ConsumerQOS& qos + TAO_ENV_ARG_DECL) { if (CORBA::is_nil (this->consumer_admin_.in ())) return; - RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV); + RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - this->consumer_admin_->obtain_push_supplier (ACE_TRY_ENV); + this->consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_->connect_push_consumer (objref.in (), - qos, - ACE_TRY_ENV); + qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECB_Consumer::disconnect (CORBA::Environment& ACE_TRY_ENV) +ECB_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ()) || CORBA::is_nil (this->consumer_admin_.in ())) @@ -290,31 +290,31 @@ ECB_Consumer::disconnect (CORBA::Environment& ACE_TRY_ENV) RtecEventChannelAdmin::ProxyPushSupplier_var tmp = this->supplier_proxy_._retn (); - tmp->disconnect_push_supplier (ACE_TRY_ENV); + tmp->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -ECB_Consumer::close (CORBA::Environment &ACE_TRY_ENV) +ECB_Consumer::close (TAO_ENV_SINGLE_ARG_DECL) { - this->disconnect (ACE_TRY_ENV); + this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_admin_ = RtecEventChannelAdmin::ConsumerAdmin::_nil (); } void -ECB_Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &ACE_TRY_ENV) +ECB_Consumer::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->test_->push (this->consumer_id_, - events, - ACE_TRY_ENV); + events + TAO_ENV_ARG_PARAMETER); } void -ECB_Consumer::disconnect_push_consumer (CORBA::Environment &) +ECB_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -331,11 +331,11 @@ ECB_Supplier::ECB_Supplier (ECB_Test *test, void ECB_Supplier::open (const char* name, RtecEventChannelAdmin::EventChannel_ptr ec, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Scheduler_ptr scheduler + TAO_ENV_ARG_DECL) { this->rt_info_ = - scheduler->create (name, ACE_TRY_ENV); + scheduler->create (name TAO_ENV_ARG_PARAMETER); ACE_CHECK; // The execution times are set to reasonable values, but actually @@ -353,48 +353,48 @@ ECB_Supplier::open (const char* name, RtecScheduler::VERY_LOW_IMPORTANCE, time, 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // = Connect as a consumer. - this->supplier_admin_ = ec->for_suppliers (ACE_TRY_ENV); + this->supplier_admin_ = ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -ECB_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos, - CORBA::Environment& ACE_TRY_ENV) +ECB_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos + TAO_ENV_ARG_DECL) { if (CORBA::is_nil (this->supplier_admin_.in ())) return; this->consumer_proxy_ = - this->supplier_admin_->obtain_push_consumer (ACE_TRY_ENV); + this->supplier_admin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - RtecEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV); + RtecEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_->connect_push_supplier (objref.in (), - qos, - ACE_TRY_ENV); + qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECB_Supplier::disconnect (CORBA::Environment& ACE_TRY_ENV) +ECB_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; RtecEventChannelAdmin::ProxyPushConsumer_var proxy = this->consumer_proxy_._retn (); - proxy->disconnect_push_consumer (ACE_TRY_ENV); + proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); } void -ECB_Supplier::close (CORBA::Environment &ACE_TRY_ENV) +ECB_Supplier::close (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_admin_.in ())) return; @@ -402,22 +402,22 @@ ECB_Supplier::close (CORBA::Environment &ACE_TRY_ENV) this->supplier_admin_ = RtecEventChannelAdmin::SupplierAdmin::_nil (); - this->disconnect (ACE_TRY_ENV); + this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); } void -ECB_Supplier::send_event (RtecEventComm::EventSet& events, - CORBA::Environment& ACE_TRY_ENV) +ECB_Supplier::send_event (RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) { // RtecEventComm::EventSet copy = events; - this->consumer_proxy_->push (events, ACE_TRY_ENV); + this->consumer_proxy_->push (events TAO_ENV_ARG_PARAMETER); } void -ECB_Supplier::disconnect_push_supplier (CORBA::Environment& /* ACE_TRY_ENV */) +ECB_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { - // this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + // this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); } // **************************************************************** @@ -433,8 +433,8 @@ ECB_SupplierID_Test::ECB_SupplierID_Test (void) void ECB_SupplierID_Test::run (CORBA::ORB_ptr orb, RtecEventChannelAdmin::EventChannel_ptr ec, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment& ACE_TRY_ENV) + RtecScheduler::Scheduler_ptr scheduler + TAO_ENV_ARG_DECL) { ACE_UNUSED_ARG (orb); @@ -449,23 +449,23 @@ ECB_SupplierID_Test::run (CORBA::ORB_ptr orb, // Startup this->consumer0_.open ("SupplierID/consumer0", ec, - scheduler, - ACE_TRY_ENV); + scheduler + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->consumer1_.open ("SupplierID/consumer1", ec, - scheduler, - ACE_TRY_ENV); + scheduler + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->supplier0_.open ("SupplierID/supplier0", ec, - scheduler, - ACE_TRY_ENV); + scheduler + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->supplier1_.open ("SupplierID/supplier1", ec, - scheduler, - ACE_TRY_ENV); + scheduler + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Precompute the QoS for the consumers and suppliers. @@ -509,130 +509,130 @@ ECB_SupplierID_Test::run (CORBA::ORB_ptr orb, // multiple suppliers with the same ID... this->phase_ = ECB_SupplierID_Test::PHASE_0; - this->consumer0_.connect (consumer0_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + this->consumer0_.connect (consumer0_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer1_.connect (consumer1_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + this->consumer1_.connect (consumer1_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier0_.connect (supplier0_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier1_.connect (supplier1_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) { - this->supplier0_.send_event (events, ACE_TRY_ENV); + this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (events, ACE_TRY_ENV); + this->supplier1_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // PHASE 1, test disconnection of a single supplier. this->phase_ = ECB_SupplierID_Test::PHASE_1; - this->supplier1_.disconnect (ACE_TRY_ENV); + this->supplier1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) { - this->supplier0_.send_event (events, ACE_TRY_ENV); + this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // PHASE 2, test reconnection of the supplier. this->phase_ = ECB_SupplierID_Test::PHASE_2; - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier1_.connect (supplier1_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) { - this->supplier0_.send_event (events, ACE_TRY_ENV); + this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (events, ACE_TRY_ENV); + this->supplier1_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // PHASE 3, test disconnect of one consumer this->phase_ = ECB_SupplierID_Test::PHASE_3; - this->consumer1_.disconnect (ACE_TRY_ENV); + this->consumer1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) { - this->supplier0_.send_event (events, ACE_TRY_ENV); + this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (events, ACE_TRY_ENV); + this->supplier1_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // PHASE 4, test reconnection of one consumer this->phase_ = ECB_SupplierID_Test::PHASE_4; - this->consumer1_.connect (consumer1_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + this->consumer1_.connect (consumer1_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) { - this->supplier0_.send_event (events, ACE_TRY_ENV); + this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (events, ACE_TRY_ENV); + this->supplier1_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // PHASE 5, test disconnection of two consumers. this->phase_ = ECB_SupplierID_Test::PHASE_5; - this->consumer0_.disconnect (ACE_TRY_ENV); + this->consumer0_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer1_.disconnect (ACE_TRY_ENV); + this->consumer1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) { - this->supplier0_.send_event (events, ACE_TRY_ENV); + this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (events, ACE_TRY_ENV); + this->supplier1_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // PHASE 6, test reconnection of two consumers. this->phase_ = ECB_SupplierID_Test::PHASE_6; - this->consumer0_.connect (consumer0_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + this->consumer0_.connect (consumer0_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer1_.connect (consumer1_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + this->consumer1_.connect (consumer1_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) { - this->supplier0_.send_event (events, ACE_TRY_ENV); + this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (events, ACE_TRY_ENV); + this->supplier1_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // PHASE 7, test disconnect/reconnect of both suppliers. this->phase_ = ECB_SupplierID_Test::PHASE_7; - this->supplier0_.disconnect (ACE_TRY_ENV); + this->supplier0_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.disconnect (ACE_TRY_ENV); + this->supplier1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier0_.connect (supplier0_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier1_.connect (supplier1_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) { - this->supplier0_.send_event (events, ACE_TRY_ENV); + this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (events, ACE_TRY_ENV); + this->supplier1_.send_event (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -640,13 +640,13 @@ ECB_SupplierID_Test::run (CORBA::ORB_ptr orb, this->phase_ = ECB_SupplierID_Test::PHASE_END; // Finish - this->supplier1_.close (ACE_TRY_ENV); + this->supplier1_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.close (ACE_TRY_ENV); + this->supplier0_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer1_.close (ACE_TRY_ENV); + this->consumer1_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer0_.close (ACE_TRY_ENV); + this->consumer0_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -704,8 +704,8 @@ ECB_SupplierID_Test::dump_results (void) void ECB_SupplierID_Test::push (int consumer_id, - const RtecEventComm::EventSet &, - CORBA::Environment &) + const RtecEventComm::EventSet & + TAO_ENV_ARG_DECL_NOT_USED) { switch (this->phase_) { @@ -763,8 +763,8 @@ ECB_Correlation_Test::ECB_Correlation_Test (void) void ECB_Correlation_Test::run (CORBA::ORB_ptr orb, RtecEventChannelAdmin::EventChannel_ptr ec, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment& ACE_TRY_ENV) + RtecScheduler::Scheduler_ptr scheduler + TAO_ENV_ARG_DECL) { ACE_UNUSED_ARG (orb); @@ -779,18 +779,18 @@ ECB_Correlation_Test::run (CORBA::ORB_ptr orb, // Startup this->consumer_.open ("Correlation/consumer", ec, - scheduler, - ACE_TRY_ENV); + scheduler + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->supplier0_.open ("Correlation/supplier0", ec, - scheduler, - ACE_TRY_ENV); + scheduler + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->supplier1_.open ("Correlation/supplier1", ec, - scheduler, - ACE_TRY_ENV); + scheduler + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Precompute the QoS for the consumers and suppliers. @@ -872,163 +872,163 @@ ECB_Correlation_Test::run (CORBA::ORB_ptr orb, // PHASE 0 this->phase_ = ECB_Correlation_Test::PHASE_0; - this->consumer_.connect (consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + this->consumer_.connect (consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier0_.connect (supplier0_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier1_.connect (supplier1_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i) { - this->supplier0_.send_event (event_a, ACE_TRY_ENV); + this->supplier0_.send_event (event_a TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (event_b, ACE_TRY_ENV); + this->supplier1_.send_event (event_b TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // PHASE 1, test disconnection of a single supplier. this->phase_ = ECB_Correlation_Test::PHASE_1; - this->consumer_.disconnect (ACE_TRY_ENV); + this->consumer_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.disconnect (ACE_TRY_ENV); + this->supplier0_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.disconnect (ACE_TRY_ENV); + this->supplier1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_.connect (consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + this->consumer_.connect (consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier0_.connect (supplier0_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier1_.connect (supplier1_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i) { - this->supplier0_.send_event (event_ab, ACE_TRY_ENV); + this->supplier0_.send_event (event_ab TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (event_ab, ACE_TRY_ENV); + this->supplier1_.send_event (event_ab TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // PHASE 2, test reconnection of the supplier. this->phase_ = ECB_Correlation_Test::PHASE_2; - this->consumer_.disconnect (ACE_TRY_ENV); + this->consumer_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.disconnect (ACE_TRY_ENV); + this->supplier0_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.disconnect (ACE_TRY_ENV); + this->supplier1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_.connect (consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + this->consumer_.connect (consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier0_.connect (supplier0_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier1_.connect (supplier1_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i) { - this->supplier0_.send_event (event_a, ACE_TRY_ENV); + this->supplier0_.send_event (event_a TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (event_b, ACE_TRY_ENV); + this->supplier1_.send_event (event_b TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.send_event (event_b, ACE_TRY_ENV); + this->supplier0_.send_event (event_b TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (event_a, ACE_TRY_ENV); + this->supplier1_.send_event (event_a TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // PHASE 3 this->phase_ = ECB_Correlation_Test::PHASE_3; - this->consumer_.disconnect (ACE_TRY_ENV); + this->consumer_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.disconnect (ACE_TRY_ENV); + this->supplier0_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.disconnect (ACE_TRY_ENV); + this->supplier1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_.connect (consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + this->consumer_.connect (consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier0_.connect (supplier0_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier1_.connect (supplier1_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i) { - this->supplier0_.send_event (event_a, ACE_TRY_ENV); + this->supplier0_.send_event (event_a TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (event_ab, ACE_TRY_ENV); + this->supplier1_.send_event (event_ab TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // PHASE 4 this->phase_ = ECB_Correlation_Test::PHASE_4; - this->consumer_.disconnect (ACE_TRY_ENV); + this->consumer_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.disconnect (ACE_TRY_ENV); + this->supplier0_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.disconnect (ACE_TRY_ENV); + this->supplier1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_.connect (consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + this->consumer_.connect (consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier0_.connect (supplier0_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier1_.connect (supplier1_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i) { - this->supplier0_.send_event (event_a, ACE_TRY_ENV); + this->supplier0_.send_event (event_a TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (event_a, ACE_TRY_ENV); + this->supplier1_.send_event (event_a TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (event_b, ACE_TRY_ENV); + this->supplier1_.send_event (event_b TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // PHASE 5 this->phase_ = ECB_Correlation_Test::PHASE_5; - this->consumer_.disconnect (ACE_TRY_ENV); + this->consumer_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.disconnect (ACE_TRY_ENV); + this->supplier0_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.disconnect (ACE_TRY_ENV); + this->supplier1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_.connect (consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + this->consumer_.connect (consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier0_.connect (supplier0_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - ACE_TRY_ENV); + this->supplier1_.connect (supplier1_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i) { - this->supplier0_.send_event (event_a, ACE_TRY_ENV); + this->supplier0_.send_event (event_a TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier1_.send_event (event_a, ACE_TRY_ENV); + this->supplier1_.send_event (event_a TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1036,11 +1036,11 @@ ECB_Correlation_Test::run (CORBA::ORB_ptr orb, this->phase_ = ECB_Correlation_Test::PHASE_END; // Finish - this->supplier1_.close (ACE_TRY_ENV); + this->supplier1_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier0_.close (ACE_TRY_ENV); + this->supplier0_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_.close (ACE_TRY_ENV); + this->consumer_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -1097,8 +1097,8 @@ ECB_Correlation_Test::dump_results (void) void ECB_Correlation_Test::push (int, - const RtecEventComm::EventSet& events, - CORBA::Environment &) + const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL_NOT_USED) { if (events.length () != 2) { diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h index 1ea8ce9f1aa..b2d0f9b64b7 100644 --- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h +++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h @@ -46,7 +46,7 @@ public: // Run the test. private: - int shutdown (CORBA::Environment&); + int shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Called when the main thread is about to shutdown. int parse_args (int argc, char* argv[]); @@ -84,8 +84,8 @@ public: // Destructor virtual void push (int consumer_number, - const RtecEventComm::EventSet& events, - CORBA::Environment &_env) = 0; + const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) = 0; // The callback from the Consumer.... }; @@ -105,27 +105,27 @@ public: void open (const char* name, RtecEventChannelAdmin::EventChannel_ptr event_channel, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment& _env); + RtecScheduler::Scheduler_ptr scheduler + TAO_ENV_ARG_DECL); // This method connects the consumer to the EC. - void close (CORBA::Environment &_env); + void close (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. RtecScheduler::handle_t rt_info (void) const; // The RT_Info for this object - void connect (const RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment &_env); - void disconnect (CORBA::Environment &_env); + void connect (const RtecEventChannelAdmin::ConsumerQOS& qos + TAO_ENV_ARG_DECL); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier, but do not forget about it or close // it. // = The POA_RtecEventComm::PushComsumer methods. - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -157,28 +157,28 @@ public: void open (const char* name, RtecEventChannelAdmin::EventChannel_ptr event_channel, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment& _env); + RtecScheduler::Scheduler_ptr scheduler + TAO_ENV_ARG_DECL); // This method connects the supplier to the EC. - void close (CORBA::Environment &_env); + void close (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. RtecScheduler::handle_t rt_info (void) const; // The RT_Info for this object - void connect (const RtecEventChannelAdmin::SupplierQOS& qos, - CORBA::Environment &_env); - void disconnect (CORBA::Environment &_env); + void connect (const RtecEventChannelAdmin::SupplierQOS& qos + TAO_ENV_ARG_DECL); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC, but do not forget about it or close // it. - void send_event (RtecEventComm::EventSet& events, - CORBA::Environment &_env); + void send_event (RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL); // Send one event, the supplier provides the SourceID // = The POA_RtecEventComm::PushSupplier methods. - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -244,16 +244,16 @@ public: void run (CORBA::ORB_ptr orb, RtecEventChannelAdmin::EventChannel_ptr event_channel, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment& _env); + RtecScheduler::Scheduler_ptr scheduler + TAO_ENV_ARG_DECL); // Start the test. int dump_results (void); // Print out the results, returns -1 if an error was detected. virtual void push (int consumer_id, - const RtecEventComm::EventSet& events, - CORBA::Environment &_env); + const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL); // The callback from the Consumer.... @@ -318,16 +318,16 @@ public: void run (CORBA::ORB_ptr orb, RtecEventChannelAdmin::EventChannel_ptr event_channel, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment& _env); + RtecScheduler::Scheduler_ptr scheduler + TAO_ENV_ARG_DECL); // Start the test. int dump_results (void); // Print out the results, returns -1 if an error was detected. virtual void push (int consumer_id, - const RtecEventComm::EventSet& events, - CORBA::Environment &_env); + const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL); // The callback from the Consumer.... private: diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index c1e7f0d60ea..1b6cfc819b1 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -41,15 +41,15 @@ Driver::Driver (void) int Driver::run (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -58,11 +58,11 @@ Driver::run (int argc, char* argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv)) @@ -118,8 +118,8 @@ Driver::run (int argc, char* argv[]) } CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService", - ACE_TRY_ENV); + orb->resolve_initial_references ("NameService" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -128,7 +128,7 @@ Driver::run (int argc, char* argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name name (1); @@ -136,35 +136,35 @@ Driver::run (int argc, char* argv[]) name[0].id = CORBA::string_dup ("EventService"); CORBA::Object_var ec_obj = - naming_context->resolve (name, ACE_TRY_ENV); + naming_context->resolve (name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var channel; if (CORBA::is_nil (ec_obj.in ())) channel = RtecEventChannelAdmin::EventChannel::_nil (); else - channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (), - ACE_TRY_ENV); + channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->connect_consumers (channel.in (), ACE_TRY_ENV); + this->connect_consumers (channel.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n")); ACE_DEBUG ((LM_DEBUG, "running the test\n")); - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - this->disconnect_consumers (ACE_TRY_ENV); + this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - channel->destroy (ACE_TRY_ENV); + channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sys_ex) @@ -182,8 +182,8 @@ Driver::run (int argc, char* argv[]) void Driver::push_consumer (void* /* consumer_cookie */, ACE_hrtime_t /* arrival */, - const RtecEventComm::EventSet& events, - CORBA::Environment &) + const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL_NOT_USED) { // int ID = // (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie) @@ -273,8 +273,8 @@ Driver::push_consumer (void* /* consumer_cookie */, } void -Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel, - CORBA::Environment &ACE_TRY_ENV) +Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel + TAO_ENV_ARG_DECL) { for (int i = 0; i < this->n_consumers_; ++i) { @@ -286,18 +286,18 @@ Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel, this->consumers_[i]->connect (this->event_a_, this->event_b_, - channel, - ACE_TRY_ENV); + channel + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -Driver::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV) +Driver::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->n_consumers_; ++i) { - this->consumers_[i]->disconnect (ACE_TRY_ENV); + this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -381,8 +381,8 @@ Test_Consumer::Test_Consumer (Driver *driver, void *cookie) void Test_Consumer::connect (int event_a, int event_b, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment& ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { ACE_ConsumerQOS_Factory qos; qos.start_disjunction_group (); @@ -392,25 +392,25 @@ Test_Consumer::connect (int event_a, // = Connect as a consumer. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_TRY_ENV); + ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV); + RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_->connect_push_consumer (objref.in (), - qos.get_ConsumerQOS (), - ACE_TRY_ENV); + qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Test_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +Test_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; @@ -418,20 +418,20 @@ Test_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) RtecEventChannelAdmin::ProxyPushSupplier_var proxy = this->supplier_proxy_._retn (); - proxy->disconnect_push_supplier (ACE_TRY_ENV); + proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); } void -Test_Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &ACE_TRY_ENV) +Test_Consumer::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t arrival = ACE_OS::gethrtime (); - this->driver_->push_consumer (this->cookie_, arrival, events, ACE_TRY_ENV); + this->driver_->push_consumer (this->cookie_, arrival, events TAO_ENV_ARG_PARAMETER); } void -Test_Consumer::disconnect_push_consumer (CORBA::Environment &) +Test_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h index b1a936966d1..3a5df9b97b2 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h @@ -34,17 +34,17 @@ public: void connect (int event_a, int event_b, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment& _env); + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); // This method connects the consumer to the EC. - void disconnect (CORBA::Environment &_env); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. @@ -80,8 +80,8 @@ public: void push_consumer (void* consumer_cookie, ACE_hrtime_t arrival, - const RtecEventComm::EventSet& events, - CORBA::Environment&); + const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL_NOT_USED); // Callback method for consumers, if any of our consumers has // received events it will invoke this method. @@ -89,9 +89,9 @@ private: int parse_args (int argc, char* argv[]); // parse the command line args - void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &_env); - void disconnect_consumers (CORBA::Environment &_env); + void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL); + void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL); // Connect and disconnect the consumers. private: diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 2651bab0e04..fb5da0a99f6 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -36,15 +36,15 @@ ECMS_Driver::ECMS_Driver (void) int ECMS_Driver::run (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -52,11 +52,11 @@ ECMS_Driver::run (int argc, char* argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv)) @@ -116,7 +116,7 @@ ECMS_Driver::run (int argc, char* argv[]) } CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService", ACE_TRY_ENV); + orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -124,7 +124,7 @@ ECMS_Driver::run (int argc, char* argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name name (1); @@ -132,26 +132,26 @@ ECMS_Driver::run (int argc, char* argv[]) name[0].id = CORBA::string_dup ("EventService"); CORBA::Object_var ec_obj = - naming_context->resolve (name, ACE_TRY_ENV); + naming_context->resolve (name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var channel; if (CORBA::is_nil (ec_obj.in ())) channel = RtecEventChannelAdmin::EventChannel::_nil (); else - channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (), - ACE_TRY_ENV); + channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->connect_suppliers (channel.in (), ACE_TRY_ENV); + this->connect_suppliers (channel.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n")); - this->activate_suppliers (ACE_TRY_ENV); + this->activate_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "suppliers are active\n")); @@ -165,7 +165,7 @@ ECMS_Driver::run (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "suppliers finished\n")); - this->disconnect_suppliers (ACE_TRY_ENV); + this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // @@ Deactivate the suppliers (as CORBA Objects?) @@ -186,7 +186,7 @@ int ECMS_Driver::supplier_task (Test_Supplier *supplier, void* /* cookie */) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { ACE_Time_Value tv (0, this->event_period_); @@ -258,7 +258,7 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier, // in just one memory allocation; event[0].data.payload.replace (mblen, mb); - supplier->consumer_proxy ()->push(event, ACE_TRY_ENV); + supplier->consumer_proxy ()->push(event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n")); @@ -279,8 +279,8 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier, } void -ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel, - CORBA::Environment &ACE_TRY_ENV) +ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel + TAO_ENV_ARG_DECL) { for (int i = 0; i < this->n_suppliers_; ++i) { @@ -292,14 +292,14 @@ ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel, this->suppliers_[i]->connect (buf, this->event_a_, this->event_b_, - channel, - ACE_TRY_ENV); + channel + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -ECMS_Driver::activate_suppliers (CORBA::Environment &) +ECMS_Driver::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { for (int i = 0; i < this->n_suppliers_; ++i) { @@ -308,11 +308,11 @@ ECMS_Driver::activate_suppliers (CORBA::Environment &) } void -ECMS_Driver::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV) +ECMS_Driver::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->n_suppliers_; ++i) { - this->suppliers_[i]->disconnect (ACE_TRY_ENV); + this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -416,8 +416,8 @@ void Test_Supplier::connect (const char* name, int event_a, int event_b, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { this->supplier_id_ = ACE::crc32 (name); ACE_DEBUG ((LM_DEBUG, @@ -437,25 +437,25 @@ Test_Supplier::connect (const char* name, 0, 1); RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (ACE_TRY_ENV); + ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushSupplier_var objref = - this->supplier_._this (ACE_TRY_ENV); + this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_->connect_push_supplier (objref.in (), - qos.get_SupplierQOS (), - ACE_TRY_ENV); + qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Test_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +Test_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; @@ -465,7 +465,7 @@ Test_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - proxy->disconnect_push_consumer (ACE_TRY_ENV); + proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) @@ -492,7 +492,7 @@ Test_Supplier::svc () } void -Test_Supplier::disconnect_push_supplier (CORBA::Environment &) +Test_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->consumer_proxy_ = diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h index 50ba18dc32e..6d66ed280a7 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h @@ -39,14 +39,14 @@ public: void connect (const char* name, int event_a, int event_b, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment& _env); + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); // This method connects the supplier to the EC. - void disconnect (CORBA::Environment &_env); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The methods in the skeleton. @@ -99,8 +99,8 @@ public: void push_supplier (void* supplier_cookie, RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer, - const RtecEventComm::EventSet &events, - CORBA::Environment &); + const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED); // Callback method for suppliers, we push for them to their // consumers and take statistics on the way. // It is possible that we ignore the <consumer> parameter when @@ -110,12 +110,12 @@ private: int parse_args (int argc, char* argv[]); // parse the command line args - void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &_env); - void disconnect_suppliers (CORBA::Environment &_env); + void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL); + void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL); // Connect the suppliers. - void activate_suppliers (CORBA::Environment &_env); + void activate_suppliers (TAO_ENV_SINGLE_ARG_DECL); // Activate the suppliers, i.e. they start generating events. private: diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 46d83bb2f59..d8629f4a59b 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -41,16 +41,16 @@ ECM_Driver::ECM_Driver (void) int ECM_Driver::run (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { this->orb_ = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -59,11 +59,11 @@ ECM_Driver::run (int argc, char* argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv)) @@ -137,43 +137,43 @@ ECM_Driver::run (int argc, char* argv[]) // Register Event_Service with the Naming Service. RtecEventChannelAdmin::EventChannel_var ec = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = - this->orb_->object_to_string (ec.in (), ACE_TRY_ENV); + this->orb_->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ())); - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "EC_Mcast: local EC objref ready\n")); - this->open_federations (ec.in (), - ACE_TRY_ENV); + this->open_federations (ec.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_federations done\n")); - this->open_senders (ec.in (), - ACE_TRY_ENV); + this->open_senders (ec.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_senders done\n")); - this->open_receivers (ec.in (), - ACE_TRY_ENV); + this->open_receivers (ec.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_receivers done\n")); - this->activate_federations (ec.in (), - ACE_TRY_ENV); + this->activate_federations (ec.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "EC_Mcast: activate_federations done\n")); @@ -184,17 +184,17 @@ ECM_Driver::run (int argc, char* argv[]) this->dump_results (); - this->close_receivers (ACE_TRY_ENV); + this->close_receivers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->close_senders (ACE_TRY_ENV); + this->close_senders (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->close_federations (ACE_TRY_ENV); + this->close_federations (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown the EC\n")); - ec_impl.shutdown (ACE_TRY_ENV); + ec_impl.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -211,8 +211,8 @@ ECM_Driver::run (int argc, char* argv[]) } void -ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation, - CORBA::Environment &) +ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation + TAO_ENV_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, "Federation <%s> shuting down\n", federation->name ())); @@ -221,20 +221,20 @@ ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation, } void -ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { for (int i = 0; i < this->local_federations_count_; ++i) { this->local_federations_[i]->open (this->event_count_, - ec, ACE_TRY_ENV); + ec TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { this->federations_running_ = this->local_federations_count_; RtecEventComm::Time interval = this->event_period_; @@ -242,25 +242,25 @@ ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec, for (int i = 0; i < this->local_federations_count_; ++i) { this->local_federations_[i]->activate (ec, - interval, - ACE_TRY_ENV); + interval + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -ECM_Driver::close_federations (CORBA::Environment &ACE_TRY_ENV) +ECM_Driver::close_federations (TAO_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->local_federations_count_; ++i) { - this->local_federations_[i]->close (ACE_TRY_ENV); + this->local_federations_[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } void -ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { if (this->endpoint_.dgram ().open (ACE_Addr::sap_any) == -1) { @@ -277,42 +277,42 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec, for (int i = 0; i < this->all_federations_count_; ++i) { this->all_federations_[i]->open (&this->endpoint_, - ec, - ACE_TRY_ENV); + ec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -ECM_Driver::close_senders (CORBA::Environment &ACE_TRY_ENV) +ECM_Driver::close_senders (TAO_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->all_federations_count_; ++i) { - this->all_federations_[i]->close (ACE_TRY_ENV); + this->all_federations_[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } this->endpoint_.dgram ().close (); } void -ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { for (int i = 0; i < this->local_federations_count_; ++i) { this->local_federations_[i]->open_receiver (ec, - &this->endpoint_, - ACE_TRY_ENV); + &this->endpoint_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -ECM_Driver::close_receivers (CORBA::Environment &ACE_TRY_ENV) +ECM_Driver::close_receivers (TAO_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->local_federations_count_; ++i) { - this->local_federations_[i]->close_receiver (ACE_TRY_ENV); + this->local_federations_[i]->close_receiver (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -593,17 +593,17 @@ ECM_Federation::~ECM_Federation (void) void ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecUDPAdmin::AddrServer_var addr_server = - this->addr_server (ACE_TRY_ENV); + this->addr_server (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->sender_.init (ec, addr_server.in (), - endpoint, - ACE_TRY_ENV); + endpoint + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // @@ TODO Make this a parameter.... @@ -622,23 +622,23 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint, qos.insert_type (this->consumer_ipaddr (i), 0); } RtecEventChannelAdmin::ConsumerQOS qos_copy = qos.get_ConsumerQOS (); - this->sender_.open (qos_copy, ACE_TRY_ENV); + this->sender_.open (qos_copy TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECM_Federation::close (CORBA::Environment &ACE_TRY_ENV) +ECM_Federation::close (TAO_ENV_SINGLE_ARG_DECL) { - this->sender_.close (ACE_TRY_ENV); + this->sender_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->sender_.shutdown (ACE_TRY_ENV); + this->sender_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecUDPAdmin::AddrServer_ptr -ECM_Federation::addr_server (CORBA::Environment &env) +ECM_Federation::addr_server (TAO_ENV_SINGLE_ARG_DECL) { - return this->addr_server_._this (env); + return this->addr_server_._this (TAO_ENV_SINGLE_ARG_PARAMETER); } // **************************************************************** @@ -651,8 +651,8 @@ ECM_Supplier::ECM_Supplier (ECM_Local_Federation* federation) void ECM_Supplier::open (const char* name, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { this->supplier_id_ = ACE::crc32 (name); ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name, @@ -670,29 +670,29 @@ ECM_Supplier::open (const char* name, 0, 1); RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (ACE_TRY_ENV); + ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - RtecEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV); + RtecEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_->connect_push_supplier (objref.in (), - qos.get_SupplierQOS (), - ACE_TRY_ENV); + qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECM_Supplier::close (CORBA::Environment &ACE_TRY_ENV) +ECM_Supplier::close (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; - this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV); + this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = 0; @@ -700,8 +700,8 @@ ECM_Supplier::close (CORBA::Environment &ACE_TRY_ENV) void ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec, - RtecEventComm::Time interval, - CORBA::Environment &ACE_TRY_ENV) + RtecEventComm::Time interval + TAO_ENV_ARG_DECL) { ACE_ConsumerQOS_Factory consumer_qos; consumer_qos.start_disjunction_group (); @@ -711,20 +711,20 @@ ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec, // = Connect as a consumer. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_TRY_ENV); + ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushConsumer_var cref = - this->consumer_._this (ACE_TRY_ENV); + this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_->connect_push_consumer (cref.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -735,8 +735,8 @@ ECM_Supplier::supplier_id (void) const } void -ECM_Supplier::push (const RtecEventComm::EventSet& events, - CORBA::Environment& ACE_TRY_ENV) +ECM_Supplier::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) { for (u_int i = 0; i < events.length (); ++i) { @@ -744,23 +744,21 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events, if (e.header.type != ACE_ES_EVENT_INTERVAL_TIMEOUT) continue; - this->federation_->supplier_timeout (this->consumer_proxy_.in (), - ACE_TRY_ENV); + this->federation_->supplier_timeout (this->consumer_proxy_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -ECM_Supplier::disconnect_push_supplier (CORBA::Environment& ACE_TRY_ENV) +ECM_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_UNUSED_ARG (ACE_TRY_ENV); - - // this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + // this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); } void -ECM_Supplier::disconnect_push_consumer (CORBA::Environment &) +ECM_Supplier::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { } @@ -776,8 +774,8 @@ ECM_Consumer::ECM_Consumer (ECM_Local_Federation *federation) void ECM_Consumer::open (const char*, RtecEventChannelAdmin::EventChannel_ptr ec, - ACE_RANDR_TYPE &seed, - CORBA::Environment& ACE_TRY_ENV) + ACE_RANDR_TYPE &seed + TAO_ENV_ARG_DECL) { // The worst case execution time is far less than 2 // milliseconds, but that is a safe estimate.... @@ -786,21 +784,21 @@ ECM_Consumer::open (const char*, ORBSVCS_Time::Time_Value_to_TimeT (time, tv); // = Connect as a consumer. - this->consumer_admin_ = ec->for_consumers (ACE_TRY_ENV); + this->consumer_admin_ = ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect (seed, ACE_TRY_ENV); + this->connect (seed TAO_ENV_ARG_PARAMETER); } void -ECM_Consumer::connect (ACE_RANDR_TYPE &seed, - CORBA::Environment& ACE_TRY_ENV) +ECM_Consumer::connect (ACE_RANDR_TYPE &seed + TAO_ENV_ARG_DECL) { if (CORBA::is_nil (this->consumer_admin_.in ())) return; this->supplier_proxy_ = - this->consumer_admin_->obtain_push_supplier (ACE_TRY_ENV); + this->consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_ConsumerQOS_Factory qos; @@ -827,17 +825,17 @@ ECM_Consumer::connect (ACE_RANDR_TYPE &seed, qos.insert_type (federation->consumer_ipaddr (i), 0); } - RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV); + RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_->connect_push_consumer (objref.in (), - qos.get_ConsumerQOS (), - ACE_TRY_ENV); + qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECM_Consumer::disconnect (CORBA::Environment& ACE_TRY_ENV) +ECM_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ()) || CORBA::is_nil (this->consumer_admin_.in ())) @@ -846,16 +844,16 @@ ECM_Consumer::disconnect (CORBA::Environment& ACE_TRY_ENV) RtecEventChannelAdmin::ProxyPushSupplier_var tmp = this->supplier_proxy_._retn (); - tmp->disconnect_push_supplier (ACE_TRY_ENV); + tmp->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -ECM_Consumer::close (CORBA::Environment &ACE_TRY_ENV) +ECM_Consumer::close (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { - this->disconnect (ACE_TRY_ENV); + this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->consumer_admin_ = RtecEventChannelAdmin::ConsumerAdmin::_nil (); @@ -870,16 +868,16 @@ ECM_Consumer::close (CORBA::Environment &ACE_TRY_ENV) } void -ECM_Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &ACE_TRY_ENV) +ECM_Consumer::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t arrival = ACE_OS::gethrtime (); - this->federation_->consumer_push (arrival, events, ACE_TRY_ENV); + this->federation_->consumer_push (arrival, events TAO_ENV_ARG_PARAMETER); } void -ECM_Consumer::disconnect_push_consumer (CORBA::Environment &) +ECM_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -915,8 +913,8 @@ ECM_Local_Federation::~ECM_Local_Federation (void) void ECM_Local_Federation::open (int event_count, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment& ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { this->event_count_ = event_count; @@ -925,38 +923,38 @@ ECM_Local_Federation::open (int event_count, ACE_OS::strcpy (buf, this->federation_->name ()); ACE_OS::strcat (buf, "/supplier"); - this->supplier_.open (buf, ec, ACE_TRY_ENV); + this->supplier_.open (buf, ec TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_OS::strcpy (buf, this->federation_->name ()); ACE_OS::strcat (buf, "/consumer"); - this->consumer_.open (buf, ec, this->seed_, ACE_TRY_ENV); + this->consumer_.open (buf, ec, this->seed_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->last_subscription_change_ = ACE_OS::gettimeofday (); } void -ECM_Local_Federation::close (CORBA::Environment &ACE_TRY_ENV) +ECM_Local_Federation::close (TAO_ENV_SINGLE_ARG_DECL) { - this->consumer_.close (ACE_TRY_ENV); + this->consumer_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->supplier_.close (ACE_TRY_ENV); + this->supplier_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void ECM_Local_Federation::activate (RtecEventChannelAdmin::EventChannel_ptr ec, - RtecEventComm::Time interval, - CORBA::Environment& ACE_TRY_ENV) + RtecEventComm::Time interval + TAO_ENV_ARG_DECL) { - this->supplier_.activate (ec, interval, ACE_TRY_ENV); + this->supplier_.activate (ec, interval TAO_ENV_ARG_PARAMETER); } void -ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer, - CORBA::Environment &ACE_TRY_ENV) +ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer + TAO_ENV_ARG_DECL) { RtecEventComm::EventSet sent (1); sent.length (1); @@ -975,14 +973,14 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer if (this->event_count_ < 0) { - this->driver_->federation_has_shutdown (this, ACE_TRY_ENV); + this->driver_->federation_has_shutdown (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; return; } int i = this->event_count_ % this->federation_->supplier_types (); s.header.type = this->federation_->supplier_ipaddr (i); - consumer->push (sent, ACE_TRY_ENV); + consumer->push (sent TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->send_count_++; @@ -999,9 +997,9 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer ACE_DEBUG ((LM_DEBUG, "Reconfiguring federation %s: %f %f [%d]\n", this->name (), p, maxp, x)); - this->consumer_.disconnect (ACE_TRY_ENV); + this->consumer_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_.connect (this->seed_, ACE_TRY_ENV); + this->consumer_.connect (this->seed_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->last_subscription_change_ = ACE_OS::gettimeofday (); } @@ -1009,8 +1007,8 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer void ECM_Local_Federation::consumer_push (ACE_hrtime_t, - const RtecEventComm::EventSet &event, - CORBA::Environment &) + const RtecEventComm::EventSet &event + TAO_ENV_ARG_DECL_NOT_USED) { if (event.length () == 0) { @@ -1041,11 +1039,11 @@ ECM_Local_Federation::consumer_push (ACE_hrtime_t, void ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec, - TAO_ECG_UDP_Out_Endpoint* ignore_from, - CORBA::Environment &ACE_TRY_ENV) + TAO_ECG_UDP_Out_Endpoint* ignore_from + TAO_ENV_ARG_DECL) { RtecUDPAdmin::AddrServer_var addr_server = - this->federation_->addr_server (ACE_TRY_ENV); + this->federation_->addr_server (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_Reactor* reactor = TAO_ORB_Core_instance ()->reactor (); @@ -1058,8 +1056,8 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec, addr_server.in (), reactor, expire_interval, - max_timeouts, - ACE_TRY_ENV); + max_timeouts + TAO_ENV_ARG_PARAMETER); ACE_CHECK; const int bufsize = 512; @@ -1071,7 +1069,7 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec, this->mcast_eh_.reactor (reactor); - this->mcast_eh_.open (ec, ACE_TRY_ENV); + this->mcast_eh_.open (ec TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_SupplierQOS_Factory qos; @@ -1084,20 +1082,20 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec, RtecEventChannelAdmin::SupplierQOS qos_copy = qos.get_SupplierQOS (); - this->receiver_.open (qos_copy, ACE_TRY_ENV); + this->receiver_.open (qos_copy TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECM_Local_Federation::close_receiver (CORBA::Environment &ACE_TRY_ENV) +ECM_Local_Federation::close_receiver (TAO_ENV_SINGLE_ARG_DECL) { - this->receiver_.close (ACE_TRY_ENV); + this->receiver_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->receiver_.shutdown (ACE_TRY_ENV); + this->receiver_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->mcast_eh_.close (ACE_TRY_ENV); + this->mcast_eh_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h index f8fc81abf3f..b952ae65529 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h @@ -1,5 +1,7 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + // $Id$ + // // ============================================================================ // @@ -111,17 +113,17 @@ public: // The ipaddr (in host byte order) of the event type <i> void open (TAO_ECG_UDP_Out_Endpoint *endoint, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &_env); + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); // Connect the UDP sender to the EC. - void close (CORBA::Environment &_env); + void close (TAO_ENV_SINGLE_ARG_DECL); // Close the UDP sender, disconnect from the EC int sender_local_addr (ACE_INET_Addr& addr); // Return the sender local address - RtecUDPAdmin::AddrServer_ptr addr_server (CORBA::Environment &env); + RtecUDPAdmin::AddrServer_ptr addr_server (TAO_ENV_SINGLE_ARG_DECL); // This address server can be used to convert event headers // (type,source) to UDP addresses (ipaddr,port) @@ -164,28 +166,28 @@ public: ECM_Supplier (ECM_Local_Federation* federation); void open (const char* name, - RtecEventChannelAdmin::EventChannel_ptr event_channel, - CORBA::Environment& _env); + RtecEventChannelAdmin::EventChannel_ptr event_channel + TAO_ENV_ARG_DECL); // This method connects the supplier to the EC. - void close (CORBA::Environment &_env); + void close (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel, - RtecEventComm::Time interval, - CORBA::Environment& _env); + RtecEventComm::Time interval + TAO_ENV_ARG_DECL); // Connect as a consumer to start receiving events. RtecEventComm::EventSourceID supplier_id (void) const; // The supplier ID. - void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env); - void disconnect_push_consumer (CORBA::Environment &); + void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL); + void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Implement the callbacks for our consumer personality. // = The POA_RtecEventComm::PushSupplier methods. - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -221,24 +223,24 @@ public: void open (const char* name, RtecEventChannelAdmin::EventChannel_ptr event_channel, - ACE_RANDR_TYPE &seed, - CORBA::Environment& _env); + ACE_RANDR_TYPE &seed + TAO_ENV_ARG_DECL); // This method connects the consumer to the EC. - void close (CORBA::Environment &_env); + void close (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. - void connect (ACE_RANDR_TYPE& seed, - CORBA::Environment &_env); - void disconnect (CORBA::Environment &_env); + void connect (ACE_RANDR_TYPE& seed + TAO_ENV_ARG_DECL); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier, but do not forget about it or close // it. // = The POA_RtecEventComm::PushComsumer methods. - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -266,36 +268,36 @@ public: // Destructor void open (int event_count, - RtecEventChannelAdmin::EventChannel_ptr event_channel, - CORBA::Environment& _env); + RtecEventChannelAdmin::EventChannel_ptr event_channel + TAO_ENV_ARG_DECL); // Connect both the supplier and the consumer. - void close (CORBA::Environment& _env); + void close (TAO_ENV_SINGLE_ARG_DECL); // Disconnect everybody from the EC void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel, - RtecEventComm::Time interval, - CORBA::Environment& _env); + RtecEventComm::Time interval + TAO_ENV_ARG_DECL); // Activate the supplier - void supplier_timeout (RtecEventComm::PushConsumer_ptr consumer, - CORBA::Environment& _env); + void supplier_timeout (RtecEventComm::PushConsumer_ptr consumer + TAO_ENV_ARG_DECL); // The supplier is ready to send a new event. void consumer_push (ACE_hrtime_t arrival, - const RtecEventComm::EventSet& event, - CORBA::Environment& _env); + const RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL); // The consumer just received an event. const ECM_Federation *federation (void) const; // The federation description. void open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec, - TAO_ECG_UDP_Out_Endpoint* ignore_from, - CORBA::Environment &_env); + TAO_ECG_UDP_Out_Endpoint* ignore_from + TAO_ENV_ARG_DECL); // Connect the UDP receiver to the EC. - void close_receiver (CORBA::Environment &_env); + void close_receiver (TAO_ENV_SINGLE_ARG_DECL); // Close the UDP receiver, disconnect from the EC void dump_results (void) const; @@ -414,41 +416,41 @@ public: int run (int argc, char* argv[]); // Run the test, read all the configuration files, etc. - void federation_has_shutdown (ECM_Local_Federation *federation, - CORBA::Environment& _env); + void federation_has_shutdown (ECM_Local_Federation *federation + TAO_ENV_ARG_DECL); // One of the federations has completed its simulation, once all of // them finish the test exists. private: - void open_federations (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &_env); + void open_federations (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); // Connect the federations to the EC. - void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &_env); + void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); // Activate all the federations - void close_federations (CORBA::Environment &_env); + void close_federations (TAO_ENV_SINGLE_ARG_DECL); // Close the federations, i.e. disconnect from the EC, deactivate // the objects, etc. - void open_senders (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &_env); + void open_senders (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); // Connect all the senders, so we can start multicasting events. - void open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &_env); + void open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); // Connect all the receivers, thus we accept events arriving through // multicast. - void close_senders (CORBA::Environment &_env); + void close_senders (TAO_ENV_SINGLE_ARG_DECL); // Close all the senders to cleanup resources. - void close_receivers (CORBA::Environment &_env); + void close_receivers (TAO_ENV_SINGLE_ARG_DECL); // Close all the receivers to cleanup resources. - int shutdown (CORBA::Environment&); + int shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Called when the main thread. int parse_args (int argc, char* argv[]); diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index e51f97f027a..c7c895f046b 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -133,16 +133,16 @@ print_priority_info (const char *const name) int Test_ECG::run (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -151,14 +151,14 @@ Test_ECG::run (int argc, char* argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv)) @@ -260,7 +260,7 @@ Test_ECG::run (int argc, char* argv[]) print_priority_info ("Test_ECG::run (Main after thr_setprio)"); CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService", ACE_TRY_ENV); + orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -269,7 +269,7 @@ Test_ECG::run (int argc, char* argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; auto_ptr<POA_RtecScheduler::Scheduler> scheduler_impl; @@ -291,7 +291,7 @@ Test_ECG::run (int argc, char* argv[]) } if (scheduler_impl.get () == 0) return -1; - scheduler = scheduler_impl->_this (ACE_TRY_ENV); + scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -314,7 +314,7 @@ Test_ECG::run (int argc, char* argv[]) if (scheduler_impl.get () == 0) return -1; - scheduler = scheduler_impl->_this (ACE_TRY_ENV); + scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else if (ACE_OS::strcmp (this->lcl_name_, "ECM2") == 0) @@ -335,7 +335,7 @@ Test_ECG::run (int argc, char* argv[]) if (scheduler_impl.get () == 0) return -1; - scheduler = scheduler_impl->_this (ACE_TRY_ENV); + scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else if (ACE_OS::strcmp (this->lcl_name_, "ECM3") == 0) @@ -356,7 +356,7 @@ Test_ECG::run (int argc, char* argv[]) if (scheduler_impl.get () == 0) return -1; - scheduler = scheduler_impl->_this (ACE_TRY_ENV); + scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -370,7 +370,7 @@ Test_ECG::run (int argc, char* argv[]) if (scheduler_impl.get () == 0) return -1; - scheduler = scheduler_impl->_this (ACE_TRY_ENV); + scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } break; @@ -393,7 +393,7 @@ Test_ECG::run (int argc, char* argv[]) case Test_ECG::ss_runtime: { CORBA::String_var str = - orb->object_to_string (scheduler.in (), ACE_TRY_ENV); + orb->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n", str.in ())); @@ -405,7 +405,7 @@ Test_ECG::run (int argc, char* argv[]) CosNaming::Name schedule_name (1); schedule_name.length (1); schedule_name[0].id = CORBA::string_dup (buf); - naming_context->bind (schedule_name, scheduler.in (), ACE_TRY_ENV); + naming_context->bind (schedule_name, scheduler.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_Scheduler_Factory::use_config (naming_context.in (), @@ -422,11 +422,11 @@ Test_ECG::run (int argc, char* argv[]) // Register Event_Service with the Naming Service. RtecEventChannelAdmin::EventChannel_var ec = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = - orb->object_to_string (ec.in (), ACE_TRY_ENV); + orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (5); @@ -438,7 +438,7 @@ Test_ECG::run (int argc, char* argv[]) CosNaming::Name channel_name (1); channel_name.length (1); channel_name[0].id = CORBA::string_dup (buf); - naming_context->bind (channel_name, ec.in (), ACE_TRY_ENV); + naming_context->bind (channel_name, ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "waiting to start\n")); @@ -447,7 +447,7 @@ Test_ECG::run (int argc, char* argv[]) if (this->rmt_name_ != 0) { - orb->run (&tv, ACE_TRY_ENV); + orb->run (&tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -455,23 +455,23 @@ Test_ECG::run (int argc, char* argv[]) RtecEventChannelAdmin::EventChannel_var local_ec = this->get_ec (naming_context.in (), - this->lcl_name_, - ACE_TRY_ENV); + this->lcl_name_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "located local EC\n")); for (int sd = 0; sd < this->supplier_disconnects_; ++sd) { - this->connect_suppliers (local_ec.in (), ACE_TRY_ENV); + this->connect_suppliers (local_ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->disconnect_suppliers (ACE_TRY_ENV); + this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (5); ACE_DEBUG ((LM_DEBUG, "Supplier disconnection %d\n", sd)); } - this->connect_suppliers (local_ec.in (), ACE_TRY_ENV); + this->connect_suppliers (local_ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected supplier\n")); @@ -480,13 +480,13 @@ Test_ECG::run (int argc, char* argv[]) if (this->rmt_name_ != 0) { tv.set (5, 0); - orb->run (&tv, ACE_TRY_ENV); + orb->run (&tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var remote_ec = this->get_ec (naming_context.in (), - this->rmt_name_, - ACE_TRY_ENV); + this->rmt_name_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "located remote EC\n")); @@ -500,48 +500,48 @@ Test_ECG::run (int argc, char* argv[]) } rsch_name[0].id = CORBA::string_dup (buf); CORBA::Object_var tmpobj = - naming_context->resolve (rsch_name, ACE_TRY_ENV); + naming_context->resolve (rsch_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecScheduler::Scheduler_var remote_sch = - RtecScheduler::Scheduler::_narrow (tmpobj.in (), ACE_TRY_ENV); + RtecScheduler::Scheduler::_narrow (tmpobj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->connect_ecg (local_ec.in (), remote_ec.in (), - remote_sch.in (), - ACE_TRY_ENV); + remote_sch.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected proxy\n")); tv.set (5, 0); - orb->run (&tv, ACE_TRY_ENV); + orb->run (&tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::Observer_ptr observer = - this->ecg_._this (ACE_TRY_ENV); + this->ecg_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - observer_handle = ec_impl.append_observer (observer, - ACE_TRY_ENV); + observer_handle = ec_impl.append_observer (observer + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } for (int cd = 0; cd < this->consumer_disconnects_; ++cd) { - this->connect_consumers (local_ec.in (), ACE_TRY_ENV); + this->connect_consumers (local_ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->disconnect_consumers (ACE_TRY_ENV); + this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (5); ACE_DEBUG ((LM_DEBUG, "Consumer disconnection %d\n", cd)); } - this->connect_consumers (local_ec.in (), ACE_TRY_ENV); + this->connect_consumers (local_ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected consumer\n")); - this->activate_suppliers (local_ec.in (), ACE_TRY_ENV); + this->activate_suppliers (local_ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "suppliers are active\n")); @@ -560,7 +560,7 @@ Test_ECG::run (int argc, char* argv[]) if (this->rmt_name_ != 0) { - ec_impl.remove_observer (observer_handle, ACE_TRY_ENV); + ec_impl.remove_observer (observer_handle TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -568,7 +568,7 @@ Test_ECG::run (int argc, char* argv[]) ec_impl.activate (); ACE_DEBUG ((LM_DEBUG, "running the test\n")); - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->test_stop_ = ACE_OS::gethrtime (); @@ -603,7 +603,7 @@ Test_ECG::run (int argc, char* argv[]) ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos_out, configs_out, anomalies_out, ACE_TRY_ENV); + infos_out, configs_out, anomalies_out TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else /* ! __SUNPRO_CC */ ACE_Scheduler_Factory::server ()->compute_scheduling @@ -611,8 +611,8 @@ Test_ECG::run (int argc, char* argv[]) ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos.out (), configs.out (), anomalies.out (), - ACE_TRY_ENV); + infos.out (), configs.out (), anomalies.out () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* ! __SUNPRO_CC */ @@ -622,25 +622,25 @@ Test_ECG::run (int argc, char* argv[]) this->schedule_file_); } - naming_context->unbind (channel_name, ACE_TRY_ENV); + naming_context->unbind (channel_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->rmt_name_ != 0) { - this->ecg_.close (ACE_TRY_ENV); + this->ecg_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->ecg_.shutdown (ACE_TRY_ENV); + this->ecg_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - this->disconnect_consumers (ACE_TRY_ENV); + this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->disconnect_suppliers (ACE_TRY_ENV); + this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "shutdown grace period\n")); tv.set (5, 0); - orb->run (&tv, ACE_TRY_ENV); + orb->run (&tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sys_ex) @@ -657,8 +657,8 @@ Test_ECG::run (int argc, char* argv[]) RtecEventChannelAdmin::EventChannel_ptr Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context, - const char* process_name, - CORBA::Environment &ACE_TRY_ENV) + const char* process_name + TAO_ENV_ARG_DECL) { const int bufsize = 512; char buf[bufsize]; @@ -670,28 +670,28 @@ Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context, channel_name[0].id = CORBA::string_dup (buf); CORBA::Object_var ec_ptr = - naming_context->resolve (channel_name, ACE_TRY_ENV); + naming_context->resolve (channel_name TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (RtecEventChannelAdmin::EventChannel::_nil ()); if (CORBA::is_nil (ec_ptr.in ())) return RtecEventChannelAdmin::EventChannel::_nil (); - return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr.in (), - ACE_TRY_ENV); + return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr.in () + TAO_ENV_ARG_PARAMETER); } void -Test_ECG::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV) +Test_ECG::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->hp_suppliers_ + this->lp_suppliers_; ++i) { - this->suppliers_[i]->close (ACE_TRY_ENV); + this->suppliers_[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } void -Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &ACE_TRY_ENV) +Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL) { int i; for (i = 0; i < this->hp_suppliers_; ++i) @@ -712,8 +712,8 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, this->hps_event_b_, mc, this->hp_interval_ * 10, - local_ec, - ACE_TRY_ENV); + local_ec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -736,25 +736,25 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, this->lps_event_b_, mc, this->lp_interval_ * 10, - local_ec, - ACE_TRY_ENV); + local_ec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -Test_ECG::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV) +Test_ECG::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->hp_consumers_ + this->lp_consumers_; ++i) { - this->consumers_[i]->close (ACE_TRY_ENV); + this->consumers_[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } void -Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &ACE_TRY_ENV) +Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -771,8 +771,8 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, this->suppliers_[i]->activate (buf, this->hp_interval_ * 10, - local_ec, - ACE_TRY_ENV); + local_ec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -789,8 +789,8 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, this->suppliers_[i]->activate (buf, this->lp_interval_ * 10, - local_ec, - ACE_TRY_ENV); + local_ec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -802,8 +802,8 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, } void -Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &ACE_TRY_ENV) +Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL) { int i; for (i = 0; i < this->hp_consumers_; ++i) @@ -817,8 +817,8 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec, this->consumers_[i]->open (buf, this->hpc_event_a_, this->hpc_event_b_, - local_ec, - ACE_TRY_ENV); + local_ec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->stats_[i].total_time_ = 0; this->stats_[i].lcl_count_ = 0; @@ -837,8 +837,8 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec, this->consumers_[i]->open (buf, this->lpc_event_a_, this->lpc_event_b_, - local_ec, - ACE_TRY_ENV); + local_ec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->stats_[i].total_time_ = 0; this->stats_[i].lcl_count_ = 0; @@ -850,8 +850,8 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec, void Test_ECG::connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec, RtecEventChannelAdmin::EventChannel_ptr remote_ec, - RtecScheduler::Scheduler_ptr remote_sch, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Scheduler_ptr remote_sch + TAO_ENV_ARG_DECL) { RtecScheduler::Scheduler_ptr local_sch = ACE_Scheduler_Factory::server (); @@ -877,22 +877,22 @@ Test_ECG::connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec, ACE_OS::strcat (lcl, this->lcl_name_); this->ecg_.init (remote_ec, local_ec, remote_sch, local_sch, - rmt, lcl, ACE_TRY_ENV); + rmt, lcl TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void Test_ECG::push_supplier (void * /* cookie */, RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer, - const RtecEventComm::EventSet &events, - CORBA::Environment & ACE_TRY_ENV) + const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL) { this->wait_until_ready (); // ACE_DEBUG ((LM_DEBUG, "(%P|%t) events sent by supplier\n")); // @@ TODO we could keep somekind of stats here... if (!this->short_circuit_) { - consumer->push (events, ACE_TRY_ENV); + consumer->push (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -900,12 +900,12 @@ Test_ECG::push_supplier (void * /* cookie */, int i = 0; for (; i < this->hp_consumers_; ++i) { - this->consumers_[i]->push (events, ACE_TRY_ENV); + this->consumers_[i]->push (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } for (; i < this->hp_consumers_ + this->lp_consumers_; ++i) { - this->consumers_[i]->push (events, ACE_TRY_ENV); + this->consumers_[i]->push (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -914,8 +914,8 @@ Test_ECG::push_supplier (void * /* cookie */, void Test_ECG::push_consumer (void *consumer_cookie, ACE_hrtime_t arrival, - const RtecEventComm::EventSet &events, - CORBA::Environment &) + const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED) { int ID = (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie) @@ -1008,8 +1008,8 @@ Test_ECG::wait_until_ready (void) void Test_ECG::shutdown_supplier (void* /* supplier_cookie */, - RtecEventComm::PushConsumer_ptr consumer, - CORBA::Environment& ACE_TRY_ENV) + RtecEventComm::PushConsumer_ptr consumer + TAO_ENV_ARG_DECL) { this->running_suppliers_--; @@ -1027,7 +1027,7 @@ Test_ECG::shutdown_supplier (void* /* supplier_cookie */, ACE_hrtime_t t = ACE_OS::gethrtime (); ORBSVCS_Time::hrtime_to_TimeT (s.header.creation_time, t); s.header.type = ACE_ES_EVENT_SHUTDOWN; - consumer->push (shutdown, ACE_TRY_ENV); + consumer->push (shutdown TAO_ENV_ARG_PARAMETER); } void @@ -1048,13 +1048,13 @@ Test_ECG::shutdown_consumer (int id) } int -Test_ECG::shutdown (CORBA::Environment& ACE_TRY_ENV) +Test_ECG::shutdown (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Shutting down the multiple EC test\n")); if (this->rmt_name_ != 0) { - this->ecg_.shutdown (ACE_TRY_ENV); + this->ecg_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -1306,8 +1306,8 @@ Test_Supplier::open (const char* name, int event_b, int message_count, const RtecScheduler::Period_t& rate, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { this->event_a_ = event_a; this->event_b_ = event_b; @@ -1317,7 +1317,7 @@ Test_Supplier::open (const char* name, ACE_Scheduler_Factory::server (); RtecScheduler::handle_t rt_info = - server->create (name, ACE_TRY_ENV); + server->create (name TAO_ENV_ARG_PARAMETER); ACE_CHECK; // The execution times are set to reasonable values, but @@ -1335,8 +1335,8 @@ Test_Supplier::open (const char* name, RtecScheduler::VERY_LOW_IMPORTANCE, time, 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->supplier_id_ = ACE::crc32 (name); @@ -1355,38 +1355,38 @@ Test_Supplier::open (const char* name, rt_info, 1); RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (ACE_TRY_ENV); + ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - RtecEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV); + RtecEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_->connect_push_supplier (objref.in (), - qos.get_SupplierQOS (), - ACE_TRY_ENV); + qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Test_Supplier::close (CORBA::Environment &ACE_TRY_ENV) +Test_Supplier::close (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; RtecEventChannelAdmin::ProxyPushConsumer_var proxy = this->consumer_proxy_._retn (); - proxy->disconnect_push_consumer (ACE_TRY_ENV); + proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); } void Test_Supplier::activate (const char* name, const RtecScheduler::Period_t& rate, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecScheduler::Scheduler_ptr server = ACE_Scheduler_Factory::server (); @@ -1396,7 +1396,7 @@ Test_Supplier::activate (const char* name, ACE_OS::strcpy (buf, "consumer_"); ACE_OS::strcat (buf, name); RtecScheduler::handle_t rt_info = - server->create (buf, ACE_TRY_ENV); + server->create (buf TAO_ENV_ARG_PARAMETER); ACE_CHECK; // The execution times are set to reasonable values, but @@ -1414,8 +1414,8 @@ Test_Supplier::activate (const char* name, RtecScheduler::VERY_LOW_IMPORTANCE, time, 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Also connect our consumer for timeout events from the EC. @@ -1433,27 +1433,27 @@ Test_Supplier::activate (const char* name, // = Connect as a consumer. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_TRY_ENV); + ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushConsumer_var cref = - this->consumer_._this (ACE_TRY_ENV); + this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_->connect_push_consumer ( cref.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Test_Supplier::push (const RtecEventComm::EventSet& events, - CORBA::Environment& ACE_TRY_ENV) +Test_Supplier::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) { #if 0 const int bufsize = 128; @@ -1491,11 +1491,11 @@ Test_Supplier::push (const RtecEventComm::EventSet& events, if (this->message_count_ < 0) { - //this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); - //if (ACE_TRY_ENV.exception () != 0) return; + //this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + //if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0) return; this->test_->shutdown_supplier (this->cookie_, - this->consumer_proxy_.in (), - ACE_TRY_ENV); + this->consumer_proxy_.in () + TAO_ENV_ARG_PARAMETER); } if (this->message_count_ % 2 == 0) { @@ -1509,22 +1509,22 @@ Test_Supplier::push (const RtecEventComm::EventSet& events, } this->test_->push_supplier (this->cookie_, this->consumer_proxy_.in (), - sent, - ACE_TRY_ENV); + sent + TAO_ENV_ARG_PARAMETER); } void -Test_Supplier::disconnect_push_supplier (CORBA::Environment& ACE_TRY_ENV) +Test_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; - this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); } void -Test_Supplier::disconnect_push_consumer (CORBA::Environment &) +Test_Supplier::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { } @@ -1543,14 +1543,14 @@ Test_Consumer::Test_Consumer (Test_ECG *test, void Test_Consumer::open (const char* name, int event_a, int event_b, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment& ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecScheduler::Scheduler_ptr server = ACE_Scheduler_Factory::server (); RtecScheduler::handle_t rt_info = - server->create (name, ACE_TRY_ENV); + server->create (name TAO_ENV_ARG_PARAMETER); ACE_CHECK; // The worst case execution time is far less than 2 @@ -1566,8 +1566,8 @@ Test_Consumer::open (const char* name, RtecScheduler::VERY_LOW_IMPORTANCE, time, 0, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ConsumerQOS_Factory qos; @@ -1578,44 +1578,44 @@ Test_Consumer::open (const char* name, // = Connect as a consumer. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_TRY_ENV); + ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV); + RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_->connect_push_consumer (objref.in (), - qos.get_ConsumerQOS (), - ACE_TRY_ENV); + qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Test_Consumer::close (CORBA::Environment &ACE_TRY_ENV) +Test_Consumer::close (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; RtecEventChannelAdmin::ProxyPushSupplier_var proxy = this->supplier_proxy_._retn (); - proxy->disconnect_push_supplier (ACE_TRY_ENV); + proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); } void -Test_Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &ACE_TRY_ENV) +Test_Consumer::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t arrival = ACE_OS::gethrtime (); - this->test_->push_consumer (this->cookie_, arrival, events, ACE_TRY_ENV); + this->test_->push_consumer (this->cookie_, arrival, events TAO_ENV_ARG_PARAMETER); } void -Test_Consumer::disconnect_push_consumer (CORBA::Environment &) +Test_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h index 9433fd5eaa7..11516552aad 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h @@ -49,25 +49,25 @@ public: int event_a, int event_b, int message_count, const RtecScheduler::Period_t& rate, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment& _env); + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); // This method connects the supplier to the EC. - void close (CORBA::Environment &_env); + void close (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. void activate (const char* name, const RtecScheduler::Period_t& rate, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment& _env); + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); - void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env); - void disconnect_push_consumer (CORBA::Environment &); + void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL); + void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Implement the callbacks for our consumer personality. - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The methods in the skeleton. @@ -119,17 +119,17 @@ public: void open (const char* name, int event_a, int event_b, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment& _env); + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); // This method connects the consumer to the EC. - void close (CORBA::Environment &_env); + void close (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. @@ -184,8 +184,8 @@ public: void push_supplier (void* supplier_cookie, RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer, - const RtecEventComm::EventSet &events, - CORBA::Environment &); + const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED); // Callback method for suppliers, we push for them to their // consumers and take statistics on the way. // It is possible that we ignore the <consumer> parameter when @@ -193,45 +193,45 @@ public: void push_consumer (void* consumer_cookie, ACE_hrtime_t arrival, - const RtecEventComm::EventSet& events, - CORBA::Environment&); + const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL_NOT_USED); // Callback method for consumers, if any of our consumers has // received events it will invoke this method. void shutdown_supplier (void* supplier_cookie, - RtecEventComm::PushConsumer_ptr consumer, - CORBA::Environment& _env); + RtecEventComm::PushConsumer_ptr consumer + TAO_ENV_ARG_DECL); // One of the suppliers has completed its work. private: RtecEventChannelAdmin::EventChannel_ptr get_ec (CosNaming::NamingContext_ptr naming_context, - const char* ec_name, - CORBA::Environment &_env); + const char* ec_name + TAO_ENV_ARG_DECL); // Helper routine to obtain an EC given its name. - void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &_env); - void disconnect_suppliers (CORBA::Environment &_env); + void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL); + void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL); // Connect the suppliers. - void activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &_env); + void activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL); // Activate the suppliers, i.e. they start generating events. void connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec, RtecEventChannelAdmin::EventChannel_ptr remote_ec, - RtecScheduler::Scheduler_ptr remote_sch, - CORBA::Environment &_env); + RtecScheduler::Scheduler_ptr remote_sch + TAO_ENV_ARG_DECL); // Connect the EC gateway, it builds the Subscriptions and the // Publications list. - void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &_env); - void disconnect_consumers (CORBA::Environment &_env); + void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL); + void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL); // Connect and disconnect the consumers. - int shutdown (CORBA::Environment&); + int shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Called when the main thread (i.e. not the scavenger thread) is // shutting down. diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp index 79c02ad1adb..346cc25fbe4 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp @@ -31,11 +31,11 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler, const char* name, int type_start, int type_count, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment& ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecScheduler::handle_t rt_info = - scheduler->create (name, ACE_TRY_ENV); + scheduler->create (name TAO_ENV_ARG_PARAMETER); ACE_CHECK; // The worst case execution time is far less than 2 @@ -50,8 +50,8 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler, RtecScheduler::VERY_LOW_IMPORTANCE, time, 0, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ConsumerQOS_Factory qos; @@ -64,29 +64,29 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler, // = Connect as a consumer. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_TRY_ENV); + ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV); + RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_->connect_push_consumer (objref.in (), - qos.get_ConsumerQOS (), - ACE_TRY_ENV); + qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Test_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +Test_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; - this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -94,12 +94,12 @@ Test_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) // Deactivate the servant PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -117,8 +117,8 @@ Test_Consumer::accumulate (ACE_Throughput_Stats& stats) const } void -Test_Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &ACE_TRY_ENV) +Test_Consumer::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) @@ -157,7 +157,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events, { // We stop the timer as soon as we realize it is time to // do so. - this->driver_->shutdown_consumer (this->cookie_, ACE_TRY_ENV); + this->driver_->shutdown_consumer (this->cookie_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -175,7 +175,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events, } void -Test_Consumer::disconnect_push_consumer (CORBA::Environment &) +Test_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h index c8b22e8c1eb..6490b55497b 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h @@ -44,11 +44,11 @@ public: const char* name, int type_start, int type_count, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment& _env); + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); // This method connects the consumer to the EC. - void disconnect (CORBA::Environment &_env); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. void dump_results (const char* name, @@ -58,10 +58,10 @@ public: void accumulate (ACE_Throughput_Stats& stats) const; // Add our throughput and latency statistics to <stats> - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index 6f163b98afb..d07f0b23081 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -43,16 +43,16 @@ ECT_Consumer_Driver::~ECT_Consumer_Driver (void) int ECT_Consumer_Driver::run (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { this->orb_ = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -61,11 +61,11 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv)) @@ -124,8 +124,8 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) } CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references ("NameService", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("NameService" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -134,7 +134,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name schedule_name (1); @@ -142,13 +142,13 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) schedule_name[0].id = CORBA::string_dup ("ScheduleService"); CORBA::Object_var sched_obj = - naming_context->resolve (schedule_name, ACE_TRY_ENV); + naming_context->resolve (schedule_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (sched_obj.in ())) return 1; RtecScheduler::Scheduler_var scheduler = - RtecScheduler::Scheduler::_narrow (sched_obj.in (), - ACE_TRY_ENV); + RtecScheduler::Scheduler::_narrow (sched_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name name (1); @@ -156,21 +156,21 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) name[0].id = CORBA::string_dup ("EventService"); CORBA::Object_var ec_obj = - naming_context->resolve (name, ACE_TRY_ENV); + naming_context->resolve (name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var channel; if (CORBA::is_nil (ec_obj.in ())) channel = RtecEventChannelAdmin::EventChannel::_nil (); else - channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (), - ACE_TRY_ENV); + channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->connect_consumers (scheduler.in (), channel.in (), ACE_TRY_ENV); + this->connect_consumers (scheduler.in (), channel.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n")); @@ -179,7 +179,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) for (;;) { ACE_Time_Value tv (1, 0); - this->orb_->perform_work (tv, ACE_TRY_ENV); + this->orb_->perform_work (tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1); if (this->active_count_ <= 0) @@ -189,19 +189,19 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) this->dump_results (); - this->disconnect_consumers (ACE_TRY_ENV); + this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->shutdown_event_channel_ != 0) { - channel->destroy (ACE_TRY_ENV); + channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->orb_->destroy (ACE_TRY_ENV); + this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sys_ex) @@ -217,8 +217,8 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) } void -ECT_Consumer_Driver::shutdown_consumer (void*, - CORBA::Environment &) +ECT_Consumer_Driver::shutdown_consumer (void* + TAO_ENV_ARG_DECL_NOT_USED) { // int ID = // (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie) @@ -233,8 +233,8 @@ ECT_Consumer_Driver::shutdown_consumer (void*, void ECT_Consumer_Driver::connect_consumers (RtecScheduler::Scheduler_ptr scheduler, - RtecEventChannelAdmin::EventChannel_ptr channel, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr channel + TAO_ENV_ARG_DECL) { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -254,8 +254,8 @@ ECT_Consumer_Driver::connect_consumers buf, this->type_start_, this->type_count_, - channel, - ACE_TRY_ENV); + channel + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -278,11 +278,11 @@ ECT_Consumer_Driver::dump_results (void) } void -ECT_Consumer_Driver::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV) +ECT_Consumer_Driver::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->n_consumers_; ++i) { - this->consumers_[i]->disconnect (ACE_TRY_ENV); + this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; delete this->consumers_[i]; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h index 9adfb636f6d..67579078b74 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h @@ -44,8 +44,8 @@ public: int run (int argc, char* argv[]); // Execute the test. - virtual void shutdown_consumer (void* consumer_cookie, - CORBA::Environment&); + virtual void shutdown_consumer (void* consumer_cookie + TAO_ENV_ARG_DECL_NOT_USED); // Callback method for consumers, each consumer will call this // method once it receives all the shutdown events from the // suppliers. @@ -55,9 +55,9 @@ private: // parse the command line args void connect_consumers (RtecScheduler::Scheduler_ptr scheduler, - RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &_env); - void disconnect_consumers (CORBA::Environment &_env); + RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL); + void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL); // Connect and disconnect the consumers. void dump_results (void); diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h index f7d923ac230..9d474f5ff65 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h @@ -25,8 +25,8 @@ class ECT_Driver public: virtual ~ECT_Driver (void); - virtual void shutdown_consumer (void* consumer_cookie, - CORBA::Environment&) = 0; + virtual void shutdown_consumer (void* consumer_cookie + TAO_ENV_ARG_DECL_NOT_USED) = 0; // Callback method for consumers, each consumer will call this // method once it receives all the shutdown events from the // suppliers. diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp index f2a502edad4..73730d301e1 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp @@ -43,8 +43,8 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler, int burst_pause, int type_start, int type_count, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { this->burst_count_ = burst_count; this->burst_size_ = burst_size; @@ -54,7 +54,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler, this->type_count_ = type_count; RtecScheduler::handle_t rt_info = - scheduler->create (name, ACE_TRY_ENV); + scheduler->create (name TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_Time_Value tv (0, burst_pause); @@ -74,8 +74,8 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler, RtecScheduler::VERY_LOW_IMPORTANCE, time, 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->supplier_id_ = ACE::crc32 (name); @@ -94,30 +94,30 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler, rt_info, 1); RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (ACE_TRY_ENV); + ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushSupplier_var objref = - this->supplier_._this (ACE_TRY_ENV); + this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_->connect_push_supplier (objref.in (), - qos.get_SupplierQOS (), - ACE_TRY_ENV); + qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Test_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +Test_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; - this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV); + this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = @@ -125,19 +125,19 @@ Test_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) // Deactivate the servant PortableServer::POA_var poa = - this->supplier_._default_POA (ACE_TRY_ENV); + this->supplier_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (&this->supplier_, ACE_TRY_ENV); + poa->servant_to_id (&this->supplier_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } int Test_Supplier::svc () { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize a time value to pace the test @@ -173,7 +173,7 @@ Test_Supplier::svc () ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, request_start); // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n")); - this->consumer_proxy ()->push (event, ACE_TRY_ENV); + this->consumer_proxy ()->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_hrtime_t end = ACE_OS::gethrtime (); @@ -197,7 +197,7 @@ Test_Supplier::svc () ACE_hrtime_t request_start = ACE_OS::gethrtime (); ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, request_start); - this->consumer_proxy ()->push(event, ACE_TRY_ENV); + this->consumer_proxy ()->push(event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_hrtime_t end = ACE_OS::gethrtime (); this->throughput_.sample (end - test_start, @@ -220,7 +220,7 @@ Test_Supplier::svc () } void -Test_Supplier::disconnect_push_supplier (CORBA::Environment &) +Test_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h index 6518226d75f..8fb44c736b7 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h @@ -45,14 +45,14 @@ public: int burst_pause, int type_start, int type_count, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment& _env); + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); // This method connects the supplier to the EC. - void disconnect (CORBA::Environment &_env); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC. - virtual void disconnect_push_supplier (CORBA::Environment &); + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // The methods in the skeleton. RtecEventComm::EventSourceID supplier_id (void) const; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index e107c37693b..28e99d96f72 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -42,23 +42,23 @@ ECT_Supplier_Driver::~ECT_Supplier_Driver (void) } void -ECT_Supplier_Driver::shutdown_consumer (void*, - CORBA::Environment &) +ECT_Supplier_Driver::shutdown_consumer (void* + TAO_ENV_ARG_DECL_NOT_USED) { } int ECT_Supplier_Driver::run (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -67,11 +67,11 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv)) @@ -136,7 +136,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) } CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService", ACE_TRY_ENV); + orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -145,7 +145,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name schedule_name (1); @@ -153,41 +153,41 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) schedule_name[0].id = CORBA::string_dup ("ScheduleService"); CORBA::Object_var sched_obj = - naming_context->resolve (schedule_name, ACE_TRY_ENV); + naming_context->resolve (schedule_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (sched_obj.in ())) return 1; RtecScheduler::Scheduler_var scheduler = - RtecScheduler::Scheduler::_narrow (sched_obj.in (), - ACE_TRY_ENV); + RtecScheduler::Scheduler::_narrow (sched_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name name (1); name.length (1); name[0].id = CORBA::string_dup ("EventService"); CORBA::Object_var ec_obj = - naming_context->resolve (name, ACE_TRY_ENV); + naming_context->resolve (name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var channel; if (CORBA::is_nil (ec_obj.in ())) channel = RtecEventChannelAdmin::EventChannel::_nil (); else - channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (), - ACE_TRY_ENV); + channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->connect_suppliers (scheduler.in (), - channel.in (), - ACE_TRY_ENV); + channel.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n")); - this->activate_suppliers (ACE_TRY_ENV); + this->activate_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "suppliers are active\n")); @@ -203,17 +203,17 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) this->dump_results (); - this->disconnect_suppliers (ACE_TRY_ENV); + this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "suppliers disconnected\n")); // @@ Deactivate the suppliers (as CORBA Objects?) - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "orb and poa destroyed\n")); @@ -233,8 +233,8 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) void ECT_Supplier_Driver::connect_suppliers (RtecScheduler::Scheduler_ptr scheduler, - RtecEventChannelAdmin::EventChannel_ptr channel, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr channel + TAO_ENV_ARG_DECL) { for (int i = 0; i < this->n_suppliers_; ++i) { @@ -251,14 +251,14 @@ ECT_Supplier_Driver::connect_suppliers this->burst_pause_, this->type_start_, this->type_count_, - channel, - ACE_TRY_ENV); + channel + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -ECT_Supplier_Driver::activate_suppliers (CORBA::Environment &) +ECT_Supplier_Driver::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { for (int i = 0; i < this->n_suppliers_; ++i) { @@ -267,11 +267,11 @@ ECT_Supplier_Driver::activate_suppliers (CORBA::Environment &) } void -ECT_Supplier_Driver::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV) +ECT_Supplier_Driver::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->n_suppliers_; ++i) { - this->suppliers_[i]->disconnect (ACE_TRY_ENV); + this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; delete this->suppliers_[i]; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h index a4294e0e929..67efa007c52 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h @@ -34,8 +34,8 @@ public: ECT_Supplier_Driver (void); virtual ~ECT_Supplier_Driver (void); - virtual void shutdown_consumer (void* consumer_cookie, - CORBA::Environment&); + virtual void shutdown_consumer (void* consumer_cookie + TAO_ENV_ARG_DECL_NOT_USED); // Not used.... enum { @@ -51,12 +51,12 @@ private: // parse the command line args void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler, - RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &_env); - void disconnect_suppliers (CORBA::Environment &_env); + RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL); + void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL); // Connect the suppliers. - void activate_suppliers (CORBA::Environment &_env); + void activate_suppliers (TAO_ENV_SINGLE_ARG_DECL); // Activate the suppliers, i.e. they start generating events. void dump_results (void); diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index e8819ed904b..850436bb2af 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -70,12 +70,12 @@ ECT_Throughput::run (int argc, char* argv[]) ACE_High_Res_Timer::calibrate (); this->orb_ = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -84,14 +84,14 @@ ECT_Throughput::run (int argc, char* argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv)) @@ -189,13 +189,13 @@ ECT_Throughput::run (int argc, char* argv[]) runtime_infos); #endif RtecScheduler::Scheduler_var scheduler = - scheduler_impl._this (ACE_TRY_ENV); + scheduler_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; #if 0 CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references ("NameService", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("NameService" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -204,7 +204,7 @@ ECT_Throughput::run (int argc, char* argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This is the name we (potentially) register the Scheduling @@ -214,13 +214,13 @@ ECT_Throughput::run (int argc, char* argv[]) schedule_name[0].id = CORBA::string_dup ("ScheduleService"); CORBA::String_var str = - this->orb_->object_to_string (scheduler.in (), ACE_TRY_ENV); + this->orb_->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n", str.in ())); // Register the servant with the Naming Context.... - naming_context->rebind (schedule_name, scheduler.in (), ACE_TRY_ENV); + naming_context->rebind (schedule_name, scheduler.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Scheduler_Factory::use_config (naming_context.in ()); @@ -263,7 +263,7 @@ ECT_Throughput::run (int argc, char* argv[]) TAO_EC_Event_Channel *ec = new TAO_EC_Event_Channel (attr); - ec->activate (ACE_TRY_ENV); + ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; auto_ptr<POA_RtecEventChannelAdmin::EventChannel> auto_ec_impl (ec); @@ -271,23 +271,23 @@ ECT_Throughput::run (int argc, char* argv[]) } RtecEventChannelAdmin::EventChannel_var channel = - ec_impl->_this (ACE_TRY_ENV); + ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->connect_consumers (scheduler.in (), - channel.in (), ACE_TRY_ENV); + channel.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n")); this->connect_suppliers (scheduler.in (), - channel.in (), - ACE_TRY_ENV); + channel.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n")); - this->activate_suppliers (ACE_TRY_ENV); + this->activate_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "suppliers are active\n")); @@ -303,17 +303,17 @@ ECT_Throughput::run (int argc, char* argv[]) this->dump_results (); - this->disconnect_consumers (ACE_TRY_ENV); + this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "consumers disconnected\n")); - this->disconnect_suppliers (ACE_TRY_ENV); + this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "suppliers disconnected\n")); - channel->destroy (ACE_TRY_ENV); + channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "channel destroyed\n")); @@ -321,12 +321,12 @@ ECT_Throughput::run (int argc, char* argv[]) { // Deactivate the EC PortableServer::POA_var poa = - ec_impl->_default_POA (ACE_TRY_ENV); + ec_impl->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (ec_impl.get (), ACE_TRY_ENV); + poa->servant_to_id (ec_impl.get () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "EC deactivated\n")); @@ -335,12 +335,12 @@ ECT_Throughput::run (int argc, char* argv[]) { // Deactivate the Scheduler PortableServer::POA_var poa = - scheduler_impl._default_POA (ACE_TRY_ENV); + scheduler_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (&scheduler_impl, ACE_TRY_ENV); + poa->servant_to_id (&scheduler_impl TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "scheduler deactivated\n")); @@ -361,8 +361,8 @@ ECT_Throughput::run (int argc, char* argv[]) } void -ECT_Throughput::shutdown_consumer (void*, - CORBA::Environment &) +ECT_Throughput::shutdown_consumer (void* + TAO_ENV_ARG_DECL_NOT_USED) { // int ID = // (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie) @@ -376,15 +376,15 @@ ECT_Throughput::shutdown_consumer (void*, { ACE_DEBUG ((LM_DEBUG, "(%t) shutting down the ORB\n")); - // Not needed: this->orb_->shutdown (0, ACE_TRY_ENV); + // Not needed: this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); } } void ECT_Throughput::connect_consumers (RtecScheduler::Scheduler_ptr scheduler, - RtecEventChannelAdmin::EventChannel_ptr channel, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr channel + TAO_ENV_ARG_DECL) { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -407,8 +407,8 @@ ECT_Throughput::connect_consumers buf, start, this->consumer_type_count_, - channel, - ACE_TRY_ENV); + channel + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -416,8 +416,8 @@ ECT_Throughput::connect_consumers void ECT_Throughput::connect_suppliers (RtecScheduler::Scheduler_ptr scheduler, - RtecEventChannelAdmin::EventChannel_ptr channel, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr channel + TAO_ENV_ARG_DECL) { for (int i = 0; i < this->n_suppliers_; ++i) { @@ -435,14 +435,14 @@ ECT_Throughput::connect_suppliers this->burst_pause_, start, this->supplier_type_count_, - channel, - ACE_TRY_ENV); + channel + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -ECT_Throughput::activate_suppliers (CORBA::Environment &) +ECT_Throughput::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -461,21 +461,21 @@ ECT_Throughput::activate_suppliers (CORBA::Environment &) } void -ECT_Throughput::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV) +ECT_Throughput::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->n_suppliers_; ++i) { - this->suppliers_[i]->disconnect (ACE_TRY_ENV); + this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } void -ECT_Throughput::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV) +ECT_Throughput::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->n_consumers_; ++i) { - this->consumers_[i]->disconnect (ACE_TRY_ENV); + this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h index c80c76b7080..99d6f7b15e1 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h @@ -43,8 +43,8 @@ public: int run (int argc, char* argv[]); // Execute the test. - virtual void shutdown_consumer (void* consumer_cookie, - CORBA::Environment&); + virtual void shutdown_consumer (void* consumer_cookie + TAO_ENV_ARG_DECL_NOT_USED); // Callback method for consumers, each consumer will call this // method once it receives all the shutdown events from the // suppliers. @@ -54,18 +54,18 @@ private: // parse the command line args void connect_consumers (RtecScheduler::Scheduler_ptr scheduler, - RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &_env); - void disconnect_consumers (CORBA::Environment &_env); + RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL); + void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL); // Connect and disconnect the consumers. void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler, - RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &_env); - void disconnect_suppliers (CORBA::Environment &_env); + RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL); + void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL); // Connect the suppliers. - void activate_suppliers (CORBA::Environment &_env); + void activate_suppliers (TAO_ENV_SINGLE_ARG_DECL); // Activate the suppliers, i.e. they start generating events. void dump_results (void); diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index 5b15f1b2667..d3a33e84377 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -18,24 +18,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -46,11 +46,11 @@ main (int argc, char* argv[]) attributes.supplier_reconnect = 1; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -58,12 +58,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -75,16 +75,16 @@ main (int argc, char* argv[]) event_source, event_type, event_source, - event_type, - ACE_TRY_ENV); + event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier1.connect (supplier_admin.in (), event_source, event_type + 1, event_source, - event_type + 1, - ACE_TRY_ENV); + event_type + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -107,8 +107,8 @@ main (int argc, char* argv[]) consumer_qos01.insert (event_source, event_type + 1, 0); consumer01.connect (consumer_admin.in (), - consumer_qos01.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos01.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Consumer consumer0 ("Consumer/0", event_type); @@ -116,8 +116,8 @@ main (int argc, char* argv[]) // connnect to the event channel.... consumer0.connect (consumer_admin.in (), - consumer_qos0.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos0.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Consumer consumer1 ("Consumer/1", event_type); @@ -125,8 +125,8 @@ main (int argc, char* argv[]) // connnect to the event channel.... consumer1.connect (consumer_admin.in (), - consumer_qos1.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos1.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -145,25 +145,25 @@ main (int argc, char* argv[]) { ACE_Time_Value tv (0, 10000); consumer0.connect (consumer_admin.in (), - consumer_qos0.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos0.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; consumer1.connect (consumer_admin.in (), - consumer_qos1.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos1.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (i % 2 == 0) { consumer01.connect (consumer_admin.in (), - consumer_qos0.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos0.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else { consumer01.connect (consumer_admin.in (), - consumer_qos01.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos01.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -180,28 +180,28 @@ main (int argc, char* argv[]) // Cleanup.. - consumer01.disconnect (ACE_TRY_ENV); + consumer01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer1.disconnect (ACE_TRY_ENV); + consumer1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer0.disconnect (ACE_TRY_ENV); + consumer0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - supplier1.disconnect (ACE_TRY_ENV); + supplier1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier0.disconnect (ACE_TRY_ENV); + supplier0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -290,8 +290,8 @@ Consumer::dump_results (int base_count, } void -Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &) +Consumer::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h index 11276146cbe..76f5ee25e49 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h @@ -44,8 +44,8 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::ULong event_base_count; diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index 8d723e09ebe..72b4e7a42ac 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -73,7 +73,7 @@ EC_BCast::modify_attributes (TAO_EC_Event_Channel_Attributes&) } void -EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV) +EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL) { TAO_ECG_UDP_Sender sender; TAO_ECG_UDP_Out_Endpoint endpoint; @@ -82,7 +82,7 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV) Simple_Address_Server address_server_impl (udp_addr); RtecUDPAdmin::AddrServer_var address_server = - address_server_impl._this (ACE_TRY_ENV); + address_server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (endpoint.dgram ().open (ACE_Addr::sap_any) == -1) @@ -93,16 +93,16 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV) sender.init (this->event_channel_.in (), address_server.in (), - &endpoint, - ACE_TRY_ENV); + &endpoint + TAO_ENV_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS sub; int shutdown_event_type; - this->build_consumer_qos (0, sub, shutdown_event_type, ACE_TRY_ENV); + this->build_consumer_qos (0, sub, shutdown_event_type TAO_ENV_ARG_PARAMETER); ACE_CHECK; - sender.open (sub, ACE_TRY_ENV); + sender.open (sub TAO_ENV_ARG_PARAMETER); ACE_CHECK; TAO_ECG_UDP_Receiver receiver; @@ -114,8 +114,8 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV) &endpoint, address_server.in (), this->orb_->orb_core ()->reactor (), - expire, 5, - ACE_TRY_ENV); + expire, 5 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; udp_eh.reactor (this->orb_->orb_core ()->reactor ()); @@ -126,16 +126,16 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV) } RtecEventChannelAdmin::SupplierQOS pub; - this->build_supplier_qos (0, pub, shutdown_event_type, ACE_TRY_ENV); + this->build_supplier_qos (0, pub, shutdown_event_type TAO_ENV_ARG_PARAMETER); ACE_CHECK; - receiver.open (pub, ACE_TRY_ENV); + receiver.open (pub TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->allocate_tasks () == -1) return; - this->activate_tasks (ACE_TRY_ENV); + this->activate_tasks (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -158,10 +158,10 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV) if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "BCast (%P|%t) suppliers finished\n")); - receiver.close (ACE_TRY_ENV); + receiver.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - sender.close (ACE_TRY_ENV); + sender.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // @@ Deactivate all the objects...! @@ -169,12 +169,12 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV) { // Deactivate the Address Server PortableServer::POA_var poa = - address_server_impl._default_POA (ACE_TRY_ENV); + address_server_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (&address_server_impl, ACE_TRY_ENV); + poa->servant_to_id (&address_server_impl TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -199,8 +199,8 @@ Simple_Address_Server (const ACE_INET_Addr& address) void Simple_Address_Server::get_addr (const RtecEventComm::EventHeader&, - RtecUDPAdmin::UDP_Addr& address, - CORBA::Environment &) + RtecUDPAdmin::UDP_Addr& address + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { address = this->address_; diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h index 9c4ddfc6b91..91151483da1 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.h +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h @@ -45,7 +45,7 @@ public: virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); // set the bcastion flags - void execute_test (CORBA::Environment& ACE_TRY_ENV); + void execute_test (TAO_ENV_SINGLE_ARG_DECL); // Don't run the suppliers, just test connect and disconnect calls. void dump_results (void); @@ -70,8 +70,8 @@ public: // constructo virtual void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr& address, - CORBA::Environment &ACE_TRY_ENV) + RtecUDPAdmin::UDP_Addr& address + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp index 0715b27dd7b..6486aa05c1c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp @@ -15,24 +15,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -43,11 +43,11 @@ main (int argc, char* argv[]) attributes.supplier_reconnect = 1; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -55,12 +55,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -70,29 +70,29 @@ main (int argc, char* argv[]) EC_Counting_Supplier first_supplier; first_supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; first_supplier.connect (supplier_admin.in (), 0x00001111UL, 0x11110000UL, 0x00001111UL, - 0x11110000UL, - ACE_TRY_ENV); + 0x11110000UL + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; EC_Counting_Supplier second_supplier; second_supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; second_supplier.connect (supplier_admin.in (), 0x01100000UL, 0x00000110UL, 0x01100000UL, - 0x00000110UL, - ACE_TRY_ENV); + 0x00000110UL + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -108,8 +108,8 @@ main (int argc, char* argv[]) consumer_qos.insert (0x01100000, 0x00000110, 0); consumer_bitmask_reject.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -125,8 +125,8 @@ main (int argc, char* argv[]) consumer_qos.insert_null_terminator (); consumer_bitmask_accept.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -142,8 +142,8 @@ main (int argc, char* argv[]) consumer_qos.insert_null_terminator (); consumer_bitmask_filter.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -160,8 +160,8 @@ main (int argc, char* argv[]) 0x01100000, 0x00000110); consumer_bitmask_value.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -178,8 +178,8 @@ main (int argc, char* argv[]) 0x01100000, 0x00000110); consumer_bitmask_loose.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -192,36 +192,36 @@ main (int argc, char* argv[]) // **************************************************************** - consumer_bitmask_loose.disconnect (ACE_TRY_ENV); + consumer_bitmask_loose.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_bitmask_value.disconnect (ACE_TRY_ENV); + consumer_bitmask_value.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_bitmask_filter.disconnect (ACE_TRY_ENV); + consumer_bitmask_filter.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_bitmask_accept.disconnect (ACE_TRY_ENV); + consumer_bitmask_accept.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_bitmask_reject.disconnect (ACE_TRY_ENV); + consumer_bitmask_reject.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - second_supplier.deactivate (ACE_TRY_ENV); + second_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - second_supplier.disconnect (ACE_TRY_ENV); + second_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - first_supplier.deactivate (ACE_TRY_ENV); + first_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - first_supplier.disconnect (ACE_TRY_ENV); + first_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -239,7 +239,7 @@ main (int argc, char* argv[]) expected = second_supplier.event_count; consumer_bitmask_loose.dump_results (expected, 5); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp index 14f2f76483e..af1af27c30f 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp @@ -14,24 +14,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -40,11 +40,11 @@ main (int argc, char* argv[]) poa.in ()); TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -52,12 +52,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -69,15 +69,15 @@ main (int argc, char* argv[]) EC_Counting_Supplier supplier_00; supplier_00.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier_00.connect (supplier_admin.in (), event_source, event_type, event_source, - event_type, - ACE_TRY_ENV); + event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -85,15 +85,15 @@ main (int argc, char* argv[]) EC_Counting_Supplier supplier_01; supplier_01.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier_01.connect (supplier_admin.in (), event_source, event_type + 1, event_source, - event_type + 1, - ACE_TRY_ENV); + event_type + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -101,15 +101,15 @@ main (int argc, char* argv[]) EC_Counting_Supplier supplier_10; supplier_10.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier_10.connect (supplier_admin.in (), event_source + 1, event_type, event_source + 1, - event_type, - ACE_TRY_ENV); + event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -117,15 +117,15 @@ main (int argc, char* argv[]) EC_Counting_Supplier supplier_11; supplier_11.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier_11.connect (supplier_admin.in (), event_source + 1, event_type + 1, event_source + 1, - event_type + 1, - ACE_TRY_ENV); + event_type + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -143,8 +143,8 @@ main (int argc, char* argv[]) consumer_qos.insert_type (event_type, 0); consumer_00.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -163,8 +163,8 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); consumer_01.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -177,41 +177,41 @@ main (int argc, char* argv[]) // **************************************************************** - consumer_01.disconnect (ACE_TRY_ENV); + consumer_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_00.disconnect (ACE_TRY_ENV); + consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_11.deactivate (ACE_TRY_ENV); + supplier_11.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_10.deactivate (ACE_TRY_ENV); + supplier_10.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_01.deactivate (ACE_TRY_ENV); + supplier_01.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_00.deactivate (ACE_TRY_ENV); + supplier_00.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_11.disconnect (ACE_TRY_ENV); + supplier_11.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_10.disconnect (ACE_TRY_ENV); + supplier_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_01.disconnect (ACE_TRY_ENV); + supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_00.disconnect (ACE_TRY_ENV); + supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index 0cd5c5e78e2..af0ed3d1bde 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -18,24 +18,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -46,11 +46,11 @@ main (int argc, char* argv[]) attributes.supplier_reconnect = 1; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -58,12 +58,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -74,8 +74,8 @@ main (int argc, char* argv[]) event_source, event_type, event_source, - event_type, - ACE_TRY_ENV); + event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -89,8 +89,8 @@ main (int argc, char* argv[]) consumer_qos0.insert (event_source, event_type, 0); consumer0.connect (consumer_admin.in (), - consumer_qos0.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos0.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Consumer consumer1 ("Consumer/1", 200); @@ -98,8 +98,8 @@ main (int argc, char* argv[]) // connnect to the event channel.... consumer1.connect (consumer_admin.in (), - consumer_qos0.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos0.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -124,24 +124,24 @@ main (int argc, char* argv[]) // The consumers should be disconnected already, but make sure // that they did... - //consumer1.disconnect (ACE_TRY_ENV); + //consumer1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); //ACE_TRY_CHECK; - //consumer0.disconnect (ACE_TRY_ENV); + //consumer0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); //ACE_TRY_CHECK; // **************************************************************** - supplier0.disconnect (ACE_TRY_ENV); + supplier0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -173,8 +173,8 @@ Consumer::Consumer (const char* name, } void -Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &ACE_TRY_ENV) +Consumer::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) @@ -192,7 +192,7 @@ Consumer::push (const RtecEventComm::EventSet& events, return; } - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h index dec0e8f08b9..9f467e6c711 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.h +++ b/TAO/orbsvcs/tests/Event/Basic/Control.h @@ -38,8 +38,8 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp index 9c51cd6b368..c2b2605dd4d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp @@ -11,48 +11,48 @@ ACE_RCSID(EC_Tests, Disconnect, "$Id$") static void run_test (PortableServer::POA_ptr poa, - int use_callbacks, - CORBA::Environment &ACE_TRY_ENV); + int use_callbacks + TAO_ENV_ARG_DECL); int main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - run_test (poa.in (), 0, ACE_TRY_ENV); + run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - run_test (poa.in (), 1, ACE_TRY_ENV); + run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -68,45 +68,45 @@ main (int argc, char* argv[]) // **************************************************************** void -deactivate_servant (PortableServer::Servant servant, - CORBA::Environment &ACE_TRY_ENV) +deactivate_servant (PortableServer::Servant servant + TAO_ENV_ARG_DECL) { PortableServer::POA_var poa = - servant->_default_POA (ACE_TRY_ENV); + servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (servant, ACE_TRY_ENV); + poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void run_test (PortableServer::POA_ptr poa, - int use_callbacks, - CORBA::Environment &ACE_TRY_ENV) + int use_callbacks + TAO_ENV_ARG_DECL) { TAO_EC_Event_Channel_Attributes attributes (poa, poa); attributes.disconnect_callbacks = use_callbacks; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // **************************************************************** // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // and the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // **************************************************************** @@ -133,56 +133,56 @@ run_test (PortableServer::POA_ptr poa, for (int i = 0; i != iterations; ++i) { supplier_0.connect (supplier_admin.in (), - supplier_qos.get_SupplierQOS (), - ACE_TRY_ENV); + supplier_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; consumer_0.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (i % 2 == 1) { supplier_1.connect (supplier_admin.in (), - supplier_qos.get_SupplierQOS (), - ACE_TRY_ENV); + supplier_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; consumer_1.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } - supplier_0.disconnect (ACE_TRY_ENV); + supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - consumer_0.disconnect (ACE_TRY_ENV); + consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (i % 2 == 1) { - consumer_1.disconnect (ACE_TRY_ENV); + consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - supplier_1.disconnect (ACE_TRY_ENV); + supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } supplier_0.connect (supplier_admin.in (), - supplier_qos.get_SupplierQOS (), - ACE_TRY_ENV); + supplier_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; consumer_0.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&supplier_0, ACE_TRY_ENV); + deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&consumer_0, ACE_TRY_ENV); + deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&ec_impl, ACE_TRY_ENV); + deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ULong count_0 = 1; diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp index f6029e91dc8..b02ef2f8546 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp @@ -15,24 +15,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -43,60 +43,60 @@ main (int argc, char* argv[]) attributes.supplier_reconnect = 1; TAO_EC_Event_Channel ec_impl_1 (attributes); - ec_impl_1.activate (ACE_TRY_ENV); + ec_impl_1.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel_1 = - ec_impl_1._this (ACE_TRY_ENV); + ec_impl_1._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** TAO_EC_Event_Channel ec_impl_2 (attributes); - ec_impl_2.activate (ACE_TRY_ENV); + ec_impl_2.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel_2 = - ec_impl_2._this (ACE_TRY_ENV); + ec_impl_2._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_1 = - event_channel_1->for_consumers (ACE_TRY_ENV); + event_channel_1->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_1 = - event_channel_1->for_suppliers (ACE_TRY_ENV); + event_channel_1->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_2 = - event_channel_2->for_consumers (ACE_TRY_ENV); + event_channel_2->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_2 = - event_channel_2->for_suppliers (ACE_TRY_ENV); + event_channel_2->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** TAO_EC_Gateway_IIOP gateway; gateway.init (event_channel_1.in (), - event_channel_2.in (), - ACE_TRY_ENV); + event_channel_2.in () + TAO_ENV_ARG_PARAMETER); RtecEventChannelAdmin::Observer_var obs = - gateway._this (ACE_TRY_ENV); + gateway._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::Observer_Handle h = - event_channel_2->append_observer (obs.in (), ACE_TRY_ENV); + event_channel_2->append_observer (obs.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; gateway.observer_handle (h); @@ -110,29 +110,29 @@ main (int argc, char* argv[]) EC_Counting_Supplier supplier_00; supplier_00.activate (consumer_admin_1.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier_00.connect (supplier_admin_1.in (), event_source, event_type, event_source, - event_type, - ACE_TRY_ENV); + event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; EC_Counting_Supplier supplier_01; supplier_01.activate (consumer_admin_1.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier_01.connect (supplier_admin_1.in (), event_source, event_type + 1, event_source, - event_type + 1, - ACE_TRY_ENV); + event_type + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -148,8 +148,8 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -179,8 +179,8 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type + 1, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -206,8 +206,8 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -226,7 +226,7 @@ main (int argc, char* argv[]) // **************************************************************** - consumer_00.disconnect (ACE_TRY_ENV); + consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -237,8 +237,8 @@ main (int argc, char* argv[]) consumer_qos.insert_type (event_type, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -268,8 +268,8 @@ main (int argc, char* argv[]) consumer_qos.insert_type (event_type + 1, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -295,8 +295,8 @@ main (int argc, char* argv[]) consumer_qos.insert_type (event_type, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -315,36 +315,36 @@ main (int argc, char* argv[]) // **************************************************************** - consumer_00.disconnect (ACE_TRY_ENV); + consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_01.deactivate (ACE_TRY_ENV); + supplier_01.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_00.deactivate (ACE_TRY_ENV); + supplier_00.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_01.disconnect (ACE_TRY_ENV); + supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_00.disconnect (ACE_TRY_ENV); + supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - gateway.shutdown (ACE_TRY_ENV); + gateway.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel_1->destroy (ACE_TRY_ENV); + event_channel_1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - event_channel_2->destroy (ACE_TRY_ENV); + event_channel_2->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp index 95abf2a614a..104c76200c7 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -12,48 +12,48 @@ ACE_RCSID(EC_Tests, MT_Disconnect, "$Id$") static void run_test (PortableServer::POA_ptr poa, - int use_callbacks, - CORBA::Environment &ACE_TRY_ENV); + int use_callbacks + TAO_ENV_ARG_DECL); int main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - run_test (poa.in (), 0, ACE_TRY_ENV); + run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - run_test (poa.in (), 1, ACE_TRY_ENV); + run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -69,33 +69,33 @@ main (int argc, char* argv[]) // **************************************************************** void -deactivate_servant (PortableServer::Servant servant, - CORBA::Environment &ACE_TRY_ENV) +deactivate_servant (PortableServer::Servant servant + TAO_ENV_ARG_DECL) { PortableServer::POA_var poa = - servant->_default_POA (ACE_TRY_ENV); + servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (servant, ACE_TRY_ENV); + poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void run_test (PortableServer::POA_ptr poa, - int use_callbacks, - CORBA::Environment &ACE_TRY_ENV) + int use_callbacks + TAO_ENV_ARG_DECL) { TAO_EC_Event_Channel_Attributes attributes (poa, poa); attributes.disconnect_callbacks = use_callbacks; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Task task (event_channel.in (), use_callbacks); @@ -108,10 +108,10 @@ run_test (PortableServer::POA_ptr poa, // Wait for all the threads to complete and the return ACE_Thread_Manager::instance ()->wait (); - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&ec_impl, ACE_TRY_ENV); + deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -130,7 +130,7 @@ Task::svc () { ACE_TRY_NEW_ENV { - this->run_iteration (ACE_TRY_ENV); + this->run_iteration (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -143,16 +143,16 @@ Task::svc () } void -Task::run_iteration (CORBA::Environment &ACE_TRY_ENV) +Task::run_iteration (TAO_ENV_SINGLE_ARG_DECL) { // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel->for_consumers (ACE_TRY_ENV); + this->event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // and the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->event_channel->for_suppliers (ACE_TRY_ENV); + this->event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // **************************************************************** @@ -179,41 +179,41 @@ Task::run_iteration (CORBA::Environment &ACE_TRY_ENV) for (int i = 0; i != iterations; ++i) { supplier_0.connect (supplier_admin.in (), - supplier_qos.get_SupplierQOS (), - ACE_TRY_ENV); + supplier_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; consumer_0.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (i % 2 == 1) { supplier_1.connect (supplier_admin.in (), - supplier_qos.get_SupplierQOS (), - ACE_TRY_ENV); + supplier_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; consumer_1.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } - supplier_0.disconnect (ACE_TRY_ENV); + supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - consumer_0.disconnect (ACE_TRY_ENV); + consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (i % 2 == 1) { - consumer_1.disconnect (ACE_TRY_ENV); + consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - supplier_1.disconnect (ACE_TRY_ENV); + supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } - deactivate_servant (&supplier_0, ACE_TRY_ENV); + deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&consumer_0, ACE_TRY_ENV); + deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ULong count_0 = 0; diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h index b9758c338b6..68cb65381d6 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h @@ -34,7 +34,7 @@ public: // = Check the ACE_Task_Base documentation. int svc (void); - void run_iteration (CORBA::Environment &ACE_TRY_ENV); + void run_iteration (TAO_ENV_SINGLE_ARG_DECL); // Run a single iteration of the test private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp index 4efc3a0d98d..e8775059df6 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp @@ -15,24 +15,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -43,11 +43,11 @@ main (int argc, char* argv[]) attributes.supplier_reconnect = 1; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -55,12 +55,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -72,43 +72,43 @@ main (int argc, char* argv[]) EC_Counting_Supplier first_supplier; first_supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; first_supplier.connect (supplier_admin.in (), event_source, event_type, event_source, - event_type, - ACE_TRY_ENV); + event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; EC_Counting_Supplier second_supplier; second_supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; second_supplier.connect (supplier_admin.in (), event_source, event_type + 1, event_source, - event_type + 1, - ACE_TRY_ENV); + event_type + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; EC_Counting_Supplier third_supplier; third_supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; third_supplier.connect (supplier_admin.in (), event_source, event_type + 1, event_source, - event_type + 1, - ACE_TRY_ENV); + event_type + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -124,8 +124,8 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); regular_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -142,8 +142,8 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); negation_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -156,37 +156,37 @@ main (int argc, char* argv[]) // **************************************************************** - negation_consumer.disconnect (ACE_TRY_ENV); + negation_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - regular_consumer.disconnect (ACE_TRY_ENV); + regular_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - third_supplier.deactivate (ACE_TRY_ENV); + third_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - third_supplier.disconnect (ACE_TRY_ENV); + third_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - second_supplier.deactivate (ACE_TRY_ENV); + second_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - second_supplier.disconnect (ACE_TRY_ENV); + second_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - first_supplier.deactivate (ACE_TRY_ENV); + first_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - first_supplier.disconnect (ACE_TRY_ENV); + first_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -199,7 +199,7 @@ main (int argc, char* argv[]) first_supplier.event_count; regular_consumer.dump_results (expected, 5); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index 3a53241333a..b8b90e089fd 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -48,7 +48,7 @@ EC_Master::run (int argc, char* argv[]) this->seed_ = ACE_OS::time (0); - this->initialize_orb_and_poa (argc, argv, ACE_TRY_ENV); + this->initialize_orb_and_poa (argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv)) @@ -84,7 +84,7 @@ EC_Master::run (int argc, char* argv[]) int targc = argc; for (int j = 0; j < targc; ++j) targv[j] = argv[j]; - this->channels_[i]->run_init (targc, targv, ACE_TRY_ENV); + this->channels_[i]->run_init (targc, targv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } delete[] targv; @@ -93,7 +93,7 @@ EC_Master::run (int argc, char* argv[]) { for (int i = 0; i != this->n_channels_; ++i) { - this->channels_[i]->execute_test (ACE_TRY_ENV); + this->channels_[i]->execute_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -115,7 +115,7 @@ EC_Master::run (int argc, char* argv[]) { for (int i = 0; i != this->n_channels_; ++i) { - this->channels_[i]->run_cleanup (ACE_TRY_ENV); + this->channels_[i]->run_cleanup (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -123,13 +123,13 @@ EC_Master::run (int argc, char* argv[]) { for (int i = 0; i != this->n_channels_; ++i) { - this->channels_[i]->disconnect_clients (ACE_TRY_ENV); + this->channels_[i]->disconnect_clients (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->channels_[i]->shutdown_clients (ACE_TRY_ENV); + this->channels_[i]->shutdown_clients (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->channels_[i]->destroy_ec (ACE_TRY_ENV); + this->channels_[i]->destroy_ec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->channels_[i]->deactivate_ec (ACE_TRY_ENV); + this->channels_[i]->deactivate_ec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->channels_[i]->cleanup_tasks (); this->channels_[i]->cleanup_suppliers (); @@ -139,11 +139,11 @@ EC_Master::run (int argc, char* argv[]) } this->root_poa_->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->orb_->destroy (ACE_TRY_ENV); + this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -159,15 +159,15 @@ EC_Master::run (int argc, char* argv[]) } void -EC_Master::initialize_orb_and_poa (int &argc, char* argv[], - CORBA::Environment& ACE_TRY_ENV) +EC_Master::initialize_orb_and_poa (int &argc, char* argv[] + TAO_ENV_ARG_DECL) { this->orb_ = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA", ACE_TRY_ENV); + this->orb_->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -178,14 +178,14 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[], } this->root_poa_ = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (ACE_TRY_ENV); + this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -249,8 +249,8 @@ EC_Observer::~EC_Observer (void) } void -EC_Observer::initialize_orb_and_poa (int&, char*[], - CORBA::Environment&) +EC_Observer::initialize_orb_and_poa (int&, char*[] + TAO_ENV_ARG_DECL_NOT_USED) { } @@ -273,7 +273,7 @@ EC_Observer::print_usage (void) } void -EC_Observer::execute_test (CORBA::Environment& ACE_TRY_ENV) +EC_Observer::execute_test (TAO_ENV_SINGLE_ARG_DECL) { int peer_count = this->master_->channel_count (); ACE_NEW (this->gwys_, TAO_EC_Gateway_IIOP[peer_count]); @@ -287,15 +287,15 @@ EC_Observer::execute_test (CORBA::Environment& ACE_TRY_ENV) this->master_->channel (i)->event_channel_.in (); this->gwys_[i].init (rmt_ec, - this->event_channel_.in (), - ACE_TRY_ENV); + this->event_channel_.in () + TAO_ENV_ARG_PARAMETER); RtecEventChannelAdmin::Observer_var obs = - this->gwys_[i]._this (ACE_TRY_ENV); + this->gwys_[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::Observer_Handle h = - rmt_ec->append_observer (obs.in (), ACE_TRY_ENV); + rmt_ec->append_observer (obs.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->gwys_[i].observer_handle (h); @@ -306,7 +306,7 @@ EC_Observer::execute_test (CORBA::Environment& ACE_TRY_ENV) if (this->allocate_tasks () == -1) return; - this->activate_tasks (ACE_TRY_ENV); + this->activate_tasks (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -315,7 +315,7 @@ EC_Observer::execute_test (CORBA::Environment& ACE_TRY_ENV) } void -EC_Observer::run_cleanup (CORBA::Environment& ACE_TRY_ENV) +EC_Observer::run_cleanup (TAO_ENV_SINGLE_ARG_DECL) { for (int j = 0; j != this->master_->channel_count (); ++j) { @@ -324,11 +324,11 @@ EC_Observer::run_cleanup (CORBA::Environment& ACE_TRY_ENV) RtecEventChannelAdmin::EventChannel_ptr rmt_ec = this->master_->channel (j)->event_channel_.in (); - rmt_ec->remove_observer (this->gwys_[j].observer_handle (), - ACE_TRY_ENV); + rmt_ec->remove_observer (this->gwys_[j].observer_handle () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->gwys_[j].shutdown (ACE_TRY_ENV); + this->gwys_[j].shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -362,25 +362,25 @@ EC_Observer::dump_results (void) void EC_Observer::connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int i, - CORBA::Environment &ACE_TRY_ENV) + int i + TAO_ENV_ARG_DECL) { if (i == 0) { - this->EC_Driver::connect_consumer (consumer_admin, i, - ACE_TRY_ENV); + this->EC_Driver::connect_consumer (consumer_admin, i + TAO_ENV_ARG_PARAMETER); return; } unsigned int x = ACE_OS::rand_r (this->seed_); if (x < RAND_MAX / 8) - this->EC_Driver::connect_consumer (consumer_admin, i, - ACE_TRY_ENV); + this->EC_Driver::connect_consumer (consumer_admin, i + TAO_ENV_ARG_PARAMETER); } void EC_Observer::consumer_push (void*, - const RtecEventComm::EventSet&, - CORBA::Environment& ACE_TRY_ENV) + const RtecEventComm::EventSet& + TAO_ENV_ARG_DECL) { unsigned int x = ACE_OS::rand_r (this->seed_); if (x < (RAND_MAX / 64)) @@ -390,7 +390,7 @@ EC_Observer::consumer_push (void*, "EC_Observer[%d] (%P|%t) reconnecting\n", this->id_)); RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (ACE_TRY_ENV); + this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (int i = 1; i < this->n_consumers_; ++i) @@ -399,13 +399,13 @@ EC_Observer::consumer_push (void*, if (this->consumers_[i]->connected ()) { - this->consumers_[i]->disconnect (ACE_TRY_ENV); + this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else { this->EC_Driver::connect_consumer (consumer_admin.in (), - i, ACE_TRY_ENV); + i TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h index 5b2fe020327..655ad3e9111 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.h +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h @@ -43,8 +43,8 @@ public: virtual int run (int argc, char* argv[]); // Execute the test. - virtual void initialize_orb_and_poa (int& argc, char* argv[], - CORBA::Environment& env); + virtual void initialize_orb_and_poa (int& argc, char* argv[] + TAO_ENV_ARG_DECL); // Obtain the orb and the poa pointers int channel_count (void) const; @@ -89,25 +89,25 @@ public: // Destructor // = The EC_Driver methods - virtual void initialize_orb_and_poa (int& argc, char* argv[], - CORBA::Environment& env); + virtual void initialize_orb_and_poa (int& argc, char* argv[] + TAO_ENV_ARG_DECL); virtual int parse_args (int& argc, char* argv[]); virtual void print_args (void) const; virtual void print_usage (void); // add some command line args to enable/disable observerions - void execute_test (CORBA::Environment& ACE_TRY_ENV); - void run_cleanup (CORBA::Environment& ACE_TRY_ENV); + void execute_test (TAO_ENV_SINGLE_ARG_DECL); + void run_cleanup (TAO_ENV_SINGLE_ARG_DECL); // Run the suppliers, using the <thread_manager> parameter void dump_results (void); void connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int i, - CORBA::Environment &ACE_TRY_ENV); + int i + TAO_ENV_ARG_DECL); void consumer_push (void*, - const RtecEventComm::EventSet&, - CORBA::Environment& ACE_TRY_ENV); + const RtecEventComm::EventSet& + TAO_ENV_ARG_DECL); private: EC_Master *master_; diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index 942b3a23fc6..5b9b6cbcf73 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -21,16 +21,16 @@ main (int argc, char* argv[]) const int base_type = 20; void -deactivate_servant (PortableServer::Servant servant, - CORBA::Environment &ACE_TRY_ENV) +deactivate_servant (PortableServer::Servant servant + TAO_ENV_ARG_DECL) { PortableServer::POA_var poa = - servant->_default_POA (ACE_TRY_ENV); + servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = - poa->servant_to_id (servant, ACE_TRY_ENV); + poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (oid.in (), ACE_TRY_ENV); + poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -49,11 +49,11 @@ RND_Driver::RND_Driver (void) int RND_Driver::run (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -116,15 +116,15 @@ RND_Driver::run (int argc, char *argv[]) // **************************************************************** CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -135,23 +135,23 @@ RND_Driver::run (int argc, char *argv[]) attributes.supplier_reconnect = 1; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** // Obtain the consumer admin.. this->consumer_admin_ = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. this->supplier_admin_ = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -172,8 +172,8 @@ RND_Driver::run (int argc, char *argv[]) 0); this->timer_.connect (this->consumer_admin_.in (), - qos.get_ConsumerQOS (), - ACE_TRY_ENV); + qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -184,8 +184,8 @@ RND_Driver::run (int argc, char *argv[]) qos.insert (0, base_type, 0, 1); this->supplier_.connect (this->supplier_admin_.in (), - qos.get_SupplierQOS (), - ACE_TRY_ENV); + qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -201,7 +201,7 @@ RND_Driver::run (int argc, char *argv[]) 1); CORBA::Object_var obj = - this->consumers_[i]->_this (ACE_TRY_ENV); + this->consumers_[i]->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -218,7 +218,7 @@ RND_Driver::run (int argc, char *argv[]) this->suppliers_[j]->activate (); CORBA::Object_var obj = - this->suppliers_[j]->_this (ACE_TRY_ENV); + this->suppliers_[j]->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -234,10 +234,10 @@ RND_Driver::run (int argc, char *argv[]) { for (int k = 0; k != this->nsuppliers_; ++k) { - deactivate_servant (this->suppliers_[k], - ACE_TRY_ENV); + deactivate_servant (this->suppliers_[k] + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->suppliers_[k]->_remove_ref (ACE_TRY_ENV); + this->suppliers_[k]->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } delete[] this->suppliers_; @@ -248,7 +248,7 @@ RND_Driver::run (int argc, char *argv[]) // We destroy now to verify that the callbacks work and do not // produce any problems. - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -256,10 +256,10 @@ RND_Driver::run (int argc, char *argv[]) { for (int k = 0; k != this->nconsumers_; ++k) { - deactivate_servant (this->consumers_[k], - ACE_TRY_ENV); + deactivate_servant (this->consumers_[k] + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->consumers_[k]->_remove_ref (ACE_TRY_ENV); + this->consumers_[k]->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } delete[] this->consumers_; @@ -268,18 +268,18 @@ RND_Driver::run (int argc, char *argv[]) // **************************************************************** - deactivate_servant (&ec_impl, - ACE_TRY_ENV); + deactivate_servant (&ec_impl + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -292,8 +292,8 @@ RND_Driver::run (int argc, char *argv[]) } void -RND_Driver::timer (const RtecEventComm::Event &e, - CORBA::Environment &ACE_TRY_ENV) +RND_Driver::timer (const RtecEventComm::Event &e + TAO_ENV_ARG_DECL) { int r = ACE_OS::rand (); if (r < 0) @@ -313,7 +313,7 @@ RND_Driver::timer (const RtecEventComm::Event &e, event.length (1); event[0] = e; event[0].header.source ++; - this->supplier_.push (event, ACE_TRY_ENV); + this->supplier_.push (event TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -337,8 +337,8 @@ RND_Driver::timer (const RtecEventComm::Event &e, qos.insert (0, base_type, 0, 1); this->suppliers_[n]->connect (this->supplier_admin_.in (), - qos.get_SupplierQOS (), - ACE_TRY_ENV); + qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } break; @@ -354,8 +354,8 @@ RND_Driver::timer (const RtecEventComm::Event &e, qos.insert_type (base_type, 0); this->consumers_[n]->connect (this->consumer_admin_.in (), - qos.get_ConsumerQOS (), - ACE_TRY_ENV); + qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } break; @@ -366,7 +366,7 @@ RND_Driver::timer (const RtecEventComm::Event &e, // ACE_DEBUG ((LM_DEBUG, "Disconnecting supplier %d\n", n)); - this->suppliers_[n]->disconnect (ACE_TRY_ENV); + this->suppliers_[n]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } break; @@ -377,7 +377,7 @@ RND_Driver::timer (const RtecEventComm::Event &e, // ACE_DEBUG ((LM_DEBUG, "Disconnecting consumer %d\n", n)); - this->consumers_[n]->disconnect (ACE_TRY_ENV); + this->consumers_[n]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } break; @@ -385,22 +385,22 @@ RND_Driver::timer (const RtecEventComm::Event &e, } void -RND_Driver::event (const RtecEventComm::Event &e, - CORBA::Environment &ACE_TRY_ENV) +RND_Driver::event (const RtecEventComm::Event &e + TAO_ENV_ARG_DECL) { - this->timer (e, ACE_TRY_ENV); + this->timer (e TAO_ENV_ARG_PARAMETER); } // **************************************************************** void -RND_Timer::push (const RtecEventComm::EventSet &event, - CORBA::Environment &ACE_TRY_ENV) +RND_Timer::push (const RtecEventComm::EventSet &event + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - this->driver_->timer (event[0], ACE_TRY_ENV); + this->driver_->timer (event[0] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -413,8 +413,8 @@ RND_Timer::push (const RtecEventComm::EventSet &event, void RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin, - const RtecEventChannelAdmin::ConsumerQOS &qos, - CORBA::Environment &ACE_TRY_ENV) + const RtecEventChannelAdmin::ConsumerQOS &qos + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -422,44 +422,44 @@ RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin, if (CORBA::is_nil (this->proxy_.in ())) { - this->proxy_ = admin->obtain_push_supplier (ACE_TRY_ENV); + this->proxy_ = admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } proxy = RtecEventChannelAdmin::ProxyPushSupplier::_duplicate(this->proxy_.in ()); } RtecEventComm::PushConsumer_var me = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; proxy->connect_push_consumer (me.in (), - qos, - ACE_TRY_ENV); + qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -RND_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +RND_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) return; - this->proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); } void -RND_Consumer::push (const RtecEventComm::EventSet &event, - CORBA::Environment &ACE_TRY_ENV) +RND_Consumer::push (const RtecEventComm::EventSet &event + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->event (event[0], ACE_TRY_ENV); + this->driver_->event (event[0] TAO_ENV_ARG_PARAMETER); } void -RND_Consumer::disconnect_push_consumer (CORBA::Environment &) +RND_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -468,8 +468,8 @@ RND_Consumer::disconnect_push_consumer (CORBA::Environment &) void RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, - const RtecEventChannelAdmin::SupplierQOS &qos, - CORBA::Environment &ACE_TRY_ENV) + const RtecEventChannelAdmin::SupplierQOS &qos + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -477,7 +477,7 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, if (CORBA::is_nil (this->proxy_.in ())) { - this->proxy_ = admin->obtain_push_consumer (ACE_TRY_ENV); + this->proxy_ = admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -485,41 +485,41 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ()); } RtecEventComm::PushSupplier_var me = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; proxy->connect_push_supplier (me.in (), - qos, - ACE_TRY_ENV); + qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -RND_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +RND_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) return; - this->proxy_->disconnect_push_consumer (ACE_TRY_ENV); + this->proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); } void -RND_Supplier::push_new_event (CORBA::Environment &ACE_TRY_ENV) +RND_Supplier::push_new_event (TAO_ENV_SINGLE_ARG_DECL) { RtecEventComm::EventSet event (1); event.length (1); event[0].header.type = base_type; event[0].header.source = 0; - this->push (event, ACE_TRY_ENV); + this->push (event TAO_ENV_ARG_PARAMETER); } void -RND_Supplier::push (RtecEventComm::EventSet &event, - CORBA::Environment &ACE_TRY_ENV) +RND_Supplier::push (RtecEventComm::EventSet &event + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -532,11 +532,11 @@ RND_Supplier::push (RtecEventComm::EventSet &event, RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ()); } - proxy->push (event, ACE_TRY_ENV); + proxy->push (event TAO_ENV_ARG_PARAMETER); } void -RND_Supplier::disconnect_push_supplier (CORBA::Environment &) +RND_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -549,13 +549,13 @@ RND_Supplier::svc (void) int niterations = 5000; for (int i = 0; i != niterations; ++i) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { ACE_Time_Value tv (0, 10000); ACE_OS::sleep (tv); - this->push_new_event (ACE_TRY_ENV); + this->push_new_event (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h index 9ba7af06e4f..3ef3e1f0bb9 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.h +++ b/TAO/orbsvcs/tests/Event/Basic/Random.h @@ -47,16 +47,16 @@ public: RND_Consumer (RND_Driver *driver); // Constructor - void push (const RtecEventComm::EventSet &event, - CORBA::Environment &ACE_TRY_ENV) + void push (const RtecEventComm::EventSet &event + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) + void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin, - const RtecEventChannelAdmin::ConsumerQOS &qos, - CORBA::Environment &ACE_TRY_ENV); - void disconnect (CORBA::Environment &ACE_TRY_ENV); + const RtecEventChannelAdmin::ConsumerQOS &qos + TAO_ENV_ARG_DECL); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); protected: RND_Driver *driver_; @@ -82,8 +82,8 @@ class RND_Timer : public RND_Consumer public: RND_Timer (RND_Driver *driver); - void push (const RtecEventComm::EventSet &event, - CORBA::Environment &ACE_TRY_ENV) + void push (const RtecEventComm::EventSet &event + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -110,16 +110,16 @@ public: // Constructor void connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, - const RtecEventChannelAdmin::SupplierQOS &qos, - CORBA::Environment &ACE_TRY_ENV); - void disconnect (CORBA::Environment &ACE_TRY_ENV); + const RtecEventChannelAdmin::SupplierQOS &qos + TAO_ENV_ARG_DECL); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); - void push_new_event (CORBA::Environment &ACE_TRY_ENV); - void push (RtecEventComm::EventSet &event, - CORBA::Environment &ACE_TRY_ENV); + void push_new_event (TAO_ENV_SINGLE_ARG_DECL); + void push (RtecEventComm::EventSet &event + TAO_ENV_ARG_DECL); // Push a single event... - virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int svc (void); @@ -152,12 +152,12 @@ public: int run (int argc, char *argv[]); // Run the test - void timer (const RtecEventComm::Event &e, - CORBA::Environment &ACE_TRY_ENV); + void timer (const RtecEventComm::Event &e + TAO_ENV_ARG_DECL); // The main timer has expired - void event (const RtecEventComm::Event &e, - CORBA::Environment &ACE_TRY_ENV); + void event (const RtecEventComm::Event &e + TAO_ENV_ARG_DECL); // One of the consumers has received an event private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index 07f8ca298d9..3a2533f44d4 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -88,18 +88,18 @@ EC_Reconnect::modify_attributes (TAO_EC_Event_Channel_Attributes& attr) } void -EC_Reconnect::execute_test (CORBA::Environment& ACE_TRY_ENV) +EC_Reconnect::execute_test (TAO_ENV_SINGLE_ARG_DECL) { - this->execute_consumer_test (ACE_TRY_ENV); + this->execute_consumer_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->execute_supplier_test (ACE_TRY_ENV); + this->execute_supplier_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); this->consumer_reconnect_.dump_results ("Reconnect/consumer", gsf); this->supplier_reconnect_.dump_results ("Reconnect/supplier", gsf); - // this->EC_Driver::execute_test (ACE_TRY_ENV); + // this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER); } void @@ -108,11 +108,11 @@ EC_Reconnect::dump_results (void) } void -EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV) +EC_Reconnect::execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ConsumerQOS qos; int shutdown_event_type; - this->build_consumer_qos (0, qos, shutdown_event_type, ACE_TRY_ENV); + this->build_consumer_qos (0, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->allow_consumer_reconnect_) @@ -122,8 +122,8 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->consumers_[0]->connect (qos, - shutdown_event_type, - ACE_TRY_ENV); + shutdown_event_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t stop = ACE_OS::gethrtime (); this->consumer_reconnect_.sample (stop - start_time, @@ -135,8 +135,8 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV) ACE_TRY { this->consumers_[0]->connect (qos, - shutdown_event_type, - ACE_TRY_ENV); + shutdown_event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_ERROR, "Expected exception\n")); @@ -153,19 +153,19 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV) ACE_ENDTRY; RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (ACE_TRY_ENV); + this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t start_time = ACE_OS::gethrtime (); for (int i = 0; i < this->disconnections_; ++i) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->consumers_[0]->disconnect (ACE_TRY_ENV); + this->consumers_[0]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumers_[0]->connect (consumer_admin.in (), qos, - shutdown_event_type, - ACE_TRY_ENV); + shutdown_event_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t stop = ACE_OS::gethrtime (); this->consumer_reconnect_.sample (stop - start_time, @@ -175,11 +175,11 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV) } void -EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV) +EC_Reconnect::execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::SupplierQOS qos; int shutdown_event_type; - this->build_supplier_qos (0, qos, shutdown_event_type, ACE_TRY_ENV); + this->build_supplier_qos (0, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->allow_supplier_reconnect_) @@ -188,8 +188,8 @@ EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV) for (int i = 0; i < this->disconnections_; ++i) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->suppliers_[0]->connect (qos, shutdown_event_type, - ACE_TRY_ENV); + this->suppliers_[0]->connect (qos, shutdown_event_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t stop = ACE_OS::gethrtime (); this->supplier_reconnect_.sample (stop - start_time, @@ -200,8 +200,8 @@ EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV) { ACE_TRY { - this->suppliers_[0]->connect (qos, shutdown_event_type, - ACE_TRY_ENV); + this->suppliers_[0]->connect (qos, shutdown_event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_ERROR, "Expected exception\n")); @@ -218,19 +218,19 @@ EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV) ACE_ENDTRY; RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->event_channel_->for_suppliers (ACE_TRY_ENV); + this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t start_time = ACE_OS::gethrtime (); for (int i = 0; i < this->disconnections_; ++i) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->suppliers_[0]->disconnect (ACE_TRY_ENV); + this->suppliers_[0]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->suppliers_[0]->connect (supplier_admin.in (), qos, - shutdown_event_type, - ACE_TRY_ENV); + shutdown_event_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t stop = ACE_OS::gethrtime (); this->supplier_reconnect_.sample (stop - start_time, diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h index 66cfbdca3a6..34f32a5388d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h @@ -54,14 +54,14 @@ public: virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); // set the reconnection flags - void execute_test (CORBA::Environment& ACE_TRY_ENV); + void execute_test (TAO_ENV_SINGLE_ARG_DECL); // Don't run the suppliers, just test connect and disconnect calls. void dump_results (void); // Don't dump the EC_Driver results, they are meaningless. - void execute_consumer_test (CORBA::Environment& ACE_TRY_ENV); - void execute_supplier_test (CORBA::Environment& ACE_TRY_ENV); + void execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Separate the suppliers and consumers. private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp index 98ced023e05..3b51c048d04 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp @@ -49,13 +49,13 @@ EC_Schedule::print_usage (void) } void -EC_Schedule::initialize_ec_impl (CORBA::Environment &ACE_TRY_ENV) +EC_Schedule::initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL) { this->scheduler_impl_ = new ACE_Config_Scheduler; - this->scheduler_ = this->scheduler_impl_->_this (ACE_TRY_ENV); + this->scheduler_ = this->scheduler_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->EC_Driver::initialize_ec_impl (ACE_TRY_ENV); + this->EC_Driver::initialize_ec_impl (TAO_ENV_SINGLE_ARG_PARAMETER); } void @@ -72,7 +72,7 @@ EC_Schedule::cleanup_ec (void) } void -EC_Schedule::execute_test (CORBA::Environment& ACE_TRY_ENV) +EC_Schedule::execute_test (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Long min_priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -90,8 +90,8 @@ EC_Schedule::execute_test (CORBA::Environment& ACE_TRY_ENV) this->scheduler_->compute_scheduling (min_priority, max_priority, infos.out (), configs.out (), - anomalies.out (), - ACE_TRY_ENV); + anomalies.out () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -112,14 +112,14 @@ void EC_Schedule::build_consumer_qos ( int i, RtecEventChannelAdmin::ConsumerQOS& qos, - int& shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV) + int& shutdown_event_type + TAO_ENV_ARG_DECL) { char name[128]; ACE_OS::sprintf (name, "EC_Schedule::Consumer::%04x", i); RtecScheduler::handle_t rt_info = - this->scheduler_->create (name, ACE_TRY_ENV); + this->scheduler_->create (name TAO_ENV_ARG_PARAMETER); ACE_CHECK; // The worst case execution time is far less than 2 @@ -134,8 +134,8 @@ EC_Schedule::build_consumer_qos ( RtecScheduler::VERY_LOW_IMPORTANCE, time, 0, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK; int type_start = @@ -158,14 +158,14 @@ void EC_Schedule::build_supplier_qos ( int i, RtecEventChannelAdmin::SupplierQOS& qos, - int& shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV) + int& shutdown_event_type + TAO_ENV_ARG_DECL) { char name[128]; ACE_OS::sprintf (name, "EC_Schedule::Supplier::%04x", i); RtecScheduler::handle_t rt_info = - this->scheduler_->create (name, ACE_TRY_ENV); + this->scheduler_->create (name TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_Time_Value tv (0, this->burst_pause_); @@ -185,8 +185,8 @@ EC_Schedule::build_supplier_qos ( RtecScheduler::VERY_LOW_IMPORTANCE, time, 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK; int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_; diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h index e78cd815f8f..54a448f532c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h @@ -59,12 +59,12 @@ public: // add some command line args to change the scheduling service to // use. - void initialize_ec_impl (CORBA::Environment &ACE_TRY_ENV); + void initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL); void cleanup_ec (void); virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); // Set the scheduling service attribute - void execute_test (CORBA::Environment& ACE_TRY_ENV); + void execute_test (TAO_ENV_SINGLE_ARG_DECL); // Don't run the suppliers, just compute the schedule. void dump_results (void); @@ -73,13 +73,13 @@ public: virtual void build_consumer_qos ( int i, RtecEventChannelAdmin::ConsumerQOS& qos, - int& shutdown_event_type, - CORBA::Environment&); + int& shutdown_event_type + TAO_ENV_ARG_DECL_NOT_USED); virtual void build_supplier_qos ( int i, RtecEventChannelAdmin::SupplierQOS& qos, - int& shutdown_event_type, - CORBA::Environment&); + int& shutdown_event_type + TAO_ENV_ARG_DECL_NOT_USED); // This time really connect to the scheduler private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp index d61b2bdc526..2dfa9322b2c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp @@ -22,18 +22,18 @@ EC_Shutdown::EC_Shutdown (void) } void -EC_Shutdown::execute_test (CORBA::Environment& ACE_TRY_ENV) +EC_Shutdown::execute_test (TAO_ENV_SINGLE_ARG_DECL) { if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) destroying EC\n")); - this->destroy_ec (ACE_TRY_ENV); + this->destroy_ec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec destroyed\n")); - this->deactivate_ec (ACE_TRY_ENV); + this->deactivate_ec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -44,16 +44,16 @@ EC_Shutdown::execute_test (CORBA::Environment& ACE_TRY_ENV) if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec cleanup\n")); - this->initialize_ec_impl (ACE_TRY_ENV); + this->initialize_ec_impl (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect_consumers (ACE_TRY_ENV); + this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect_suppliers (ACE_TRY_ENV); + this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) status reset\n")); - // this->EC_Driver::execute_test (ACE_TRY_ENV); + // this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER); } void @@ -71,8 +71,8 @@ EC_Shutdown::dump_results (void) } void -EC_Shutdown::consumer_disconnect (void* cookie, - CORBA::Environment&) +EC_Shutdown::consumer_disconnect (void* cookie + TAO_ENV_ARG_DECL_NOT_USED) { this->consumer_disconnects_++; if (this->verbose ()) @@ -80,8 +80,8 @@ EC_Shutdown::consumer_disconnect (void* cookie, } void -EC_Shutdown::supplier_disconnect (void* cookie, - CORBA::Environment&) +EC_Shutdown::supplier_disconnect (void* cookie + TAO_ENV_ARG_DECL_NOT_USED) { this->supplier_disconnects_++; if (this->verbose ()) diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h index b7d1e573d3f..b97deb5536a 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h @@ -39,18 +39,18 @@ public: // Constructor // = The EC_Driver methods - void execute_test (CORBA::Environment& ACE_TRY_ENV); + void execute_test (TAO_ENV_SINGLE_ARG_DECL); // Don't run the suppliers just create the EC and then destroy it. void dump_results (void); // Don't dump the EC_Driver results, they are meaningless. - virtual void consumer_disconnect (void* consumer_cookie, - CORBA::Environment& ACE_TRY_ENV); + virtual void consumer_disconnect (void* consumer_cookie + TAO_ENV_ARG_DECL); // One of the consumers in the test has been disconnected from the EC - virtual void supplier_disconnect (void* supplier_cookie, - CORBA::Environment& ACE_TRY_ENV); + virtual void supplier_disconnect (void* supplier_cookie + TAO_ENV_ARG_DECL); // One of the suppliers in the test has been disconnected from the EC diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp index 93cfe70bb7f..8d2ff984a88 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp @@ -17,24 +17,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -43,11 +43,11 @@ main (int argc, char* argv[]) poa.in ()); TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -55,12 +55,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -68,12 +68,12 @@ main (int argc, char* argv[]) EC_Counting_Supplier supplier; supplier.activate (consumer_admin.in (), - 50, ACE_TRY_ENV); + 50 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier.connect (supplier_admin.in (), 0, 20, - 0, 20, - ACE_TRY_ENV); + 0, 20 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -99,8 +99,8 @@ main (int argc, char* argv[]) 0); interval_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -126,8 +126,8 @@ main (int argc, char* argv[]) 0); conjunction_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -149,8 +149,8 @@ main (int argc, char* argv[]) 0); deadline_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -163,28 +163,28 @@ main (int argc, char* argv[]) // **************************************************************** - deadline_consumer.disconnect (ACE_TRY_ENV); + deadline_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - conjunction_consumer.disconnect (ACE_TRY_ENV); + conjunction_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - interval_consumer.disconnect (ACE_TRY_ENV); + interval_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier.deactivate (ACE_TRY_ENV); + supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier.disconnect (ACE_TRY_ENV); + supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp index 79362be04ca..6a2569745fb 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp @@ -14,24 +14,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -40,11 +40,11 @@ main (int argc, char* argv[]) poa.in ()); TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -52,12 +52,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (ACE_TRY_ENV); + event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (ACE_TRY_ENV); + event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -69,15 +69,15 @@ main (int argc, char* argv[]) EC_Counting_Supplier supplier; supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier.connect (supplier_admin.in (), event_source, event_type, event_source, - event_type, - ACE_TRY_ENV); + event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -85,15 +85,15 @@ main (int argc, char* argv[]) EC_Counting_Supplier other_supplier; other_supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; other_supplier.connect (supplier_admin.in (), event_source + 1, event_type + 1, event_source + 1, - event_type + 1, - ACE_TRY_ENV); + event_type + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -101,15 +101,15 @@ main (int argc, char* argv[]) EC_Counting_Supplier any_source_supplier; any_source_supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; any_source_supplier.connect (supplier_admin.in (), 0, event_type, event_source, - event_type, - ACE_TRY_ENV); + event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -117,15 +117,15 @@ main (int argc, char* argv[]) EC_Counting_Supplier any_type_supplier; any_type_supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; any_type_supplier.connect (supplier_admin.in (), event_source, 0, event_source, - event_type, - ACE_TRY_ENV); + event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -133,15 +133,15 @@ main (int argc, char* argv[]) EC_Counting_Supplier wildcard_supplier; wildcard_supplier.activate (consumer_admin.in (), - milliseconds, - ACE_TRY_ENV); + milliseconds + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; wildcard_supplier.connect (supplier_admin.in (), 0, 0, event_source, - event_type, - ACE_TRY_ENV); + event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -157,8 +157,8 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); regular_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -175,8 +175,8 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, 0, 0); any_type_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -193,8 +193,8 @@ main (int argc, char* argv[]) consumer_qos.insert (0, event_type, 0); any_source_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -211,8 +211,8 @@ main (int argc, char* argv[]) consumer_qos.insert (0, 0, 0); wildcard_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -225,52 +225,52 @@ main (int argc, char* argv[]) // **************************************************************** - wildcard_consumer.disconnect (ACE_TRY_ENV); + wildcard_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_source_consumer.disconnect (ACE_TRY_ENV); + any_source_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_type_consumer.disconnect (ACE_TRY_ENV); + any_type_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - regular_consumer.disconnect (ACE_TRY_ENV); + regular_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - wildcard_supplier.deactivate (ACE_TRY_ENV); + wildcard_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - wildcard_supplier.disconnect (ACE_TRY_ENV); + wildcard_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_type_supplier.deactivate (ACE_TRY_ENV); + any_type_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_source_supplier.deactivate (ACE_TRY_ENV); + any_source_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_source_supplier.disconnect (ACE_TRY_ENV); + any_source_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - other_supplier.deactivate (ACE_TRY_ENV); + other_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - other_supplier.disconnect (ACE_TRY_ENV); + other_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier.deactivate (ACE_TRY_ENV); + supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier.disconnect (ACE_TRY_ENV); + supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (ACE_TRY_ENV); + event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1, ACE_TRY_ENV); + poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index 351dcdbc917..a9f009ecf92 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -24,9 +24,9 @@ EC_Connect::EC_Connect (void) } void -EC_Connect::execute_test (CORBA::Environment&) +EC_Connect::execute_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { - // this->EC_Driver::execute_test (ACE_TRY_ENV); + // this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER); } int @@ -108,13 +108,13 @@ EC_Connect::dump_results (void) void EC_Connect::connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int i, - CORBA::Environment &ACE_TRY_ENV) + int i + TAO_ENV_ARG_DECL) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->EC_Driver::connect_consumer (consumer_admin, - i, - ACE_TRY_ENV); + i + TAO_ENV_ARG_PARAMETER); ACE_hrtime_t now = ACE_OS::gethrtime (); this->consumer_connect_.sample (now - this->start_time_, now - start); @@ -123,13 +123,13 @@ EC_Connect::connect_consumer ( void EC_Connect::connect_supplier ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - int i, - CORBA::Environment &ACE_TRY_ENV) + int i + TAO_ENV_ARG_DECL) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->EC_Driver::connect_supplier (supplier_admin, - i, - ACE_TRY_ENV); + i + TAO_ENV_ARG_PARAMETER); ACE_hrtime_t now = ACE_OS::gethrtime (); this->supplier_connect_.sample (now - this->start_time_, now - start); @@ -148,23 +148,23 @@ EC_Connect::allocate_supplier (int i) } void -EC_Connect::connect_clients (CORBA::Environment &ACE_TRY_ENV) +EC_Connect::connect_clients (TAO_ENV_SINGLE_ARG_DECL) { this->start_time_ = ACE_OS::gethrtime (); switch (this->order_) { default: case 0: - this->connect_consumers (ACE_TRY_ENV); + this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect_suppliers (ACE_TRY_ENV); + this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; case 1: - this->connect_suppliers (ACE_TRY_ENV); + this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect_consumers (ACE_TRY_ENV); + this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -177,23 +177,23 @@ EC_Connect::connect_clients (CORBA::Environment &ACE_TRY_ENV) max = this->n_suppliers_; RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (ACE_TRY_ENV); + this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->event_channel_->for_suppliers (ACE_TRY_ENV); + this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (int i = 0; i != max; ++i) { if (i < this->n_consumers_) { - this->connect_consumer (consumer_admin.in (), i, ACE_TRY_ENV); + this->connect_consumer (consumer_admin.in (), i TAO_ENV_ARG_PARAMETER); ACE_CHECK; } if (i < this->n_suppliers_) { - this->connect_supplier (supplier_admin.in (), i, ACE_TRY_ENV); + this->connect_supplier (supplier_admin.in (), i TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -201,22 +201,22 @@ EC_Connect::connect_clients (CORBA::Environment &ACE_TRY_ENV) } void -EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV) +EC_Connect::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL) { switch (this->order_) { default: case 0: - this->disconnect_suppliers (ACE_TRY_ENV); + this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->disconnect_consumers (ACE_TRY_ENV); + this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; case 1: - this->disconnect_consumers (ACE_TRY_ENV); + this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->disconnect_suppliers (ACE_TRY_ENV); + this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -229,11 +229,11 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV) max = this->n_suppliers_; RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (ACE_TRY_ENV); + this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->event_channel_->for_suppliers (ACE_TRY_ENV); + this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t start_time = ACE_OS::gethrtime (); @@ -243,7 +243,7 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->suppliers_[i]->disconnect (ACE_TRY_ENV); + this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -254,7 +254,7 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->consumers_[i]->disconnect (ACE_TRY_ENV); + this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -268,14 +268,14 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV) } void -EC_Connect::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV) +EC_Connect::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL) { ACE_hrtime_t start_time = ACE_OS::gethrtime (); for (int i = 0; i < this->n_consumers_; ++i) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->consumers_[i]->disconnect (ACE_TRY_ENV); + this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -290,14 +290,14 @@ EC_Connect::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV) } void -EC_Connect::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV) +EC_Connect::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL) { ACE_hrtime_t start_time = ACE_OS::gethrtime (); for (int i = 0; i < this->n_suppliers_; ++i) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->suppliers_[i]->disconnect (ACE_TRY_ENV); + this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -323,25 +323,25 @@ void ECC_Consumer::connect ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV) + int shutdown_event_type + TAO_ENV_ARG_DECL) { this->EC_Consumer::connect (consumer_admin, qos, - shutdown_event_type, - ACE_TRY_ENV); + shutdown_event_type + TAO_ENV_ARG_PARAMETER); } void ECC_Consumer::connect ( const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV) + int shutdown_event_type + TAO_ENV_ARG_DECL) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->EC_Consumer::connect (qos, - shutdown_event_type, - ACE_TRY_ENV); + shutdown_event_type + TAO_ENV_ARG_PARAMETER); ACE_hrtime_t now = ACE_OS::gethrtime (); this->connect_time_.sample (now, now - start); } @@ -365,25 +365,25 @@ void ECC_Supplier::connect ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV) + int shutdown_event_type + TAO_ENV_ARG_DECL) { this->EC_Supplier::connect (supplier_admin, qos, - shutdown_event_type, - ACE_TRY_ENV); + shutdown_event_type + TAO_ENV_ARG_PARAMETER); } void ECC_Supplier::connect ( const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV) + int shutdown_event_type + TAO_ENV_ARG_DECL) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->EC_Supplier::connect (qos, - shutdown_event_type, - ACE_TRY_ENV); + shutdown_event_type + TAO_ENV_ARG_PARAMETER); ACE_hrtime_t now = ACE_OS::gethrtime (); this->connect_time_.sample (now, now - start); } diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h index 1b58133482e..5d09185b9ae 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.h +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h @@ -51,27 +51,27 @@ public: virtual void print_usage (void); virtual void print_args (void) const; - void execute_test (CORBA::Environment& ACE_TRY_ENV); + void execute_test (TAO_ENV_SINGLE_ARG_DECL); // Don't run the suppliers, just test connect and disconnect calls. virtual void dump_results (void); virtual void connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int i, - CORBA::Environment &ACE_TRY_ENV); + int i + TAO_ENV_ARG_DECL); virtual void connect_supplier ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - int i, - CORBA::Environment &ACE_TRY_ENV); - virtual void disconnect_consumers (CORBA::Environment& env); - virtual void disconnect_suppliers (CORBA::Environment& env); + int i + TAO_ENV_ARG_DECL); + virtual void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL); + virtual void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL); virtual EC_Consumer* allocate_consumer (int i); virtual EC_Supplier* allocate_supplier (int i); - virtual void connect_clients (CORBA::Environment&); - virtual void disconnect_clients (CORBA::Environment&); + virtual void connect_clients (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void disconnect_clients (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); private: ACE_hrtime_t start_time_; @@ -94,12 +94,12 @@ public: virtual void connect ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV); + int shutdown_event_type + TAO_ENV_ARG_DECL); virtual void connect ( const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV); + int shutdown_event_type + TAO_ENV_ARG_DECL); virtual void dump_results (const char* name, ACE_UINT32 global_scale_factor); @@ -117,12 +117,12 @@ public: virtual void connect ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type, - CORBA::Environment& ACE_TRY_ENV); + int shutdown_event_type + TAO_ENV_ARG_DECL); virtual void connect ( const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV); + int shutdown_event_type + TAO_ENV_ARG_DECL); virtual void dump_results (const char* name, ACE_UINT32 global_scale_factor); diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp index cb9d8629241..8d01cace479 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -54,10 +54,10 @@ EC_Inversion::parse_args (int &argc, char *argv []) } void -EC_Inversion::connect_consumers (CORBA::Environment &ACE_TRY_ENV) +EC_Inversion::connect_consumers (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (ACE_TRY_ENV); + this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_ConsumerQOS_Factory qos0; @@ -67,8 +67,8 @@ EC_Inversion::connect_consumers (CORBA::Environment &ACE_TRY_ENV) this->consumers_[0]->connect (consumer_admin.in (), qos0.get_ConsumerQOS (), - ACE_ES_EVENT_UNDEFINED + 1, - ACE_TRY_ENV); + ACE_ES_EVENT_UNDEFINED + 1 + TAO_ENV_ARG_PARAMETER); for (int i = 1; i < this->n_consumers_; ++i) { @@ -83,18 +83,18 @@ EC_Inversion::connect_consumers (CORBA::Environment &ACE_TRY_ENV) this->consumers_[i]->connect (consumer_admin.in (), qos1.get_ConsumerQOS (), - base_event + 1, - ACE_TRY_ENV); + base_event + 1 + TAO_ENV_ARG_PARAMETER); } if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Inversion (%P|%t) connected consumer(s)\n")); } void -EC_Inversion::connect_suppliers (CORBA::Environment &ACE_TRY_ENV) +EC_Inversion::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->event_channel_->for_suppliers (ACE_TRY_ENV); + this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_SupplierQOS_Factory qos0; @@ -103,8 +103,8 @@ EC_Inversion::connect_suppliers (CORBA::Environment &ACE_TRY_ENV) this->suppliers_[0]->connect (supplier_admin.in (), qos0.get_SupplierQOS (), - ACE_ES_EVENT_UNDEFINED + 1, - ACE_TRY_ENV); + ACE_ES_EVENT_UNDEFINED + 1 + TAO_ENV_ARG_PARAMETER); for (int j = 1; j != this->n_suppliers_; ++j) { @@ -118,8 +118,8 @@ EC_Inversion::connect_suppliers (CORBA::Environment &ACE_TRY_ENV) this->suppliers_[j]->connect (supplier_admin.in (), qos1.get_SupplierQOS (), - base_event + 1, - ACE_TRY_ENV); + base_event + 1 + TAO_ENV_ARG_PARAMETER); } if (this->verbose ()) @@ -127,7 +127,7 @@ EC_Inversion::connect_suppliers (CORBA::Environment &ACE_TRY_ENV) } void -EC_Inversion::activate_tasks (CORBA::Environment &) +EC_Inversion::activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { int priority; diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.h b/TAO/orbsvcs/tests/Event/Performance/Inversion.h index b5c401cfe06..4f9bc592bfc 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.h +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.h @@ -41,14 +41,14 @@ public: // The options controlling the event types are ignored, and only two // consumers are created. - virtual void connect_consumers (CORBA::Environment &ACE_TRY_ENV); - virtual void connect_suppliers (CORBA::Environment &ACE_TRY_ENV); + virtual void connect_consumers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void connect_suppliers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // In this test there are two consumers, the high priority consumer // receives only events from a single high priority supplier. The // other consumer receives events from a set of low priority // suppliers. - virtual void activate_tasks (CORBA::Environment &); + virtual void activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Activate the suppliers at different priorities private: diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index 2a8bd9f6e2e..9cafab8e20e 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -49,18 +49,18 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Object_var manager_object = - orb->resolve_initial_references ("ORBPolicyManager", - ACE_TRY_ENV); + orb->resolve_initial_references ("ORBPolicyManager" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (manager_object.in (), - ACE_TRY_ENV); + CORBA::PolicyManager::_narrow (manager_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any sync_scope; @@ -70,12 +70,12 @@ main (int argc, char *argv []) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope, - ACE_TRY_ENV); + sync_scope + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else ACE_DEBUG ((LM_DEBUG, @@ -84,7 +84,7 @@ main (int argc, char *argv []) #endif /* TAO_HAS_MESSAGING */ CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -93,14 +93,14 @@ main (int argc, char *argv []) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -108,12 +108,12 @@ main (int argc, char *argv []) // Get the event channel object reference CORBA::Object_var object = - orb->string_to_object (ec_ior, ACE_TRY_ENV); + orb->string_to_object (ec_ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (object.in (), - ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ec.in ())) { @@ -135,15 +135,15 @@ main (int argc, char *argv []) // Connect the consumer RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_TRY_ENV); + ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushConsumer_var consumer_reference = - consumer._this (ACE_TRY_ENV); + consumer._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Simple subscription, but usually the helper classes in @@ -161,8 +161,8 @@ main (int argc, char *argv []) h1.source = ACE_ES_EVENT_SOURCE_ANY; proxy_supplier->connect_push_consumer (consumer_reference.in (), - consumer_qos, - ACE_TRY_ENV); + consumer_qos + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Connected consumer\n")); @@ -172,15 +172,15 @@ main (int argc, char *argv []) // The canonical protocol to connect to the EC RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (ACE_TRY_ENV); + ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::ProxyPushConsumer_var proxy_consumer = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushSupplier_var supplier_reference = - supplier._this (ACE_TRY_ENV); + supplier._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Simple publication, but usually the helper classes in @@ -193,8 +193,8 @@ main (int argc, char *argv []) sh0.source = 1; // first free event source proxy_consumer->connect_push_supplier (supplier_reference.in (), - supplier_qos, - ACE_TRY_ENV); + supplier_qos + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Connected supplier\n")); @@ -207,7 +207,7 @@ main (int argc, char *argv []) while (!task.done () || !consumer.done ()) { ACE_Time_Value tv (1, 0); - orb->run (tv, ACE_TRY_ENV); + orb->run (tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_hrtime_t end = ACE_OS::gethrtime (); @@ -238,24 +238,24 @@ main (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "Throughtput: %f\n", throughput)); - proxy_supplier->disconnect_push_supplier (ACE_TRY_ENV); + proxy_supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - proxy_consumer->disconnect_push_consumer (ACE_TRY_ENV); + proxy_consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id; - id = root_poa->servant_to_id (&consumer, ACE_TRY_ENV); + id = root_poa->servant_to_id (&consumer TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->deactivate_object (id.in (), ACE_TRY_ENV); + root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - id = root_poa->servant_to_id (&supplier, ACE_TRY_ENV); - root_poa->deactivate_object (id.in (), ACE_TRY_ENV); + id = root_poa->servant_to_id (&supplier TAO_ENV_ARG_PARAMETER); + root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, ex) @@ -282,19 +282,19 @@ parse_args (int argc, char *argv[]) break; case 'i': - iterations = ACE_OS::atoi (get_opts.optarg); - break; + iterations = ACE_OS::atoi (get_opts.optarg); + break; case 'k': - ec_ior = get_opts.optarg; - break; + ec_ior = get_opts.optarg; + break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " - "-i <iterations>" - "-k <IOR>" + "-i <iterations>" + "-k <IOR>" "\n", argv [0]), -1); @@ -322,8 +322,8 @@ EC_Latency_Consumer::done (void) } void -EC_Latency_Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &) +EC_Latency_Consumer::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t creation; @@ -343,7 +343,7 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events, } void -EC_Latency_Consumer::disconnect_push_consumer (CORBA::Environment &) +EC_Latency_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -355,7 +355,7 @@ EC_Latency_Supplier::EC_Latency_Supplier (void) } void -EC_Latency_Supplier::disconnect_push_supplier (CORBA::Environment &) +EC_Latency_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -393,7 +393,7 @@ Task::svc (void) ACE_hrtime_t creation = ACE_OS::gethrtime (); ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, creation); - this->consumer_->push (event, ACE_TRY_ENV); + this->consumer_->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_Time_Value tv (0, 5000); diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h index e0aa6fa32f1..4d9b2287736 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.h +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h @@ -38,11 +38,11 @@ public: /// Return 1 when all the messages have been received int done (void); - - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &) + + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -64,7 +64,7 @@ public: /// Constructor EC_Latency_Supplier (void); - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index 3cf2c2335e5..ce6a4225dc5 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -48,18 +48,18 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Object_var manager_object = - orb->resolve_initial_references ("ORBPolicyManager", - ACE_TRY_ENV); + orb->resolve_initial_references ("ORBPolicyManager" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (manager_object.in (), - ACE_TRY_ENV); + CORBA::PolicyManager::_narrow (manager_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any sync_scope; @@ -69,12 +69,12 @@ main (int argc, char *argv []) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope, - ACE_TRY_ENV); + sync_scope + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else ACE_DEBUG ((LM_DEBUG, @@ -83,7 +83,7 @@ main (int argc, char *argv []) #endif /* TAO_HAS_MESSAGING */ CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -92,14 +92,14 @@ main (int argc, char *argv []) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -108,38 +108,38 @@ main (int argc, char *argv []) TAO_EC_Event_Channel_Attributes attr (root_poa.in (), root_poa.in ()); TAO_EC_Event_Channel ec_impl (attr); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = - orb->object_to_string (ec.in (), ACE_TRY_ENV); + orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ior_file_name != 0) { - FILE *output_file= ACE_OS::fopen (ior_file_name, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s", - ior_file_name), - 1); - ACE_OS::fprintf (output_file, "%s", str.in ()); - ACE_OS::fclose (output_file); + FILE *output_file= ACE_OS::fopen (ior_file_name, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s", + ior_file_name), + 1); + ACE_OS::fprintf (output_file, "%s", str.in ()); + ACE_OS::fclose (output_file); } - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - root_poa->servant_to_id (&ec_impl, ACE_TRY_ENV); - root_poa->deactivate_object (id.in (), ACE_TRY_ENV); + root_poa->servant_to_id (&ec_impl TAO_ENV_ARG_PARAMETER); + root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, ex) @@ -162,14 +162,14 @@ parse_args (int argc, char *argv[]) switch (c) { case 'o': - ior_file_name = get_opts.optarg; - break; + ior_file_name = get_opts.optarg; + break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " - "-o <ior_file_name>" + "-o <ior_file_name>" "\n", argv [0]), -1); diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index e77bd596f8c..5955b95febc 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -47,9 +47,9 @@ EC_Throughput::modify_attributes (TAO_EC_Event_Channel_Attributes&) } void -EC_Throughput::execute_test (CORBA::Environment& ACE_TRY_ENV) +EC_Throughput::execute_test (TAO_ENV_SINGLE_ARG_DECL) { - this->EC_Driver::execute_test (ACE_TRY_ENV); + this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER); } void diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h index fc1cfeac8b8..8d8b222b3b2 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h @@ -44,7 +44,7 @@ public: virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); // set the throughpution flags - void execute_test (CORBA::Environment& ACE_TRY_ENV); + void execute_test (TAO_ENV_SINGLE_ARG_DECL); // Don't run the suppliers, just test connect and disconnect calls. void dump_results (void); diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp index 3bd8493fa84..c8fdfc9a2f5 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp @@ -22,21 +22,21 @@ void EC_Consumer::connect ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV) + int shutdown_event_type + TAO_ENV_ARG_DECL) { this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect (qos, shutdown_event_type, ACE_TRY_ENV); + this->connect (qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); } void EC_Consumer::connect ( const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV) + int shutdown_event_type + TAO_ENV_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; // @@ Throw? @@ -45,14 +45,14 @@ EC_Consumer::connect ( if (CORBA::is_nil (this->myself_.in ())) { - this->myself_ = this->_this (ACE_TRY_ENV); + this->myself_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } this->is_active_ = 1; this->supplier_proxy_->connect_push_consumer (this->myself_.in (), - qos, - ACE_TRY_ENV); + qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -63,12 +63,12 @@ EC_Consumer::connected (void) const } void -EC_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +EC_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; - this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -76,19 +76,19 @@ EC_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) } void -EC_Consumer::shutdown (CORBA::Environment &ACE_TRY_ENV) +EC_Consumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) { if (!this->is_active_) return; // Deactivate the servant PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->myself_ = RtecEventComm::PushConsumer::_nil (); this->is_active_ = 0; @@ -108,11 +108,11 @@ EC_Consumer::accumulate (ACE_Throughput_Stats& throughput) const } void -EC_Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &ACE_TRY_ENV) +EC_Consumer::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->consumer_push (this->cookie_, events, ACE_TRY_ENV); + this->driver_->consumer_push (this->cookie_, events TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (events.length () == 0) @@ -149,16 +149,16 @@ EC_Consumer::push (const RtecEventComm::EventSet& events, now - creation); if (e.header.type == this->shutdown_event_type_) - this->driver_->consumer_shutdown (this->cookie_, ACE_TRY_ENV); + this->driver_->consumer_shutdown (this->cookie_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -EC_Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) +EC_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->consumer_disconnect (this->cookie_, ACE_TRY_ENV); + this->driver_->consumer_disconnect (this->cookie_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h index ddc4dc35ed9..8aaaed1d37f 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h @@ -47,15 +47,15 @@ public: virtual void connect ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV); + int shutdown_event_type + TAO_ENV_ARG_DECL); // The driver program can build the QoS attributes and obtain the // ConsumerAdmin, we do the rest. virtual void connect ( const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV); + int shutdown_event_type + TAO_ENV_ARG_DECL); // The driver program can build the QoS attributes and we use // whatevet supplier_proxy we already have (useful for reconnection // tests). @@ -63,11 +63,11 @@ public: virtual int connected (void) const; // returns 0 if it is not connected - void disconnect (CORBA::Environment& ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // The application can invoke this method to disconnect from the EC // and deactivate this class. - void shutdown (CORBA::Environment &ACE_TRY_ENV); + void shutdown (TAO_ENV_SINGLE_ARG_DECL); // The application is shutting down, deactivate the consumer. void accumulate (ACE_Throughput_Stats& throughput) const; @@ -79,10 +79,10 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp index 8fabe810acc..cfb93e722cf 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp @@ -13,51 +13,51 @@ EC_Counting_Consumer::EC_Counting_Consumer (const char* name) void EC_Counting_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - const RtecEventChannelAdmin::ConsumerQOS &qos, - CORBA::Environment &ACE_TRY_ENV) + const RtecEventChannelAdmin::ConsumerQOS &qos + TAO_ENV_ARG_DECL) { // The canonical protocol to connect to the EC RtecEventComm::PushConsumer_var consumer = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->supplier_proxy_.in ())) { this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } this->supplier_proxy_->connect_push_consumer (consumer.in (), - qos, - ACE_TRY_ENV); + qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -EC_Counting_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +EC_Counting_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->supplier_proxy_.in ())) { - this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); } - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } void -EC_Counting_Consumer::deactivate (CORBA::Environment &ACE_TRY_ENV) +EC_Counting_Consumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) { PortableServer::POA_var consumer_poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (this, ACE_TRY_ENV); + consumer_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_poa->deactivate_object (consumer_id.in (), ACE_TRY_ENV); + consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -83,8 +83,8 @@ EC_Counting_Consumer::dump_results (int expected_count, int tolerance) } void -EC_Counting_Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &) +EC_Counting_Consumer::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) @@ -107,7 +107,7 @@ EC_Counting_Consumer::push (const RtecEventComm::EventSet& events, } void -EC_Counting_Consumer::disconnect_push_consumer (CORBA::Environment &) +EC_Counting_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->disconnect_count++; diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h index a10262d44f6..1a87e648171 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h @@ -39,10 +39,10 @@ public: // Constructor void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - const RtecEventChannelAdmin::ConsumerQOS &qos, - CORBA::Environment &ACE_TRY_ENV); - void disconnect (CORBA::Environment &ACE_TRY_ENV); - void deactivate (CORBA::Environment &ACE_TRY_ENV); + const RtecEventChannelAdmin::ConsumerQOS &qos + TAO_ENV_ARG_DECL); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void deactivate (TAO_ENV_SINGLE_ARG_DECL); // Simple connect/disconnect methods.. void dump_results (int expected_count, int tolerance); @@ -51,10 +51,10 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp index 9642015c566..696cf024273 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp @@ -16,15 +16,15 @@ EC_Counting_Supplier::EC_Counting_Supplier (void) void EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int milliseconds, - CORBA::Environment &ACE_TRY_ENV) + int milliseconds + TAO_ENV_ARG_DECL) { RtecEventComm::PushConsumer_var consumer = - this->consumer_adapter_._this (ACE_TRY_ENV); + this->consumer_adapter_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Let's say that the execution time for event 2 is 1 @@ -40,24 +40,24 @@ EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consume 0); this->supplier_proxy_->connect_push_consumer (consumer.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -EC_Counting_Supplier::deactivate (CORBA::Environment &ACE_TRY_ENV) +EC_Counting_Supplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) { - this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var consumer_poa = - this->consumer_adapter_._default_POA (ACE_TRY_ENV); + this->consumer_adapter_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (&this->consumer_adapter_, ACE_TRY_ENV); + consumer_poa->servant_to_id (&this->consumer_adapter_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_poa->deactivate_object (consumer_id.in (), ACE_TRY_ENV); + consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -67,8 +67,8 @@ EC_Counting_Supplier::connect ( int published_source, int published_type, int event_source, - int event_type, - CORBA::Environment &ACE_TRY_ENV) + int event_type + TAO_ENV_ARG_DECL) { this->event_source_ = event_source; this->event_type_ = event_type; @@ -78,49 +78,49 @@ EC_Counting_Supplier::connect ( published_type, 0, 1); this->connect (supplier_admin, - supplier_qos.get_SupplierQOS (), - ACE_TRY_ENV); + supplier_qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); } void EC_Counting_Supplier::connect ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - const RtecEventChannelAdmin::SupplierQOS &qos, - CORBA::Environment &ACE_TRY_ENV) + const RtecEventChannelAdmin::SupplierQOS &qos + TAO_ENV_ARG_DECL) { RtecEventComm::PushSupplier_var supplier = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->consumer_proxy_.in ())) { this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } this->consumer_proxy_->connect_push_supplier (supplier.in (), - qos, - ACE_TRY_ENV); + qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -EC_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +EC_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->consumer_proxy_.in ())) { - this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV); + this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } PortableServer::POA_var supplier_poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var supplier_id = - supplier_poa->servant_to_id (this, ACE_TRY_ENV); + supplier_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_poa->deactivate_object (supplier_id.in (), ACE_TRY_ENV); + supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = @@ -128,8 +128,8 @@ EC_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) } void -EC_Counting_Supplier::push (const RtecEventComm::EventSet&, - CORBA::Environment &ACE_TRY_ENV) +EC_Counting_Supplier::push (const RtecEventComm::EventSet& + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->consumer_proxy_.in ())) @@ -141,19 +141,19 @@ EC_Counting_Supplier::push (const RtecEventComm::EventSet&, event[0].header.type = this->event_type_; event[0].header.ttl = 1; - this->consumer_proxy_->push (event, ACE_TRY_ENV); + this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->event_count++; } void -EC_Counting_Supplier::disconnect_push_consumer (CORBA::Environment &) +EC_Counting_Supplier::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -EC_Counting_Supplier::disconnect_push_supplier (CORBA::Environment &) +EC_Counting_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->disconnect_count++; @@ -176,7 +176,7 @@ EC_Counting_Supplier_Task::svc () { ACE_TRY_NEW_ENV { - this->run (ACE_TRY_ENV); + this->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -201,13 +201,13 @@ EC_Counting_Supplier_Task::push_count (void) } void -EC_Counting_Supplier_Task::run (CORBA::Environment &ACE_TRY_ENV) +EC_Counting_Supplier_Task::run (TAO_ENV_SINGLE_ARG_DECL) { this->event_.length (1); int stop = 0; do { - this->supplier_->push (this->event_, ACE_TRY_ENV); + this->supplier_->push (this->event_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Sleep for a short time to avoid spinning... diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h index ece73ce4db2..813994c5fc0 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h @@ -42,9 +42,9 @@ public: // = The RtecEventComm::PushSupplier methods void activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int period, - CORBA::Environment &ACE_TRY_ENV); - void deactivate (CORBA::Environment &ACE_TRY_ENV); + int period + TAO_ENV_ARG_DECL); + void deactivate (TAO_ENV_SINGLE_ARG_DECL); // Connect as a consumer to receive a TIMEOUT every <period> // milliseconds. // The class pushes an event (in its supplier role) every time it @@ -54,22 +54,22 @@ public: int published_source, int published_type, int event_source, - int event_type, - CORBA::Environment &ACE_TRY_ENV); + int event_type + TAO_ENV_ARG_DECL); void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - const RtecEventChannelAdmin::SupplierQOS &qos, - CORBA::Environment &ACE_TRY_ENV); - void disconnect (CORBA::Environment &ACE_TRY_ENV); + const RtecEventChannelAdmin::SupplierQOS &qos + TAO_ENV_ARG_DECL); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Simple connect/disconnect methods.. - void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void disconnect_push_consumer (CORBA::Environment &) + void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The Consumer side methods. - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. @@ -108,7 +108,7 @@ public: void stop (void); CORBA::ULong push_count (void); - void run (CORBA::Environment &ACE_TRY_ENV); + void run (TAO_ENV_SINGLE_ARG_DECL); // Run a single iteration of the test private: diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index 06644290629..ee0fcaab316 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -67,15 +67,15 @@ EC_Driver::run (int argc, char* argv[]) // test. ACE_High_Res_Timer::calibrate (); - this->run_init (argc, argv, ACE_TRY_ENV); + this->run_init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->execute_test (ACE_TRY_ENV); + this->execute_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->dump_results (); - this->run_cleanup (ACE_TRY_ENV); + this->run_cleanup (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -91,10 +91,10 @@ EC_Driver::run (int argc, char* argv[]) } void -EC_Driver::run_init (int &argc, char* argv[], - CORBA::Environment& ACE_TRY_ENV) +EC_Driver::run_init (int &argc, char* argv[] + TAO_ENV_ARG_DECL) { - this->initialize_orb_and_poa (argc, argv, ACE_TRY_ENV); + this->initialize_orb_and_poa (argc, argv TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->parse_args (argc, argv)) @@ -119,7 +119,7 @@ EC_Driver::run_init (int &argc, char* argv[], ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); - this->initialize_ec_impl (ACE_TRY_ENV); + this->initialize_ec_impl (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->allocate_consumers () == -1) @@ -130,26 +130,26 @@ EC_Driver::run_init (int &argc, char* argv[], ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); - this->connect_clients (ACE_TRY_ENV); + this->connect_clients (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -EC_Driver::run_cleanup (CORBA::Environment &ACE_TRY_ENV) +EC_Driver::run_cleanup (TAO_ENV_SINGLE_ARG_DECL) { - this->disconnect_clients (ACE_TRY_ENV); + this->disconnect_clients (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->shutdown_clients (ACE_TRY_ENV); + this->shutdown_clients (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->destroy_ec (ACE_TRY_ENV); + this->destroy_ec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) channel destroyed\n")); - this->deactivate_ec (ACE_TRY_ENV); + this->deactivate_ec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -160,25 +160,25 @@ EC_Driver::run_cleanup (CORBA::Environment &ACE_TRY_ENV) this->cleanup_consumers (); this->cleanup_ec (); - this->root_poa_->destroy (0, 0, ACE_TRY_ENV); + this->root_poa_->destroy (0, 0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->root_poa_ = PortableServer::POA::_nil (); - this->orb_->destroy (ACE_TRY_ENV); + this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->orb_ = CORBA::ORB::_nil (); } void -EC_Driver::initialize_orb_and_poa (int &argc, char* argv[], - CORBA::Environment& ACE_TRY_ENV) +EC_Driver::initialize_orb_and_poa (int &argc, char* argv[] + TAO_ENV_ARG_DECL) { this->orb_ = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA", ACE_TRY_ENV); + this->orb_->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -189,14 +189,14 @@ EC_Driver::initialize_orb_and_poa (int &argc, char* argv[], } this->root_poa_ = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (ACE_TRY_ENV); + this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -272,12 +272,12 @@ EC_Driver::move_to_rt_class (void) } void -EC_Driver::initialize_ec_impl (CORBA::Environment& ACE_TRY_ENV) +EC_Driver::initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL) { #if !defined(EC_DISABLE_REMOTE_EC) if (this->use_remote_ec_ == 1) { - this->obtain_remote_ec (ACE_TRY_ENV); + this->obtain_remote_ec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; } @@ -286,21 +286,21 @@ EC_Driver::initialize_ec_impl (CORBA::Environment& ACE_TRY_ENV) #if !defined(EC_DISABLE_OLD_EC) if (this->use_old_ec_ == 1) { - this->initialize_old_ec (ACE_TRY_ENV); + this->initialize_old_ec (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; } #endif - this->initialize_new_ec (ACE_TRY_ENV); + this->initialize_new_ec (TAO_ENV_SINGLE_ARG_PARAMETER); } #if !defined(EC_DISABLE_REMOTE_EC) void -EC_Driver::obtain_remote_ec (CORBA::Environment& ACE_TRY_ENV) +EC_Driver::obtain_remote_ec (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::NamingContext_var naming_context = - this->get_naming_context (ACE_TRY_ENV); + this->get_naming_context (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNaming::Name channel_name (1); @@ -308,19 +308,19 @@ EC_Driver::obtain_remote_ec (CORBA::Environment& ACE_TRY_ENV) channel_name[0].id = CORBA::string_dup (this->event_service_name_); CORBA::Object_var tmp = - naming_context->resolve (channel_name, ACE_TRY_ENV); + naming_context->resolve (channel_name TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->event_channel_ = - RtecEventChannelAdmin::EventChannel::_narrow (tmp.in (), ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel::_narrow (tmp.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } CosNaming::NamingContext_ptr -EC_Driver::get_naming_context (CORBA::Environment &ACE_TRY_ENV) +EC_Driver::get_naming_context (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references ("NameService", ACE_TRY_ENV); + this->orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); if (CORBA::is_nil (naming_obj.in ())) @@ -328,16 +328,16 @@ EC_Driver::get_naming_context (CORBA::Environment &ACE_TRY_ENV) "EC_Driver (%P|%t) Unable to obtain the " "Naming Service.\n")); - return CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + return CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); } #endif #if !defined(EC_DISABLE_OLD_EC) int -EC_Driver::initialize_old_ec (CORBA::Environment& ACE_TRY_ENV) +EC_Driver::initialize_old_ec (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::NamingContext_var naming_context = - this->get_naming_context (ACE_TRY_ENV); + this->get_naming_context (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // This is the name we (potentially) register the Scheduling @@ -358,11 +358,11 @@ EC_Driver::initialize_old_ec (CORBA::Environment& ACE_TRY_ENV) this->scheduler_ = - this->scheduler_impl_._this (ACE_TRY_ENV); + this->scheduler_impl_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var str = - this->orb_->object_to_string (scheduler.in (), ACE_TRY_ENV); + this->orb_->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) The (local) scheduler IOR is <%s>\n", @@ -385,13 +385,13 @@ EC_Driver::initialize_old_ec (CORBA::Environment& ACE_TRY_ENV) -1); this->event_channel_ = - this->ec_impl_->_this (ACE_TRY_ENV); + this->ec_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } #endif /* */ void -EC_Driver::initialize_new_ec (CORBA::Environment& ACE_TRY_ENV) +EC_Driver::initialize_new_ec (TAO_ENV_SINGLE_ARG_DECL) { TAO_EC_Event_Channel_Attributes attr (this->root_poa_.in (), this->root_poa_.in ()); @@ -401,16 +401,16 @@ EC_Driver::initialize_new_ec (CORBA::Environment& ACE_TRY_ENV) new TAO_EC_Event_Channel (attr); this->ec_impl_ = ec; - ec->activate (ACE_TRY_ENV); + ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->event_channel_ = - this->ec_impl_->_this (ACE_TRY_ENV); + this->ec_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -EC_Driver::deactivate_ec (CORBA::Environment& ACE_TRY_ENV) +EC_Driver::deactivate_ec (TAO_ENV_SINGLE_ARG_DECL) { #if !defined(EC_DISABLE_REMOTE_EC) if (this->use_remote_ec_ == 1) @@ -420,12 +420,12 @@ EC_Driver::deactivate_ec (CORBA::Environment& ACE_TRY_ENV) { // Deactivate the EC PortableServer::POA_var poa = - this->ec_impl_->_default_POA (ACE_TRY_ENV); + this->ec_impl_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this->ec_impl_, ACE_TRY_ENV); + poa->servant_to_id (this->ec_impl_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -437,12 +437,12 @@ EC_Driver::deactivate_ec (CORBA::Environment& ACE_TRY_ENV) { // Deactivate the Scheduler PortableServer::POA_var poa = - scheduler_impl._default_POA (ACE_TRY_ENV); + scheduler_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (&scheduler_impl, ACE_TRY_ENV); + poa->servant_to_id (&scheduler_impl TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -452,9 +452,9 @@ EC_Driver::deactivate_ec (CORBA::Environment& ACE_TRY_ENV) } void -EC_Driver::destroy_ec (CORBA::Environment& ACE_TRY_ENV) +EC_Driver::destroy_ec (TAO_ENV_SINGLE_ARG_DECL) { - this->event_channel_->destroy (ACE_TRY_ENV); + this->event_channel_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -497,45 +497,45 @@ EC_Driver::allocate_supplier (int i) } void -EC_Driver::connect_clients (CORBA::Environment &ACE_TRY_ENV) +EC_Driver::connect_clients (TAO_ENV_SINGLE_ARG_DECL) { - this->connect_consumers (ACE_TRY_ENV); + this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect_suppliers (ACE_TRY_ENV); + this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -EC_Driver::disconnect_clients (CORBA::Environment &ACE_TRY_ENV) +EC_Driver::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL) { - this->disconnect_suppliers (ACE_TRY_ENV); + this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->disconnect_consumers (ACE_TRY_ENV); + this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -EC_Driver::shutdown_clients (CORBA::Environment &ACE_TRY_ENV) +EC_Driver::shutdown_clients (TAO_ENV_SINGLE_ARG_DECL) { - this->shutdown_suppliers (ACE_TRY_ENV); + this->shutdown_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->shutdown_consumers (ACE_TRY_ENV); + this->shutdown_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -EC_Driver::connect_consumers (CORBA::Environment &ACE_TRY_ENV) +EC_Driver::connect_consumers (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (ACE_TRY_ENV); + this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (int i = 0; i < this->n_consumers_; ++i) { - this->connect_consumer (consumer_admin.in (), i, ACE_TRY_ENV); + this->connect_consumer (consumer_admin.in (), i TAO_ENV_ARG_PARAMETER); ACE_CHECK; } if (this->verbose ()) @@ -545,26 +545,26 @@ EC_Driver::connect_consumers (CORBA::Environment &ACE_TRY_ENV) void EC_Driver::connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int i, - CORBA::Environment &ACE_TRY_ENV) + int i + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerQOS qos; int shutdown_event_type; - this->build_consumer_qos (i, qos, shutdown_event_type, ACE_TRY_ENV); + this->build_consumer_qos (i, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->consumers_[i]->connect (consumer_admin, qos, - shutdown_event_type, - ACE_TRY_ENV); + shutdown_event_type + TAO_ENV_ARG_PARAMETER); } void EC_Driver::build_consumer_qos ( int i, RtecEventChannelAdmin::ConsumerQOS& qos, - int& shutdown_event_type, - CORBA::Environment&) + int& shutdown_event_type + TAO_ENV_ARG_DECL_NOT_USED) { RtecBase::handle_t rt_info = 0; @@ -585,15 +585,15 @@ EC_Driver::build_consumer_qos ( } void -EC_Driver::connect_suppliers (CORBA::Environment &ACE_TRY_ENV) +EC_Driver::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->event_channel_->for_suppliers (ACE_TRY_ENV); + this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (int i = 0; i < this->n_suppliers_; ++i) { - this->connect_supplier (supplier_admin.in (), i, ACE_TRY_ENV); + this->connect_supplier (supplier_admin.in (), i TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -604,26 +604,26 @@ EC_Driver::connect_suppliers (CORBA::Environment &ACE_TRY_ENV) void EC_Driver::connect_supplier ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - int i, - CORBA::Environment &ACE_TRY_ENV) + int i + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierQOS qos; int shutdown_event_type; - this->build_supplier_qos (i, qos, shutdown_event_type, ACE_TRY_ENV); + this->build_supplier_qos (i, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->suppliers_[i]->connect (supplier_admin, qos, - shutdown_event_type, - ACE_TRY_ENV); + shutdown_event_type + TAO_ENV_ARG_PARAMETER); } void EC_Driver::build_supplier_qos ( int i, RtecEventChannelAdmin::SupplierQOS& qos, - int& shutdown_event_type, - CORBA::Environment&) + int& shutdown_event_type + TAO_ENV_ARG_DECL_NOT_USED) { int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_; int supplier_id = i + 1; @@ -645,12 +645,12 @@ EC_Driver::build_supplier_qos ( } void -EC_Driver::execute_test (CORBA::Environment &ACE_TRY_ENV) +EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_DECL) { if (this->allocate_tasks () == -1) return; - this->activate_tasks (ACE_TRY_ENV); + this->activate_tasks (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -697,7 +697,7 @@ EC_Driver::allocate_task (int i) } void -EC_Driver::activate_tasks (CORBA::Environment &) +EC_Driver::activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -723,13 +723,13 @@ EC_Driver::activate_tasks (CORBA::Environment &) } void -EC_Driver::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV) +EC_Driver::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL) { if (this->suppliers_ == 0) return; for (int i = 0; i < this->n_suppliers_; ++i) { - this->suppliers_[i]->disconnect (ACE_TRY_ENV); + this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (this->verbose ()) @@ -737,13 +737,13 @@ EC_Driver::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV) } void -EC_Driver::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV) +EC_Driver::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL) { if (this->consumers_ == 0) return; for (int i = 0; i < this->n_consumers_; ++i) { - this->consumers_[i]->disconnect (ACE_TRY_ENV); + this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (this->verbose ()) @@ -751,13 +751,13 @@ EC_Driver::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV) } void -EC_Driver::shutdown_suppliers (CORBA::Environment &ACE_TRY_ENV) +EC_Driver::shutdown_suppliers (TAO_ENV_SINGLE_ARG_DECL) { if (this->suppliers_ == 0) return; for (int i = 0; i < this->n_suppliers_; ++i) { - this->suppliers_[i]->shutdown (ACE_TRY_ENV); + this->suppliers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (this->verbose ()) @@ -765,13 +765,13 @@ EC_Driver::shutdown_suppliers (CORBA::Environment &ACE_TRY_ENV) } void -EC_Driver::shutdown_consumers (CORBA::Environment &ACE_TRY_ENV) +EC_Driver::shutdown_consumers (TAO_ENV_SINGLE_ARG_DECL) { if (this->consumers_ == 0) return; for (int i = 0; i < this->n_consumers_; ++i) { - this->consumers_[i]->shutdown (ACE_TRY_ENV); + this->consumers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (this->verbose ()) @@ -1122,25 +1122,25 @@ EC_Driver::decode_supplier_cookie (void* cookie) const void EC_Driver::consumer_push (void*, - const RtecEventComm::EventSet&, - CORBA::Environment&) + const RtecEventComm::EventSet& + TAO_ENV_ARG_DECL_NOT_USED) { } void -EC_Driver::consumer_shutdown (void*, - CORBA::Environment&) +EC_Driver::consumer_shutdown (void* + TAO_ENV_ARG_DECL_NOT_USED) { } void -EC_Driver::consumer_disconnect (void*, - CORBA::Environment&) +EC_Driver::consumer_disconnect (void* + TAO_ENV_ARG_DECL_NOT_USED) { } void -EC_Driver::supplier_disconnect (void*, - CORBA::Environment&) +EC_Driver::supplier_disconnect (void* + TAO_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h index 9903856dfe6..3f94e1f799f 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.h +++ b/TAO/orbsvcs/tests/Event/lib/Driver.h @@ -64,15 +64,15 @@ public: virtual int run (int argc, char* argv[]); // Execute the test. - virtual void run_init (int& argc, char* argv[], - CORBA::Environment& ACE_TRY_ENV); + virtual void run_init (int& argc, char* argv[] + TAO_ENV_ARG_DECL); // The initialization section - virtual void run_cleanup (CORBA::Environment& ACE_TRY_ENV); + virtual void run_cleanup (TAO_ENV_SINGLE_ARG_DECL); // The cleanup section - virtual void initialize_orb_and_poa (int& argc, char* argv[], - CORBA::Environment& env); + virtual void initialize_orb_and_poa (int& argc, char* argv[] + TAO_ENV_ARG_DECL); // Initialize the ORB and obtain the RootPOA object virtual int parse_args (int& argc, char* argv[]); @@ -87,57 +87,57 @@ public: virtual int move_to_rt_class (void); // Run the test in the real-time class, return -1 on error. - virtual void initialize_ec_impl (CORBA::Environment& env); + virtual void initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL); // Construct the EC and its helper objects, also activates the EC in // the RootPOA. - virtual void connect_clients (CORBA::Environment& env); + virtual void connect_clients (TAO_ENV_SINGLE_ARG_DECL); // By default connect the consumers and then the suppliers, other // orders should work too. - virtual void disconnect_clients (CORBA::Environment &env); + virtual void disconnect_clients (TAO_ENV_SINGLE_ARG_DECL); // By default disconnect the suppliers and then the consumers, other // orders should work too. - virtual void shutdown_clients (CORBA::Environment &env); + virtual void shutdown_clients (TAO_ENV_SINGLE_ARG_DECL); // By default deactivate the suppliers and then the consumers, other // orders should work too. - virtual void connect_consumers (CORBA::Environment& env); + virtual void connect_consumers (TAO_ENV_SINGLE_ARG_DECL); // Connect all the consumers, by default it lets each consumer // connect itself. virtual void connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int i, - CORBA::Environment &ACE_TRY_ENV); + int i + TAO_ENV_ARG_DECL); // Connect consumer number <i> using the consumer_admin provided. virtual void build_consumer_qos ( int i, RtecEventChannelAdmin::ConsumerQOS& qos, - int& shutdown_event_type, - CORBA::Environment&); + int& shutdown_event_type + TAO_ENV_ARG_DECL_NOT_USED); // Build the QoS requirements for consumer <i> - virtual void connect_suppliers (CORBA::Environment& env); + virtual void connect_suppliers (TAO_ENV_SINGLE_ARG_DECL); // Connect all the suppliers, by default it lets each supplier // connect itself. virtual void connect_supplier ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - int i, - CORBA::Environment &ACE_TRY_ENV); + int i + TAO_ENV_ARG_DECL); // Connect supplier number <i> using the supplier_admin provided. virtual void build_supplier_qos ( int i, RtecEventChannelAdmin::SupplierQOS& qos, - int& shutdown_event_type, - CORBA::Environment&); + int& shutdown_event_type + TAO_ENV_ARG_DECL_NOT_USED); // Build the QoS requirements for supplier <i> - virtual void execute_test (CORBA::Environment &env); + virtual void execute_test (TAO_ENV_SINGLE_ARG_DECL); // Execute the test, by default simply call activate_suppliers() virtual void dump_results (void); @@ -145,22 +145,22 @@ public: // and consumers, collect the latency and throughput results for // each and print the totals too. - virtual void disconnect_consumers (CORBA::Environment& env); + virtual void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL); // Disconnect all the consumers. - virtual void disconnect_suppliers (CORBA::Environment& env); + virtual void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL); // Disconnect all the suppliers. - virtual void shutdown_consumers (CORBA::Environment& env); + virtual void shutdown_consumers (TAO_ENV_SINGLE_ARG_DECL); // Deactivate all the consumers. - virtual void shutdown_suppliers (CORBA::Environment& env); + virtual void shutdown_suppliers (TAO_ENV_SINGLE_ARG_DECL); // Deactivate all the suppliers. - virtual void destroy_ec (CORBA::Environment& env); + virtual void destroy_ec (TAO_ENV_SINGLE_ARG_DECL); // Call EC->destroy - virtual void deactivate_ec (CORBA::Environment& env); + virtual void deactivate_ec (TAO_ENV_SINGLE_ARG_DECL); // De-activate the EC (and its helper classes). virtual void cleanup_ec (void); @@ -179,36 +179,36 @@ public: // Returns the index of the supplier for <cookie> virtual void consumer_push (void* consumer_cookie, - const RtecEventComm::EventSet& event, - CORBA::Environment& ACE_TRY_ENV); + const RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL); // One of the consumers in the test has received an event - virtual void consumer_shutdown (void* consumer_cookie, - CORBA::Environment& ACE_TRY_ENV); + virtual void consumer_shutdown (void* consumer_cookie + TAO_ENV_ARG_DECL); // One of the consumers has received a shutdown event - virtual void consumer_disconnect (void* consumer_cookie, - CORBA::Environment& ACE_TRY_ENV); + virtual void consumer_disconnect (void* consumer_cookie + TAO_ENV_ARG_DECL); // One of the consumers in the test has been disconnected from the EC - virtual void supplier_disconnect (void* supplier_cookie, - CORBA::Environment& ACE_TRY_ENV); + virtual void supplier_disconnect (void* supplier_cookie + TAO_ENV_ARG_DECL); // One of the suppliers in the test has been disconnected from the EC #if !defined(EC_DISABLE_REMOTE_EC) - virtual void obtain_remote_ec (CORBA::Environment& ACE_TRY_ENV); + virtual void obtain_remote_ec (TAO_ENV_SINGLE_ARG_DECL); // Obtain the EC from the Naming service virtual CosNaming::NamingContext_ptr - get_naming_context (CORBA::Environment &ACE_TRY_ENV); + get_naming_context (TAO_ENV_SINGLE_ARG_DECL); #endif #if !defined(EC_DISABLE_OLD_EC) - virtual void initialize_old_ec (CORBA::Environment& ACE_TRY_ENV); + virtual void initialize_old_ec (TAO_ENV_SINGLE_ARG_DECL); // Initialize the EC using the old implementation #endif - virtual void initialize_new_ec (CORBA::Environment& ACE_TRY_ENV); + virtual void initialize_new_ec (TAO_ENV_SINGLE_ARG_DECL); // Initialize the EC using the old implementation virtual int allocate_consumers (void); @@ -223,7 +223,7 @@ public: virtual ACE_Task_Base* allocate_task (int i); // Allocate one task for supplier number <i> - virtual void activate_tasks (CORBA::Environment& env); + virtual void activate_tasks (TAO_ENV_SINGLE_ARG_DECL); // Activate all the tasks, by default runs each supplier on its // own thread. diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index 0de3b668b5d..dc58d8ffe24 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -23,8 +23,8 @@ EC_Supplier::EC_Supplier (EC_Driver *driver, } void -EC_Supplier::send_event (int event_number, - CORBA::Environment &ACE_TRY_ENV) +EC_Supplier::send_event (int event_number + TAO_ENV_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; @@ -45,12 +45,12 @@ EC_Supplier::send_event (int event_number, this->event_type (event_number, event[0]); - this->send_event (event, ACE_TRY_ENV); + this->send_event (event TAO_ENV_ARG_PARAMETER); } void -EC_Supplier::send_event (const RtecEventComm::EventSet& event, - CORBA::Environment &ACE_TRY_ENV) +EC_Supplier::send_event (const RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -69,7 +69,7 @@ EC_Supplier::send_event (const RtecEventComm::EventSet& event, ACE_hrtime_t start = ACE_OS::gethrtime (); - this->consumer_proxy_->push (event, ACE_TRY_ENV); + this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t end = ACE_OS::gethrtime (); @@ -106,21 +106,21 @@ EC_Supplier::event_type (int event_number, void EC_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV) + int shutdown_event_type + TAO_ENV_ARG_DECL) { this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect (qos, shutdown_event_type, ACE_TRY_ENV); + this->connect (qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type, - CORBA::Environment &ACE_TRY_ENV) + int shutdown_event_type + TAO_ENV_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; // @@ Throw? @@ -130,24 +130,24 @@ EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos, if (CORBA::is_nil (this->myself_.in ())) { - this->myself_ = this->_this (ACE_TRY_ENV); + this->myself_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } this->is_active_ = 1; this->consumer_proxy_->connect_push_supplier (this->myself_.in (), - qos, - ACE_TRY_ENV); + qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -EC_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +EC_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; - this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV); + this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = @@ -155,29 +155,29 @@ EC_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) } void -EC_Supplier::shutdown (CORBA::Environment &ACE_TRY_ENV) +EC_Supplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) { if (!this->is_active_) return; // Deactivate the servant PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->is_active_ = 0; this->myself_ = RtecEventComm::PushSupplier::_nil (); } void -EC_Supplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) +EC_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->supplier_disconnect (this->cookie_, ACE_TRY_ENV); + this->driver_->supplier_disconnect (this->cookie_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); @@ -222,7 +222,7 @@ EC_Supplier_Task::EC_Supplier_Task (EC_Supplier* supplier, int EC_Supplier_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; // Initialize a time value to pace the test ACE_Time_Value tv (0, this->burst_pause_); @@ -252,7 +252,7 @@ EC_Supplier_Task::svc (void) now); // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n")); - this->supplier_->send_event (event, ACE_TRY_ENV); + this->supplier_->send_event (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -276,7 +276,7 @@ EC_Supplier_Task::svc (void) ACE_hrtime_t now = ACE_OS::gethrtime (); ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, now); - this->supplier_->send_event (event, ACE_TRY_ENV); + this->supplier_->send_event (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (SHUTDOWN); } ACE_CATCH (CORBA::SystemException, sys_ex) diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h index d20ca80723c..d66ab89d90e 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h @@ -53,40 +53,40 @@ public: // Notice that the user can connect to the EC using other // publications, this is useful for filtering tests. - void send_event (int event_number, - CORBA::Environment& ACE_TRY_ENV); + void send_event (int event_number + TAO_ENV_ARG_DECL); // The types of the event is chosen by the driver, based on the // cookie and the <event_number> - void send_event (const RtecEventComm::EventSet& event, - CORBA::Environment& ACE_TRY_ENV); + void send_event (const RtecEventComm::EventSet& event + TAO_ENV_ARG_DECL); // Send <event> to the EC. void send_event (int event_number, const RtecEventComm::Event& event); // Set the event type and source in <event> - void send_shutdown (CORBA::Environment& ACE_TRY_ENV); + void send_shutdown (TAO_ENV_SINGLE_ARG_DECL); // Send a shutdown event. virtual void connect ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type, - CORBA::Environment& ACE_TRY_ENV); + int shutdown_event_type + TAO_ENV_ARG_DECL); // Connect using a <supplier_admin> and publications (<qos>) // computed by the user virtual void connect ( const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type, - CORBA::Environment& ACE_TRY_ENV); + int shutdown_event_type + TAO_ENV_ARG_DECL); // Connect using the current consumer_proxy (useful for reconnect test) - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC, also deactivates the object - void shutdown (CORBA::Environment &ACE_TRY_ENV); + void shutdown (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the EC, also deactivates the object virtual void dump_results (const char* name, @@ -101,7 +101,7 @@ public: // Return an event type to push.... // = The PushSupplier methods - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp index 75c27a3d6ac..da32b0c1dcc 100644 --- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp +++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp @@ -93,7 +93,7 @@ Latency_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, const char *my_name) { entry_point (my_name); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // No scheduling for this test... @@ -110,20 +110,20 @@ Latency_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, // = Connect as a consumer. this->consumer_admin_ = - channel_admin_->for_consumers (ACE_TRY_ENV); + channel_admin_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->suppliers_ = - consumer_admin_->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushConsumer_var objref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->suppliers_->connect_push_consumer (objref.in (), - dependencies.get_ConsumerQOS (), - ACE_TRY_ENV); + dependencies.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se) @@ -144,36 +144,36 @@ Latency_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, } void -Latency_Consumer::close (CORBA::Environment &ACE_TRY_ENV) +Latency_Consumer::close (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "(%t) %s closing down.\n", this->entry_point ())); - this->suppliers_->disconnect_push_supplier (ACE_TRY_ENV); + this->suppliers_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var poa = - this->_default_POA (ACE_TRY_ENV); + this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this, ACE_TRY_ENV); + poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Latency_Consumer::disconnect_push_consumer (CORBA::Environment &) +Latency_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Consumer received disconnect from channel.\n")); } void -Latency_Consumer::push (const RtecEventComm::EventSet &events, - CORBA::Environment &) +Latency_Consumer::push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Latency_Consumer:push - ")); @@ -354,10 +354,10 @@ Latency_Supplier::Supplier::Supplier (Latency_Supplier* impl) void Latency_Supplier::Supplier::disconnect_push_supplier ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->impl_->disconnect_push_supplier (ACE_TRY_ENV); + this->impl_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); } Latency_Supplier::Consumer::Consumer (Latency_Supplier* impl) @@ -367,19 +367,19 @@ Latency_Supplier::Consumer::Consumer (Latency_Supplier* impl) void Latency_Supplier::Consumer::disconnect_push_consumer ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->impl_->disconnect_push_consumer (ACE_TRY_ENV); + this->impl_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); } void Latency_Supplier::Consumer::push ( - const RtecEventComm::EventSet &events, - CORBA::Environment &ACE_TRY_ENV) + const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->impl_->push (events, ACE_TRY_ENV); + this->impl_->push (events TAO_ENV_ARG_PARAMETER); } // ************************************************************ @@ -403,7 +403,7 @@ Latency_Supplier::open_supplier (RtecEventChannelAdmin::EventChannel_ptr ec, { this->entry_point (name); master_ = master; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { this->channel_admin_ = @@ -421,20 +421,20 @@ Latency_Supplier::open_supplier (RtecEventChannelAdmin::EventChannel_ptr ec, // = Connect as a supplier. this->supplier_admin_ = - channel_admin_->for_suppliers (ACE_TRY_ENV); + channel_admin_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->consumers_ = - supplier_admin_->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushSupplier_var objref = - this->supplier_._this (ACE_TRY_ENV); + this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; consumers_->connect_push_supplier (objref.in (), - publications.get_SupplierQOS (), - ACE_TRY_ENV); + publications.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -448,53 +448,53 @@ Latency_Supplier::open_supplier (RtecEventChannelAdmin::EventChannel_ptr ec, } void -Latency_Supplier::close (CORBA::Environment &ACE_TRY_ENV) +Latency_Supplier::close (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "(%t) %s closing down.\n", this->entry_point ())); - this->suppliers_->disconnect_push_supplier (ACE_TRY_ENV); + this->suppliers_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumers_->disconnect_push_consumer (ACE_TRY_ENV); + this->consumers_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { PortableServer::POA_var poa = - this->supplier_._default_POA (ACE_TRY_ENV); + this->supplier_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (&this->supplier_, ACE_TRY_ENV); + poa->servant_to_id (&this->supplier_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } { PortableServer::POA_var poa = - this->consumer_._default_POA (ACE_TRY_ENV); + this->consumer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (&this->consumer_, ACE_TRY_ENV); + poa->servant_to_id (&this->consumer_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -Latency_Supplier::disconnect_push_consumer (CORBA::Environment &) +Latency_Supplier::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, "Supplier-consumer received disconnect from channel.\n")); } void -Latency_Supplier::disconnect_push_supplier (CORBA::Environment &) +Latency_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { ACE_DEBUG ((LM_DEBUG, "Supplier received disconnect from channel.\n")); } @@ -508,7 +508,7 @@ Latency_Supplier::start_generating_events (void) ACE_CU64_TO_CU32 (now) % 1000000000 / 1000)); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { ACE_Time_Value tv_timeout (0, timeout_interval * 1000); @@ -534,19 +534,19 @@ Latency_Supplier::start_generating_events (void) // = Connect as a consumer. consumer_admin_ = - channel_admin_->for_consumers (ACE_TRY_ENV); + channel_admin_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; suppliers_ = - consumer_admin_->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushConsumer_var objref = - this->consumer_._this (ACE_TRY_ENV); + this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->suppliers_->connect_push_consumer (objref.in (), - dependencies.get_ConsumerQOS (), - ACE_TRY_ENV); + dependencies.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -561,8 +561,8 @@ Latency_Supplier::start_generating_events (void) } void -Latency_Supplier::push (const RtecEventComm::EventSet &events, - CORBA::Environment &ACE_TRY_ENV) +Latency_Supplier::push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "Latency_Supplier::push - ")); @@ -606,7 +606,7 @@ Latency_Supplier::push (const RtecEventComm::EventSet &events, { // This constructor is fast. const RtecEventComm::EventSet es (1, 1, &event); - consumer [cons]->push (es, ACE_TRY_ENV); + consumer [cons]->push (es TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -626,7 +626,7 @@ Latency_Supplier::push (const RtecEventComm::EventSet &events, RtecEventComm::EventSet events (1); events.length (1); events[0] = event; - consumers_->push (events, ACE_TRY_ENV); + consumers_->push (events TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_TIMEPROBE (EVENT_LATENCY_SUPPLIER_ENDS_PUSHING_EVENT); @@ -682,7 +682,7 @@ Latency_Supplier::shutdown (void) return; } - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { if (master_) @@ -696,7 +696,7 @@ Latency_Supplier::shutdown (void) RtecEventComm::EventSet events (1); events.length (1); events[0] = event; - consumers_->push (events, ACE_TRY_ENV); + consumers_->push (events TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -857,16 +857,16 @@ main (int argc, char *argv []) u_int i; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -875,18 +875,18 @@ main (int argc, char *argv []) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService", ACE_TRY_ENV); + orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -895,7 +895,7 @@ main (int argc, char *argv []) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (get_options (argc, argv)) @@ -911,22 +911,22 @@ main (int argc, char *argv []) channel_name[0].id = CORBA::string_dup ("EventService"); CORBA::Object_var ec_obj = - naming_context->resolve (channel_name, ACE_TRY_ENV); + naming_context->resolve (channel_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (), - ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else TAO_EC_Event_Channel_Attributes attr(root_poa.in (), root_poa.in ()); TAO_EC_Event_Channel ec_impl (attr); - ec_impl.activate (ACE_TRY_ENV); + ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* 0 */ @@ -990,13 +990,13 @@ main (int argc, char *argv []) for (i = 0; i < suppliers; ++i) { - supplier[i]->close (ACE_TRY_ENV); + supplier[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } for (i = 0; i < consumers; ++i) { - consumer [i]->close (ACE_TRY_ENV); + consumer [i]->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1014,12 +1014,12 @@ main (int argc, char *argv []) } delete [] consumer; - ec->destroy (ACE_TRY_ENV); + ec->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_TIMEPROBE_PRINT; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h index 71095dd35ef..15abe63a525 100644 --- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h +++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h @@ -55,7 +55,7 @@ public: const char *my_name); /// Disconnect from the Event Service and deactivate the object - void close (CORBA::Environment &); + void close (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); void entry_point (const char*); const char *entry_point () const; @@ -63,7 +63,7 @@ public: /// Print timing statistics. void print_stats () /* const */; - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -71,8 +71,8 @@ public: * the supplier. If its a shutdown message, the consumer * disconnects from the channel. */ - virtual void push (const RtecEventComm::EventSet &events, - CORBA::Environment &) + virtual void push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -145,7 +145,7 @@ public: , public PortableServer::RefCountServantBase { public: - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -164,11 +164,11 @@ public: , public PortableServer::RefCountServantBase { public: - virtual void push (const RtecEventComm::EventSet &events, - CORBA::Environment &) + virtual void push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -203,18 +203,18 @@ public: /// Disconnect from the Event Service, deactivate the supplier and /// consumer personalities - void close (CORBA::Environment &ACE_TRY_ENV); + void close (TAO_ENV_SINGLE_ARG_DECL); /// The channel is disconnecting. - void disconnect_push_supplier (CORBA::Environment &); + void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); /// The channel is disconnecting. - void disconnect_push_consumer (CORBA::Environment &); + void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); /// Takes a timestamp and then pushes event_ to all consumers, either /// directly, or via a channel. - void push (const RtecEventComm::EventSet &events, - CORBA::Environment &); + void push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED); /** * Called when the supplier should start generating events. diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h index fca15cc7e8f..39790e6bf9f 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h @@ -42,7 +42,7 @@ public: Client_i (CORBA::ORB_ptr orb); // Our constructor - void init (CORBA::Environment &ACE_TRY_ENV); + void init (TAO_ENV_SINGLE_ARG_DECL); // Initialize the ORB etc. private: diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 00f059b858e..2d24fddbe2e 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -61,7 +61,7 @@ int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; Manager manager; @@ -69,8 +69,8 @@ main (int argc, { // Initilaize the ORB, POA etc. manager.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // the command line arguments @@ -78,13 +78,13 @@ main (int argc, return -1; // Merge the different IORS - manager.make_merged_iors (ACE_TRY_ENV); + manager.make_merged_iors (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; cout << "Merged IORS" <<endl; // Set properties. This is the most important portion of the // test - manager.set_properties (ACE_TRY_ENV); + manager.set_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; cout << "Set prop" <<endl; @@ -94,7 +94,7 @@ main (int argc, // Client, who is going to use the merged IOR // Construct that with the managers ORB Client_i client_imp (manager.orb ()); - client_imp.init (ACE_TRY_ENV); + client_imp.init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -117,59 +117,59 @@ Manager::Manager (void) void Manager::init (int argc, - char *argv[], - CORBA::Environment &ACE_TRY_ENV) + char *argv[] + TAO_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Obtain the RootPOA. CORBA::Object_var obj_var = - this->orb_->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa_var = - PortableServer::POA::_narrow (obj_var.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (obj_var.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager_var = - root_poa_var->the_POAManager (ACE_TRY_ENV); + root_poa_var->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager_var->activate (ACE_TRY_ENV); + poa_manager_var->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } int -Manager::make_merged_iors (CORBA::Environment &ACE_TRY_ENV) +Manager::make_merged_iors (TAO_ENV_SINGLE_ARG_DECL) { // First server object_primary = - this->orb_->string_to_object (first_ior, - ACE_TRY_ENV); + this->orb_->string_to_object (first_ior + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); //Second server object_secondary = - this->orb_->string_to_object (second_ior, - ACE_TRY_ENV); + this->orb_->string_to_object (second_ior + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get an object reference for the ORBs IORManipultion object! CORBA_Object_ptr IORM = this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); iorm = - TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM, ACE_TRY_ENV); + TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -181,14 +181,14 @@ Manager::make_merged_iors (CORBA::Environment &ACE_TRY_ENV) // Create a merged set 1; merged_set_ = - iorm->merge_iors (iors, ACE_TRY_ENV); + iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } int -Manager::set_properties (CORBA::Environment &ACE_TRY_ENV) +Manager::set_properties (TAO_ENV_SINGLE_ARG_DECL) { FT::TagFTGroupTaggedComponent ft_tag_component; @@ -215,8 +215,8 @@ Manager::set_properties (CORBA::Environment &ACE_TRY_ENV) // Set the property CORBA::Boolean retval = iorm->set_property (&iogr_prop, - this->merged_set_.in (), - ACE_TRY_ENV); + this->merged_set_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Set the primary @@ -225,8 +225,8 @@ Manager::set_properties (CORBA::Environment &ACE_TRY_ENV) { retval = iorm->set_primary (&iogr_prop, object_secondary.in (), - this->merged_set_.in (), - ACE_TRY_ENV); + this->merged_set_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -234,11 +234,11 @@ Manager::set_properties (CORBA::Environment &ACE_TRY_ENV) } int -Manager::run (CORBA::Environment &ACE_TRY_ENV) +Manager::run (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -286,11 +286,11 @@ Client_i::Client_i (CORBA::ORB_ptr orb) } void -run_test (Simple_Server_ptr server, - CORBA::Environment &ACE_TRY_ENV); +run_test (Simple_Server_ptr server + TAO_ENV_ARG_DECL); void -Client_i::init (CORBA::Environment &ACE_TRY_ENV) +Client_i::init (TAO_ENV_SINGLE_ARG_DECL) { // Open the file for reading. ACE_HANDLE f_handle = ACE_OS::open (ior_output_file, @@ -314,19 +314,19 @@ Client_i::init (CORBA::Environment &ACE_TRY_ENV) char **argv = 0; this->orb_ = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var object = - this->orb_->string_to_object (data, - ACE_TRY_ENV); + this->orb_->string_to_object (data + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Combined IOR stuff Simple_Server_var server = - Simple_Server::_narrow (object.in (), - ACE_TRY_ENV); + Simple_Server::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (server.in ())) @@ -336,8 +336,8 @@ Client_i::init (CORBA::Environment &ACE_TRY_ENV) data)); } - run_test (server.in (), - ACE_TRY_ENV); + run_test (server.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ior_buffer.alloc ()->free (data); @@ -345,8 +345,8 @@ Client_i::init (CORBA::Environment &ACE_TRY_ENV) } -void run_test (Simple_Server_ptr server, - CORBA::Environment &ACE_TRY_ENV) +void run_test (Simple_Server_ptr server + TAO_ENV_ARG_DECL) { // We do this twice as we know that there are only two servers. for (CORBA::ULong i = 0; @@ -360,7 +360,7 @@ void run_test (Simple_Server_ptr server, j++) { // Make a remote call - server->remote_call (ACE_TRY_ENV); + server->remote_call (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -368,7 +368,7 @@ void run_test (Simple_Server_ptr server, ACE_TEXT ("*********************************\n"))); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("I am going to shutdown the server\n"))); - server->shutdown (ACE_TRY_ENV); + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (2); } diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h index 8c6099b29e1..a82d46c1537 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h @@ -43,18 +43,18 @@ public: // Ctor void init (int argc, - char *argv[], - CORBA::Environment & ACE_TRY_ENV); + char *argv[] + TAO_ENV_ARG_DECL); // Initialize the ORB, POA etc. - int make_merged_iors (CORBA::Environment &); + int make_merged_iors (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Merges the different IORS - int set_properties (CORBA::Environment &); + int set_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Sets the properties for the profiles - int run (CORBA::Environment &ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL); // Run the ORB event loop.. int write_to_file (void); diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp index bc47e11a576..1c984b1de4b 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp @@ -35,18 +35,18 @@ main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We do the command line parsing first if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -55,22 +55,22 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate the LCD_Display implementation class Simple_Server_i display_impl (orb.in ()); Simple_Server_var server = - display_impl._this (ACE_TRY_ENV); + display_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in (), ACE_TRY_ENV); + orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -88,7 +88,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; orb->run (); diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp index 3990a7d2327..31d1e20115b 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp @@ -20,7 +20,7 @@ Simple_Server_i::Simple_Server_i (void) } void -Simple_Server_i::remote_call (CORBA::Environment & /*ACE_TRY_ENV*/) +Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -31,7 +31,7 @@ Simple_Server_i::remote_call (CORBA::Environment & /*ACE_TRY_ENV*/) void -Simple_Server_i::shutdown (CORBA::Environment&) +Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h index fb1713e4d2b..0c6638822df 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h @@ -34,10 +34,10 @@ public: // ctor // = The Simple_Server methods. - void remote_call (CORBA::Environment &) + void remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment&) + void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp index 2ea3e0b0c09..1de598a218f 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp @@ -32,38 +32,38 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n")); ACE_DEBUG ((LM_DEBUG, "Running the IOGRManipulation Tests.\n")); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Retrieve the ORB. CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ********************************************************************** // Get an object reference for the ORBs IORManipulation object! CORBA::Object_var IORM = orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; TAO_IOP::TAO_IOR_Manipulation_var iorm = - TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in (), - ACE_TRY_ENV); + TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ********************************************************************** // Create a few fictitious IORs CORBA::Object_var name1 = - orb_->string_to_object ("iiop://acme.cs.wustl.edu:6060/xyz", - ACE_TRY_ENV); + orb_->string_to_object ("iiop://acme.cs.wustl.edu:6060/xyz" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var name2 = - orb_->string_to_object ("iiop://tango.cs.wustl.edu:7070/xyz", - ACE_TRY_ENV); + orb_->string_to_object ("iiop://tango.cs.wustl.edu:7070/xyz" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ********************************************************************** @@ -75,7 +75,7 @@ main (int argc, char *argv[]) // ********************************************************************** CORBA::Object_var merged = - iorm->merge_iors (iors, ACE_TRY_ENV); + iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check for set and get primaries @@ -84,7 +84,7 @@ main (int argc, char *argv[]) TAO_FT_IOGR_Property prop (ft_tag_component); CORBA::Boolean retval = - iorm->set_primary (&prop, name2.in (), merged.in (), ACE_TRY_ENV); + iorm->set_primary (&prop, name2.in (), merged.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval != 0) @@ -99,8 +99,8 @@ main (int argc, char *argv[]) // Check whether a primary has been set retval = iorm->is_primary_set (&prop, - merged.in (), - ACE_TRY_ENV); + merged.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval) @@ -119,8 +119,8 @@ main (int argc, char *argv[]) // Get the primary CORBA::Object_var prim = iorm->get_primary (&prop, - merged.in (), - ACE_TRY_ENV); + merged.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check whether we got back the right primary @@ -159,8 +159,8 @@ main (int argc, char *argv[]) // Set the property retval = iorm->set_property (&prop, - merged.in (), - ACE_TRY_ENV); + merged.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval) diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp index 6bfdb80ea84..727078a3c98 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp @@ -8,7 +8,7 @@ MCast_Server_i::MCast_Server_i (void) } CORBA::Boolean -MCast_Server_i::connect_server (CORBA::Environment &) +MCast_Server_i::connect_server (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h index 7a3b81fb2b0..e626d3265b6 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h +++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h @@ -11,7 +11,7 @@ public: // Simple method just to see that the client contacted the // server. If does contact, a '0' is returned. - CORBA::Boolean connect_server (CORBA::Environment &) + CORBA::Boolean connect_server (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp index 09bbb6960c3..e47a63655c0 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp @@ -5,7 +5,7 @@ int main (int argc, char *argv []) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -13,7 +13,7 @@ int main (int argc, char *argv []) ior_mcast_Client_i client; int init_result; - init_result = client.init (argc, argv, ACE_TRY_ENV); + init_result = client.init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp index 63f346939f5..b1110e009cb 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp @@ -15,8 +15,8 @@ ior_mcast_Client_i::~ior_mcast_Client_i (void) int ior_mcast_Client_i::init (int& argc, - char *argv[], - CORBA::Environment &ACE_TRY_ENV) + char *argv[] + TAO_ENV_ARG_DECL) { ACE_TRY @@ -25,21 +25,21 @@ ior_mcast_Client_i::init (int& argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" /* the ORB name, it can be anything! */, - ACE_TRY_ENV); + "" /* the ORB name, it can be anything! */ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var mcast_server_object = - orb->resolve_initial_references ("MCASTServer", ACE_TRY_ENV); + orb->resolve_initial_references ("MCASTServer" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (CORBA::is_nil (mcast_server_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, "Cannot resolve MCast Server\n : client"), -1); MCast::Server_var mcast_srvr = - MCast::Server::_narrow (mcast_server_object.in (), ACE_TRY_ENV); + MCast::Server::_narrow (mcast_server_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (mcast_srvr.in ())) @@ -49,7 +49,7 @@ ior_mcast_Client_i::init (int& argc, // Invoke a request on the server CORBA::Boolean ret_value = - mcast_srvr->connect_server (ACE_TRY_ENV); + mcast_srvr->connect_server (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ret_value != 0) @@ -57,7 +57,7 @@ ior_mcast_Client_i::init (int& argc, ACE_DEBUG ((LM_DEBUG, "The server has not been contacted. Error!!\n", 0)); - } + } } ACE_CATCH (CORBA::SystemException, ex) { diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h index 68e8ece6575..d28da2f6c73 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h +++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h @@ -20,10 +20,10 @@ class ior_mcast_Client_i ior_mcast_Client_i (void); ~ior_mcast_Client_i (void); - int run (CORBA::Environment &ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL); // Execute the client example code. - int init (int& argc, char *argv[], CORBA::Environment &ACE_TRY_ENV); + int init (int& argc, char *argv[] TAO_ENV_ARG_DECL); // Initialize the client communication endpoint with the server. private: diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp index 12a52993a9f..f25de786656 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp @@ -4,14 +4,14 @@ int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { Server_i svr_i; int init_result; - init_result = svr_i.init (argc, argv, ACE_TRY_ENV); + init_result = svr_i.init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (init_result != 0) diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp index 17432f44284..ec0094ed072 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp @@ -23,8 +23,8 @@ Server_i::~Server_i (void) int Server_i::init (int &argc, - char **&argv, - CORBA::Environment &ACE_TRY_ENV) + char **&argv + TAO_ENV_ARG_DECL) { this->argc_ = argc; this->argv_ = argv; @@ -35,46 +35,46 @@ Server_i::init (int &argc, this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, - "" /* the ORB name, it can be anything! */, - ACE_TRY_ENV); + "" /* the ORB name, it can be anything! */ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get a reference to the RootPOA. CORBA::Object_var poa_object = - this->orb_->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow down to the correct reference. PortableServer::POA_var poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Set a POA Manager. PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA Manager. - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior; // Create the servant MCast_Server_i server_i; - + // Activate it to obtain the reference MCast::Server_var mcast_server = server_i._this (); - + CORBA::Object_var table_object = - this->orb_->resolve_initial_references ("IORTable", ACE_TRY_ENV); + this->orb_->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV); + IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + if (CORBA::is_nil (adapter.in ())) { ACE_ERROR ((LM_ERROR, "Nil IORTable\n")); @@ -82,21 +82,21 @@ Server_i::init (int &argc, else { ior = - this->orb_->object_to_string (mcast_server.in (), - ACE_TRY_ENV); + this->orb_->object_to_string (mcast_server.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - adapter->bind ("MCASTServer", ior.in (), ACE_TRY_ENV); + adapter->bind ("MCASTServer", ior.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } - + // Enable such that the server can listen for multicast requests // at the specified address. - this->enable_multicast (ior.in (), - ACE_TRY_ENV); + this->enable_multicast (ior.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; //Destroy the POA, waiting until the destruction terminates. @@ -114,29 +114,29 @@ Server_i::init (int &argc, } int -Server_i::enable_multicast (const char *ior, - CORBA::Environment &) +Server_i::enable_multicast (const char *ior + TAO_ENV_ARG_DECL_NOT_USED) { ACE_TRY { this->parse_args (this->argc_, this->argv_); - + // Get reactor instance from TAO. ACE_Reactor *reactor = this->orb_->orb_core ()->reactor (); - + // Instantiate a handler which will handle client requests for // the bottstrappable service, received on the multicast port. ACE_NEW_RETURN (this->ior_multicast_, TAO_IOR_Multicast (), -1); - + if (this->ior_multicast_->init (ior, this->mcast_address_.in (), TAO_SERVICEID_MCASTSERVER) == -1) return -1; - + // Register event handler for the ior multicast. if (reactor->register_handler (this->ior_multicast_, ACE_Event_Handler::READ_MASK) == -1) @@ -146,7 +146,7 @@ Server_i::enable_multicast (const char *ior, "MCast_Server: cannot register Event handler\n")); return -1; } - + } ACE_CATCH (CORBA::SystemException, ex) { @@ -167,14 +167,14 @@ Server_i::parse_args (int argc, char *argv []) switch (c) { case 'a': - this->mcast_address_ = get_opts.optarg; - break; + this->mcast_address_ = get_opts.optarg; + break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " - "-a <mcast_address>" + "-a <mcast_address>" "\n", argv [0]), -1); diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h index 0becc1f3854..77b16b86153 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h +++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h @@ -18,13 +18,13 @@ class Server_i Server_i (void); ~Server_i (void); - int init (int &argc, char **&argv, CORBA::Environment &); + int init (int &argc, char **&argv TAO_ENV_ARG_DECL_NOT_USED); // Initialize the server multicast. private: - int enable_multicast (const char *ior, - CORBA::Environment &ACE_TRY_ENV); + int enable_multicast (const char *ior + TAO_ENV_ARG_DECL); // Sets the IOR_Multicast class to listen for multicast requests // for this server. @@ -49,7 +49,7 @@ class Server_i CORBA::String_var mcast_address_; // Address of the multicast address where to listen for requests for */ // the server. */ - + }; diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp index 30954cdb64c..df08d623bd9 100644 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp @@ -9,11 +9,11 @@ int main (int argc, char *argv[]) { ACE_TRY_NEW_ENV { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var ns_obj = - orb->resolve_initial_references ("NameService", ACE_TRY_ENV); + orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ns_obj.in ())) @@ -22,8 +22,8 @@ int main (int argc, char *argv[]) 1); CosNaming::NamingContext_var inc = - CosNaming::NamingContext::_narrow (ns_obj.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (ns_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (inc.in ())) @@ -35,7 +35,7 @@ int main (int argc, char *argv[]) name.length (1); name[0].id = CORBA::string_dup ("yourself"); - inc->bind (name, ns_obj.in (), ACE_TRY_ENV); + inc->bind (name, ns_obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test Successful\n")); diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp index c7f601f37a0..a138972dd69 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp @@ -59,11 +59,11 @@ Airplane_Client_i::get_planes (size_t count) { for (size_t i = 0; i < count; i++) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::String_var response = - this->server_->get_plane (ACE_TRY_ENV); + this->server_->get_plane (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Plane %d is %s\n", i, response.in ())); @@ -103,14 +103,14 @@ Airplane_Client_i::init (int argc, char **argv) this->argc_ = argc; this->argv_ = argv; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Retrieve the ORB. this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, - "internet", - ACE_TRY_ENV); + "internet" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -124,10 +124,10 @@ Airplane_Client_i::init (int argc, char **argv) -1); CORBA::Object_var server_object = - this->orb_->string_to_object (this->server_key_, ACE_TRY_ENV); + this->orb_->string_to_object (this->server_key_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->server_ = Paper_Airplane_Server::_narrow (server_object.in(), ACE_TRY_ENV); + this->server_ = Paper_Airplane_Server::_narrow (server_object.in() TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server_object.in ())) diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h index 46be09448cf..c2e393aa2a3 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h @@ -61,9 +61,6 @@ private: /// Number of airplanes to query for. size_t loop_count_; - /// Environment variable. - CORBA::Environment env_; - /// Server object ptr. Paper_Airplane_Server_ptr server_; diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp index c501db183a1..2acd8e75b87 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp @@ -26,7 +26,7 @@ Airplane_i::~Airplane_i (void) // Returns a random plane and page number char * -Airplane_i::get_plane (CORBA::Environment &) +Airplane_i::get_plane (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level) diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h index 817a116ec88..53e121ba139 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h @@ -48,7 +48,7 @@ public: ~Airplane_i (void); /// Returns a random plane. - virtual char *get_plane (CORBA::Environment &ACE_TRY_ENV) + virtual char *get_plane (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp index e5d8e49f3b9..f0947997b2d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp @@ -11,17 +11,17 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tPaper Airplane Server\n\n")); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - int retval = server.init (argc, argv, ACE_TRY_ENV); + int retval = server.init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) return -1; else { - server.run (ACE_TRY_ENV); + server.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp index f19f500bb36..d0864f3e575 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp @@ -55,7 +55,7 @@ Airplane_Server_i::parse_args (void) } int -Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) +Airplane_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL) { // Since the Implementation Repository keys off of the POA name, we need // to use the SERVER_NAME as the POA's name. @@ -64,7 +64,7 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) ACE_TRY { // Initialize the ORB - this->orb_ = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV); + this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Save pointers to the command line arguments @@ -79,8 +79,8 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) // Get the POA from the ORB. CORBA::Object_var poa_object = - this->orb_->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check the POA object. @@ -91,11 +91,11 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) // Narrow the object to a POA. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_Manager. - this->poa_manager_ = root_poa->the_POAManager (ACE_TRY_ENV); + this->poa_manager_ = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // We now need to create a POA with the persistent and user_id policies, @@ -105,32 +105,32 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) policies.length (2); policies[0] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID, - ACE_TRY_ENV); + root_poa->create_id_assignment_policy (PortableServer::USER_ID + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK policies[1] = - root_poa->create_lifespan_policy (PortableServer::PERSISTENT, - ACE_TRY_ENV); + root_poa->create_lifespan_policy (PortableServer::PERSISTENT + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->airplane_poa_ = root_poa->create_POA (poa_name, this->poa_manager_.in (), - policies, - ACE_TRY_ENV); + policies + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of the new POA is over, so destroy the Policy_ptr's. for (CORBA::ULong i = 0; i < policies.length (); ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (ACE_TRY_ENV); + policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // Make sure the POA manager is activated. - this->poa_manager_->activate (ACE_TRY_ENV); + this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_NEW_RETURN (this->server_impl_, @@ -141,31 +141,31 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) PortableServer::string_to_ObjectId ("server"); this->airplane_poa_->activate_object_with_id (server_id.in (), - this->server_impl_, - ACE_TRY_ENV); + this->server_impl_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var server_obj = - this->airplane_poa_->id_to_reference (server_id.in (), - ACE_TRY_ENV); + this->airplane_poa_->id_to_reference (server_id.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create an IOR from the server object. CORBA::String_var server_str = - this->orb_->object_to_string (server_obj.in (), - ACE_TRY_ENV); + this->orb_->object_to_string (server_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", server_str.in ())); CORBA::Object_var table_object = - this->orb_->resolve_initial_references ("IORTable", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("IORTable" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV); + IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { @@ -173,7 +173,7 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) } else { - adapter->bind (poa_name, server_str.in (), ACE_TRY_ENV); + adapter->bind (poa_name, server_str.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -196,11 +196,11 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) } int -Airplane_Server_i::run (CORBA::Environment &ACE_TRY_ENV) +Airplane_Server_i::run (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -221,7 +221,7 @@ Airplane_Server_i::~Airplane_Server_i (void) { if (!CORBA::is_nil (this->airplane_poa_.in ())) { - this->airplane_poa_->destroy (1, 1, ACE_TRY_ENV); + this->airplane_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h index e3cedf8b798..19880a002c3 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h @@ -26,7 +26,7 @@ * * @brief Paper Airplane Server Implementation Class * - * Sets up everything necessary to get the Paper Airplane Server + * Sets up everything necessary to get the Paper Airplane Server * running. */ class Airplane_Server_i @@ -40,10 +40,10 @@ public: ~Airplane_Server_i (void); /// Initialize the Server state - parsing arguments and waiting - int init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV); + int init (int argc, char **argv TAO_ENV_ARG_DECL); - /// Run the orb - int run (CORBA::Environment &ACE_TRY_ENV); + /// Run the orb + int run (TAO_ENV_SINGLE_ARG_DECL); private: /// Parses the commandline arguments. @@ -64,7 +64,7 @@ private: /// The POA manager. PortableServer::POAManager_var poa_manager_; - /// The Paper Airplane Server Implementation. + /// The Paper Airplane Server Implementation. Airplane_i *server_impl_; /// File where the IOR of the server object is stored. diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp index b3d9f61a41a..f0c05263d59 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp @@ -87,14 +87,14 @@ Nestea_Client_i::init (int argc, char **argv) this->argc_ = argc; this->argv_ = argv; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Retrieve the ORB. this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, - "internet", - ACE_TRY_ENV); + "internet" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -108,10 +108,10 @@ Nestea_Client_i::init (int argc, char **argv) -1); CORBA::Object_var server_object = - this->orb_->string_to_object (this->server_key_, ACE_TRY_ENV); + this->orb_->string_to_object (this->server_key_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->server_ = Nestea_Bookshelf::_narrow (server_object.in(), ACE_TRY_ENV); + this->server_ = Nestea_Bookshelf::_narrow (server_object.in() TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server_object.in ())) diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp index ddee142a311..56d0454efd8 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp @@ -34,8 +34,8 @@ Nestea_i::~Nestea_i (void) // Add <cans> number of cans to the bookshelf. void -Nestea_i::drink (CORBA::Long cans, - CORBA::Environment &) +Nestea_i::drink (CORBA::Long cans + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level) @@ -50,8 +50,8 @@ Nestea_i::drink (CORBA::Long cans, // Removes <cans> number of cans from the bookshelf. void -Nestea_i::crush (CORBA::Long cans, - CORBA::Environment &) +Nestea_i::crush (CORBA::Long cans + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level) @@ -69,7 +69,7 @@ Nestea_i::crush (CORBA::Long cans, // Returns the number of cans in the bookshelf. CORBA::Long -Nestea_i::bookshelf_size (CORBA::Environment &) +Nestea_i::bookshelf_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level) @@ -81,7 +81,7 @@ Nestea_i::bookshelf_size (CORBA::Environment &) // Returns comments about your collection. char * -Nestea_i::get_praise (CORBA::Environment &) +Nestea_i::get_praise (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level) diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h index 1754576175f..88c2da374b4 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h @@ -15,7 +15,7 @@ #if !defined (NESTEA_I_H) -#define NESTEA_I_H +#define NESTEA_I_H #include "NesteaS.h" @@ -45,25 +45,21 @@ public: virtual ~Nestea_i (void); /// Add <cans> number of cans to the bookshelf. - virtual void drink (CORBA::Long cans, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void drink (CORBA::Long cans + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Removes <cans> number of cans from the bookshelf. - virtual void crush (CORBA::Long cans, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void crush (CORBA::Long cans + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns the number of cans in the bookshelf. - virtual CORBA::Long bookshelf_size (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::Long bookshelf_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns comments about your collection. - virtual char *get_praise (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual char *get_praise (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp index c8b0795079b..48bf74ed1a7 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp @@ -11,17 +11,17 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tNestea Bookshelf Server\n\n")); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - int retval = server.init (argc, argv, ACE_TRY_ENV); + int retval = server.init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) return -1; else { - server.run (ACE_TRY_ENV); + server.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp index 88e9d7a1bff..9387ac9edcd 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp @@ -27,7 +27,7 @@ Nestea_Server_i::~Nestea_Server_i (void) { if (!CORBA::is_nil (this->nestea_poa_.in ())) { - this->nestea_poa_->destroy (1, 1, ACE_TRY_ENV); + this->nestea_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -86,7 +86,7 @@ Nestea_Server_i::parse_args (void) // - Creates an IOR from the servant and outputs it to a file int -Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) +Nestea_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL) { // Since the Implementation Repository keys off of the POA name, we need // to use the SERVER_NAME as the POA's name. @@ -95,7 +95,7 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) ACE_TRY { // Initialize the ORB - this->orb_ = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV); + this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Save pointers to the command line arguments @@ -110,8 +110,8 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) // Get the POA from the ORB. CORBA::Object_var poa_object = - this->orb_->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check the POA object. @@ -122,11 +122,11 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) // Narrow the object to a POA. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_Manager. - this->poa_manager_ = root_poa->the_POAManager (ACE_TRY_ENV); + this->poa_manager_ = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // We now need to create a POA with the persistent and user_id policies, @@ -136,32 +136,32 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) policies.length (2); policies[0] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID, - ACE_TRY_ENV); + root_poa->create_id_assignment_policy (PortableServer::USER_ID + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK policies[1] = - root_poa->create_lifespan_policy (PortableServer::PERSISTENT, - ACE_TRY_ENV); + root_poa->create_lifespan_policy (PortableServer::PERSISTENT + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->nestea_poa_ = root_poa->create_POA (poa_name, this->poa_manager_.in (), - policies, - ACE_TRY_ENV); + policies + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of the new POA is over, so destroy the Policy_ptr's. for (CORBA::ULong i = 0; i < policies.length (); ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (ACE_TRY_ENV); + policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // Make sure the POA manager is activated. - this->poa_manager_->activate (ACE_TRY_ENV); + this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_NEW_RETURN (this->server_impl_, @@ -172,31 +172,31 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) PortableServer::string_to_ObjectId ("server"); this->nestea_poa_->activate_object_with_id (server_id.in (), - this->server_impl_, - ACE_TRY_ENV); + this->server_impl_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var server_obj = - this->nestea_poa_->id_to_reference (server_id.in (), - ACE_TRY_ENV); + this->nestea_poa_->id_to_reference (server_id.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create an IOR from the server object. CORBA::String_var server_str = - this->orb_->object_to_string (server_obj.in (), - ACE_TRY_ENV); + this->orb_->object_to_string (server_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", server_str.in ())); CORBA::Object_var table_object = - this->orb_->resolve_initial_references ("IORTable", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("IORTable" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = - IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV); + IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { @@ -204,7 +204,7 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) } else { - adapter->bind (poa_name, server_str.in (), ACE_TRY_ENV); + adapter->bind (poa_name, server_str.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -227,13 +227,13 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV) } int -Nestea_Server_i::run (CORBA::Environment &ACE_TRY_ENV) +Nestea_Server_i::run (TAO_ENV_SINGLE_ARG_DECL) { int status = 0; ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h index d340cbd0499..e4ba216abe9 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h @@ -26,7 +26,7 @@ * * @brief Nestea Bookshelf Server Implementation Class * - * Sets up everything necessary to get the Nestea Bookshelf Server + * Sets up everything necessary to get the Nestea Bookshelf Server * running. */ class Nestea_Server_i @@ -40,10 +40,10 @@ public: ~Nestea_Server_i (void); /// Initialize the Server state - parsing arguments and waiting - int init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV); + int init (int argc, char **argv TAO_ENV_ARG_DECL); - /// Run the orb - int run (CORBA::Environment &ACE_TRY_ENV); + /// Run the orb + int run (TAO_ENV_SINGLE_ARG_DECL); private: /// Parses the commandline arguments. @@ -63,8 +63,8 @@ private: /// The POA manager. PortableServer::POAManager_var poa_manager_; - - /// The Nestea Bookshelf Server Implementation. + + /// The Nestea Bookshelf Server Implementation. Nestea_i *server_impl_; /// File where the IOR of the server object is stored. diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp index a38d0d88fb8..b6d30158d55 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp @@ -10,25 +10,25 @@ main (int argc, char *argv[]) { IFR_DII_Client client; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - if (client.init (argc, - argv, - ACE_TRY_ENV) + if (client.init (argc, + argv + TAO_ENV_ARG_PARAMETER) == -1) { return 1; } else { - client.run (ACE_TRY_ENV); + client.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client Exception"); return -1; } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp index f5b6a4d10e5..91b2602ff01 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp @@ -18,25 +18,25 @@ IFR_DII_Client::~IFR_DII_Client (void) { } -int +int IFR_DII_Client::init (int argc, - char *argv[], - CORBA::Environment &ACE_TRY_ENV) + char *argv[] + TAO_ENV_ARG_DECL) { - this->orb_ = CORBA::ORB_init (argc, - argv, - 0, - ACE_TRY_ENV); + this->orb_ = CORBA::ORB_init (argc, + argv, + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // In a reall application, we would get the scoped or // local name from the Interface Repository and use that - // to get the object reference of the target via the Naming + // to get the object reference of the target via the Naming // Service. Since we're not testing the Naming Service here, // we just use the IOR which is stored in a file by the server. - this->target_ = - this->orb_->string_to_object ("file://iorfile", - ACE_TRY_ENV); + this->target_ = + this->orb_->string_to_object ("file://iorfile" + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (this->parse_args (argc, argv) == -1) @@ -47,27 +47,27 @@ IFR_DII_Client::init (int argc, return 0; } -int -IFR_DII_Client::run (CORBA::Environment &ACE_TRY_ENV) +int +IFR_DII_Client::run (TAO_ENV_SINGLE_ARG_DECL) { if (this->lookup_by_name_) { - this->lookup_interface_def (ACE_TRY_ENV); + this->lookup_interface_def (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } else { - this->find_interface_def (ACE_TRY_ENV); + this->find_interface_def (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } - this->get_operation_def (ACE_TRY_ENV); + this->get_operation_def (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->create_dii_request (ACE_TRY_ENV); + this->create_dii_request (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->invoke_and_display (ACE_TRY_ENV); + this->invoke_and_display (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -99,22 +99,22 @@ IFR_DII_Client::parse_args (int argc, return 0; } -void -IFR_DII_Client::find_interface_def (CORBA::Environment &ACE_TRY_ENV) +void +IFR_DII_Client::find_interface_def (TAO_ENV_SINGLE_ARG_DECL) { - this->target_def_ = this->target_->_get_interface (ACE_TRY_ENV); + this->target_def_ = this->target_->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER); } -void -IFR_DII_Client::lookup_interface_def (CORBA::Environment &ACE_TRY_ENV) +void +IFR_DII_Client::lookup_interface_def (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_var obj = - this->orb_->resolve_initial_references ("InterfaceRepository", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("InterfaceRepository" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->repo_ = CORBA::Repository::_narrow (obj.in (), - ACE_TRY_ENV); + this->repo_ = CORBA::Repository::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Is there a contained object of some kind at any level in the @@ -123,8 +123,8 @@ IFR_DII_Client::lookup_interface_def (CORBA::Environment &ACE_TRY_ENV) this->repo_->lookup_name (this->namespace_name.in (), -1, // Unlimited level recursion. CORBA::dk_all, // Any type of contained object. - 1, // Exclude parents of interfaces. - ACE_TRY_ENV); + 1 // Exclude parents of interfaces. + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ULong length = candidates->length (); @@ -138,8 +138,8 @@ IFR_DII_Client::lookup_interface_def (CORBA::Environment &ACE_TRY_ENV) for (CORBA::ULong i = 0; i < length; ++i) { candidate = - CORBA::Container::_narrow (candidates[i], - ACE_TRY_ENV); + CORBA::Container::_narrow (candidates[i] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Is this contained item itself a container? @@ -147,8 +147,8 @@ IFR_DII_Client::lookup_interface_def (CORBA::Environment &ACE_TRY_ENV) { // Does this container contain any interfaces? interfaces = candidate->contents (CORBA::dk_Interface, - 1, // Exclude parents. - ACE_TRY_ENV); + 1 // Exclude parents. + TAO_ENV_ARG_PARAMETER); ACE_CHECK; n_interfaces = interfaces->length (); @@ -169,27 +169,27 @@ IFR_DII_Client::lookup_interface_def (CORBA::Environment &ACE_TRY_ENV) // be any length. for (CORBA::ULong j = 0; j < n_interfaces; ++j) { - name = interfaces[j]->name (ACE_TRY_ENV); + name = interfaces[j]->name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!ACE_OS::strcmp (name.in (), this->interface_name.in ())) { - this->target_def_ = - CORBA::InterfaceDef::_narrow (interfaces[j].in (), - ACE_TRY_ENV); + this->target_def_ = + CORBA::InterfaceDef::_narrow (interfaces[j].in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } } -void -IFR_DII_Client::get_operation_def (CORBA::Environment &ACE_TRY_ENV) +void +IFR_DII_Client::get_operation_def (TAO_ENV_SINGLE_ARG_DECL) { // What operation(s) does this interface contain? - CORBA::ContainedSeq_var operations = + CORBA::ContainedSeq_var operations = this->target_def_->contents (CORBA::dk_Operation, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ULong n_operations = operations->length (); @@ -198,38 +198,38 @@ IFR_DII_Client::get_operation_def (CORBA::Environment &ACE_TRY_ENV) // be any length. for (CORBA::ULong i = 0; i < n_operations; ++i) { - op_name = operations[i]->name (ACE_TRY_ENV); + op_name = operations[i]->name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!ACE_OS::strcmp (op_name.in (), this->op_name.in ())) { this->op_ = - CORBA::OperationDef::_narrow (operations[i], - ACE_TRY_ENV); + CORBA::OperationDef::_narrow (operations[i] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } } -void -IFR_DII_Client::create_dii_request (CORBA::Environment &ACE_TRY_ENV) +void +IFR_DII_Client::create_dii_request (TAO_ENV_SINGLE_ARG_DECL) { - this->req_ = this->target_->_request (this->op_name.in (), - ACE_TRY_ENV); + this->req_ = this->target_->_request (this->op_name.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->result_ = this->op_->result (ACE_TRY_ENV); + this->result_ = this->op_->result (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->req_->set_return_type (this->result_.in ()); - CORBA::ParDescriptionSeq_var params = this->op_->params (ACE_TRY_ENV); + CORBA::ParDescriptionSeq_var params = this->op_->params (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULong length = params->length (); - // This example of the discovery of parameter information is - // purposely contrived for the sake of brevity. A real + // This example of the discovery of parameter information is + // purposely contrived for the sake of brevity. A real // application would have more versatile code here, and much // more of it. for (CORBA::ULong i = 0; i < length; ++i) @@ -258,7 +258,7 @@ IFR_DII_Client::create_dii_request (CORBA::Environment &ACE_TRY_ENV) case CORBA::PARAM_OUT: { // It doesn't matter for basic types, like float, but for - // cases where it does, this is an alternative method of + // cases where it does, this is an alternative method of // adding an OUT argument without initializing it. if (params[i].type->kind () == CORBA::tk_float && ACE_OS::strcmp (params[i].name, "price") == 0) @@ -268,8 +268,8 @@ IFR_DII_Client::create_dii_request (CORBA::Environment &ACE_TRY_ENV) // The servant will return 0.0 if the title is not found. this->req_->arguments ()->add_value (params[i].name, any, - CORBA::ARG_OUT, - ACE_TRY_ENV); + CORBA::ARG_OUT + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -279,10 +279,10 @@ IFR_DII_Client::create_dii_request (CORBA::Environment &ACE_TRY_ENV) } } -void -IFR_DII_Client::invoke_and_display (CORBA::Environment &ACE_TRY_ENV) +void +IFR_DII_Client::invoke_and_display (TAO_ENV_SINGLE_ARG_DECL) { - this->req_->invoke (ACE_TRY_ENV); + this->req_->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var tc = this->req_->return_value ().type (); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h index 2ac8ace4029..0e829e77eb7 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h @@ -19,11 +19,11 @@ public: ~IFR_DII_Client (void); int init (int argc, - char *argv[], - CORBA::Environment &ACE_TRY_ENV); + char *argv[] + TAO_ENV_ARG_DECL); // Initialize the client. - int run (CORBA::Environment &ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL); // Run the client. private: @@ -31,20 +31,20 @@ private: char *argv[]); // Process the command line arguments. - void find_interface_def (CORBA::Environment &ACE_TRY_ENV); + void find_interface_def (TAO_ENV_SINGLE_ARG_DECL); // Query the object reference to get its InterfaceDef in the IFR. - void lookup_interface_def (CORBA::Environment &ACE_TRY_ENV); + void lookup_interface_def (TAO_ENV_SINGLE_ARG_DECL); // Look up the InterfaceDef by name in the IFR. - void get_operation_def (CORBA::Environment &ACE_TRY_ENV); + void get_operation_def (TAO_ENV_SINGLE_ARG_DECL); // Find the desired operation in the interface definition. - void create_dii_request (CORBA::Environment &ACE_TRY_ENV); + void create_dii_request (TAO_ENV_SINGLE_ARG_DECL); // Query the interface definition to get the info needed // to construct a CORBA::Request. - void invoke_and_display (CORBA::Environment &ACE_TRY_ENV); + void invoke_and_display (TAO_ENV_SINGLE_ARG_DECL); // Do the invocation and display the results. CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp index e01b51ef00a..fe9bac72a49 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp @@ -40,40 +40,40 @@ write_ior_to_file (const char *ior) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV - { + ACE_TRY_NEW_ENV + { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), - ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; inventory_i servant_impl; warehouse::inventory_var servant = - servant_impl._this (ACE_TRY_ENV); + servant_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (servant.in (), - ACE_TRY_ENV); + orb->object_to_string (servant.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int write_result = write_ior_to_file (ior.in ()); @@ -90,12 +90,12 @@ main (int argc, char *argv[]) "IOR is: <%s>\n", ior.in ())); - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; root_poa->destroy (1, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp index c3614e55389..3191162c35b 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp @@ -8,8 +8,8 @@ ACE_RCSID(Application_Test, test_i, "$Id$") CORBA::Boolean inventory_i::getCDinfo (const char * artist, char *& title, - CORBA::Float_out price, - CORBA::Environment &) + CORBA::Float_out price + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean in_stock = 0; @@ -24,7 +24,7 @@ inventory_i::getCDinfo (const char * artist, if (working_title.strstr (title_key) != -1) { - title = + title = CORBA::string_dup ("Sgt. Pepper's Lonely Hearts Club Band"); price = 13.49f; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h index 48a89ccde9f..acd62f8d1dc 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h @@ -12,9 +12,8 @@ class inventory_i : public POA_warehouse::inventory public: CORBA::Boolean getCDinfo (const char * artist, char *& title, - CORBA::Float_out price, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + CORBA::Float_out price + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp index 9dd2c7183e6..e66b8396231 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp @@ -55,8 +55,8 @@ Admin_Client::init (int argc, { this->orb_ = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int retval = this->parse_args (argc, @@ -66,8 +66,8 @@ Admin_Client::init (int argc, return retval; CORBA::Object_var object = - this->orb_->resolve_initial_references ("InterfaceRepository", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("InterfaceRepository" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) @@ -81,8 +81,8 @@ Admin_Client::init (int argc, } this->repo_ = - CORBA::Repository::_narrow (object.in (), - ACE_TRY_ENV); + CORBA::Repository::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->repo_.in ())) @@ -117,7 +117,7 @@ Admin_Client::run (void) // CORBA::BAD_PARAM exception the second time. for (CORBA::ULong j = 0; j < this->iterations_; ++j) { - (this->*test_array_[i])(ACE_TRY_ENV); + (this->*test_array_[i])(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -126,7 +126,7 @@ Admin_Client::run (void) { for (CORBA::ULong j = 0; j < this->iterations_; ++j) { - (this->*test_array_[this->which_test_])(ACE_TRY_ENV); + (this->*test_array_[this->which_test_])(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -193,23 +193,23 @@ Admin_Client::parse_args (int argc, } void -Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV) +Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, ACE_TEXT ("\n============== ARRAY TEST ==============\n\n") )); - CORBA::IDLType_var atype = this->repo_->create_string (7, - ACE_TRY_ENV); + CORBA::IDLType_var atype = this->repo_->create_string (7 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ArrayDef_var avar = this->repo_->create_array (5, - atype.in (), - ACE_TRY_ENV); + atype.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::ULong bound = avar->length (ACE_TRY_ENV); + CORBA::ULong bound = avar->length (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -219,10 +219,10 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (bound == 5); - CORBA::TypeCode_var tc = avar->type (ACE_TRY_ENV); + CORBA::TypeCode_var tc = avar->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::TCKind kind = tc->kind (ACE_TRY_ENV); + CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -232,9 +232,9 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (kind == CORBA::tk_array); - tc = avar->element_type (ACE_TRY_ENV); + tc = avar->element_type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - kind = tc->kind (ACE_TRY_ENV); + kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -244,9 +244,9 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (kind == CORBA::tk_string); - CORBA::IDLType_var tdef = avar->element_type_def (ACE_TRY_ENV); + CORBA::IDLType_var tdef = avar->element_type_def (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::DefinitionKind dk = tdef->def_kind (ACE_TRY_ENV); + CORBA::DefinitionKind dk = tdef->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -258,10 +258,10 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (dk == CORBA::dk_String); - CORBA::StringDef_var pvar = CORBA::StringDef::_narrow (tdef.in (), - ACE_TRY_ENV); + CORBA::StringDef_var pvar = CORBA::StringDef::_narrow (tdef.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - bound = pvar->bound (ACE_TRY_ENV); + bound = pvar->bound (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -271,21 +271,21 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (bound == 7); - CORBA::PrimitiveDef_var pdef = - this->repo_->get_primitive (CORBA::pk_short, - ACE_TRY_ENV); + CORBA::PrimitiveDef_var pdef = + this->repo_->get_primitive (CORBA::pk_short + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - avar->element_type_def (pdef.in (), - ACE_TRY_ENV); + avar->element_type_def (pdef.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ArrayDef::element_type_def (set)\n"))); - tc = avar->type (ACE_TRY_ENV); + tc = avar->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - kind = tc->kind (ACE_TRY_ENV); + kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -295,9 +295,9 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (kind == CORBA::tk_array); - tdef = avar->element_type_def (ACE_TRY_ENV); + tdef = avar->element_type_def (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - dk = tdef->def_kind (ACE_TRY_ENV); + dk = tdef->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -307,11 +307,11 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (dk == CORBA::dk_Primitive); - CORBA::PrimitiveDef_var zvar = - CORBA::PrimitiveDef::_narrow (tdef.in (), - ACE_TRY_ENV); + CORBA::PrimitiveDef_var zvar = + CORBA::PrimitiveDef::_narrow (tdef.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::PrimitiveKind pkind = zvar->kind (ACE_TRY_ENV); + CORBA::PrimitiveKind pkind = zvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -321,12 +321,12 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (pkind == CORBA::pk_short); - avar->destroy (ACE_TRY_ENV); + avar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) +Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -343,11 +343,11 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) CORBA::EnumDef_var evar = this->repo_->create_enum ("IDL:my_enum:1.0", "my_enum", "1.0", - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var str = evar->id (ACE_TRY_ENV); + CORBA::String_var str = evar->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -357,7 +357,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0")); - str = evar->name (ACE_TRY_ENV); + str = evar->name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -367,7 +367,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_enum")); - str = evar->absolute_name (ACE_TRY_ENV); + str = evar->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -377,7 +377,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_enum")); - str = evar->version (ACE_TRY_ENV); + str = evar->version (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -387,7 +387,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.0")); - CORBA::DefinitionKind dkind = evar->def_kind (ACE_TRY_ENV); + CORBA::DefinitionKind dkind = evar->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -397,7 +397,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (dkind == CORBA::dk_Enum); - CORBA::Contained::Description_var desc = evar->describe (ACE_TRY_ENV); + CORBA::Contained::Description_var desc = evar->describe (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; dkind = desc->kind; @@ -440,7 +440,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (td->version, "1.0")); - CORBA::TCKind kind = td->type->kind (ACE_TRY_ENV); + CORBA::TCKind kind = td->type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -450,7 +450,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (kind == CORBA::tk_enum); - str = td->type->id (ACE_TRY_ENV); + str = td->type->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -460,7 +460,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0")); - str = td->type->name (ACE_TRY_ENV); + str = td->type->name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -485,7 +485,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < count; i++) { - str = td->type->member_name (i, ACE_TRY_ENV); + str = td->type->member_name (i TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -505,15 +505,15 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) members[2] = CORBA::string_dup ("DUALITY"); members[3] = CORBA::string_dup ("TRINITY"); - evar->members (members, - ACE_TRY_ENV); + evar->members (members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nEnumDef::members (set)\n\n"))); - CORBA::EnumMemberSeq_var fellows = evar->members (ACE_TRY_ENV); + CORBA::EnumMemberSeq_var fellows = evar->members (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; count = fellows->length (); @@ -533,10 +533,10 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (fellows[i], members[i])); } - evar->name ("another_enum", - ACE_TRY_ENV); + evar->name ("another_enum" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - str = evar->name (ACE_TRY_ENV); + str = evar->name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -550,7 +550,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "another_enum")); - str = evar->absolute_name (ACE_TRY_ENV); + str = evar->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -560,12 +560,12 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::another_enum")); - evar->destroy (ACE_TRY_ENV); + evar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) +Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -574,25 +574,25 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) // This test also tests WstringDef and SequenceDef. - CORBA::IDLType_var sq_elem = this->repo_->create_wstring (7, - ACE_TRY_ENV); + CORBA::IDLType_var sq_elem = this->repo_->create_wstring (7 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::SequenceDef_var sq_var = + CORBA::SequenceDef_var sq_var = this->repo_->create_sequence (5, - sq_elem.in (), - ACE_TRY_ENV); + sq_elem.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::AliasDef_var a_var = + CORBA::AliasDef_var a_var = this->repo_->create_alias ("IDL:my_alias:1.0", "my_alias", "1.0", - sq_var.in (), - ACE_TRY_ENV); + sq_var.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var str = a_var->id (ACE_TRY_ENV); + CORBA::String_var str = a_var->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -602,7 +602,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0")); - str = a_var->name (ACE_TRY_ENV); + str = a_var->name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -612,7 +612,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias")); - str = a_var->absolute_name (ACE_TRY_ENV); + str = a_var->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -622,7 +622,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_alias")); - str = a_var->version (ACE_TRY_ENV); + str = a_var->version (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -636,11 +636,11 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("AliasDef::version (set)\n"))); - a_var->version ("1.1", - ACE_TRY_ENV); + a_var->version ("1.1" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - str = a_var->version (ACE_TRY_ENV); + str = a_var->version (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -650,10 +650,10 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.1")); - CORBA::TypeCode_var tc = a_var->type (ACE_TRY_ENV); + CORBA::TypeCode_var tc = a_var->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - str = tc->name (ACE_TRY_ENV); + str = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -663,7 +663,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias")); - CORBA::TCKind kind = tc->kind (ACE_TRY_ENV); + CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -673,10 +673,10 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (kind == CORBA::tk_alias); - CORBA::TypeCode_var ct = tc->content_type (ACE_TRY_ENV); + CORBA::TypeCode_var ct = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - kind = ct->kind (ACE_TRY_ENV); + kind = ct->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -686,7 +686,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (kind == CORBA::tk_sequence); - CORBA::ULong length = ct->length (ACE_TRY_ENV); + CORBA::ULong length = ct->length (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -696,10 +696,10 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (length == 5); - CORBA::TypeCode_var ct2 = ct->content_type (ACE_TRY_ENV); + CORBA::TypeCode_var ct2 = ct->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - kind = ct2->kind (ACE_TRY_ENV); + kind = ct2->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -710,7 +710,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (kind == CORBA::tk_wstring); - length = ct2->length (ACE_TRY_ENV); + length = ct2->length (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -721,7 +721,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (length == 7); - CORBA::Contained::Description_var desc = a_var->describe (ACE_TRY_ENV); + CORBA::Contained::Description_var desc = a_var->describe (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeDescription *td; @@ -741,7 +741,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (td->version, "1.1")); - kind = td->type->kind (ACE_TRY_ENV); + kind = td->type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -751,7 +751,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (kind == CORBA::tk_alias); - str = td->type->id (ACE_TRY_ENV); + str = td->type->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -761,7 +761,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0")); - str = td->type->name (ACE_TRY_ENV); + str = td->type->name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -771,15 +771,15 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias")); - CORBA::IDLType_var i_var = a_var->original_type_def (ACE_TRY_ENV); + CORBA::IDLType_var i_var = a_var->original_type_def (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::SequenceDef_var seq_var = - CORBA::SequenceDef::_narrow (i_var.in (), - ACE_TRY_ENV); + CORBA::SequenceDef_var seq_var = + CORBA::SequenceDef::_narrow (i_var.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - length = seq_var->bound (ACE_TRY_ENV); + length = seq_var->bound (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -789,26 +789,26 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (length == 5); - a_var->destroy (ACE_TRY_ENV); + a_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::native_test (CORBA::Environment &ACE_TRY_ENV) +Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, ACE_TEXT ("\n============== NATIVE TEST ==============\n\n") )); - CORBA::NativeDef_var nvar = + CORBA::NativeDef_var nvar = this->repo_->create_native ("IDL:my_native:1.0", "my_native", - "1.0", - ACE_TRY_ENV); + "1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var str = nvar->id (ACE_TRY_ENV); + CORBA::String_var str = nvar->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -818,7 +818,7 @@ Admin_Client::native_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_native:1.0")); - str = nvar->name (ACE_TRY_ENV); + str = nvar->name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -828,7 +828,7 @@ Admin_Client::native_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_native")); - str = nvar->version (ACE_TRY_ENV); + str = nvar->version (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -838,7 +838,7 @@ Admin_Client::native_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.0")); - str = nvar->absolute_name (ACE_TRY_ENV); + str = nvar->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -848,7 +848,7 @@ Admin_Client::native_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_native")); - CORBA::DefinitionKind kind = nvar->def_kind (ACE_TRY_ENV); + CORBA::DefinitionKind kind = nvar->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -858,12 +858,12 @@ Admin_Client::native_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (kind == CORBA::dk_Native); - nvar->destroy (ACE_TRY_ENV); + nvar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) +Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -874,14 +874,14 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) members.length (3); members[0].name = CORBA::string_dup ("ub_string"); - members[0].type_def = this->repo_->get_primitive (CORBA::pk_string, - ACE_TRY_ENV); + members[0].type_def = this->repo_->get_primitive (CORBA::pk_string + TAO_ENV_ARG_PARAMETER); ACE_CHECK; members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); members[1].name = CORBA::string_dup ("bd_string"); - members[1].type_def = this->repo_->create_string (5, - ACE_TRY_ENV); + members[1].type_def = this->repo_->create_string (5 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); @@ -893,29 +893,29 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) members[2].name = CORBA::string_dup ("my_struct_enum"); - CORBA::EnumDef_var e_var = + CORBA::EnumDef_var e_var = this->repo_->create_enum ("IDL:my_enum:1.0", "my_enum", "1.0", - e_members, - ACE_TRY_ENV); + e_members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ()); members[2].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); - CORBA::StructDef_var svar = + CORBA::StructDef_var svar = this->repo_->create_struct ("IDL:my_struct:1.0", "my_struct", "1.0", - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // This also tests the members() function. - CORBA::TypeCode_var tc = svar->type (ACE_TRY_ENV); + CORBA::TypeCode_var tc = svar->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::ULong length = tc->member_count (ACE_TRY_ENV); + CORBA::ULong length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -930,7 +930,7 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = tc->member_name (i, ACE_TRY_ENV); + str = tc->member_name (i TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -942,7 +942,7 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), members[i].name)); } - CORBA::Contained::Description_var desc = svar->describe (ACE_TRY_ENV); + CORBA::Contained::Description_var desc = svar->describe (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeDescription *td; @@ -971,21 +971,21 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) members.length (2); members[0].name = CORBA::string_dup ("long_mem"); - members[0].type_def = this->repo_->get_primitive (CORBA::pk_long, - ACE_TRY_ENV); + members[0].type_def = this->repo_->get_primitive (CORBA::pk_long + TAO_ENV_ARG_PARAMETER); ACE_CHECK; members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); members[1].name = CORBA::string_dup ("array_mem"); - members[1].type_def = + members[1].type_def = this->repo_->create_array (5, - members[0].type_def.in (), - ACE_TRY_ENV); + members[0].type_def.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); - svar->members (members, - ACE_TRY_ENV); + svar->members (members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1001,11 +1001,11 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) CORBA::EnumDef_var e_def_var = svar->create_enum ("IDL:my_def_enum:1.0", "my_enum", "1.0", - def_members, - ACE_TRY_ENV); + def_members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::StructMemberSeq_var out_members = svar->members (ACE_TRY_ENV); + CORBA::StructMemberSeq_var out_members = svar->members (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_members->length (); @@ -1024,11 +1024,11 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (out_members[i].name, members[i].name)); } - CORBA::Contained_var fox = this->repo_->lookup ("::my_struct::my_enum", - ACE_TRY_ENV); + CORBA::Contained_var fox = this->repo_->lookup ("::my_struct::my_enum" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - str = fox->absolute_name (ACE_TRY_ENV); + str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1038,11 +1038,11 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_struct::my_enum")); - fox = svar->lookup ("my_enum", - ACE_TRY_ENV); + fox = svar->lookup ("my_enum" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - str = fox->absolute_name (ACE_TRY_ENV); + str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1052,13 +1052,13 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_struct::my_enum")); - CORBA::Container_var outer = fox->defined_in (ACE_TRY_ENV); + CORBA::Container_var outer = fox->defined_in (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::Contained_var schizo = CORBA::Contained::_narrow (outer.in (), - ACE_TRY_ENV); + CORBA::Contained_var schizo = CORBA::Contained::_narrow (outer.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - str = schizo->absolute_name (ACE_TRY_ENV); + str = schizo->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1070,8 +1070,8 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_struct")); CORBA::ContainedSeq_var contents = this->repo_->contents (CORBA::dk_all, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1084,8 +1084,8 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (length == 2); contents = svar->contents (CORBA::dk_all, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1099,7 +1099,7 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; ++i) { - str = contents[i]->absolute_name (ACE_TRY_ENV); + str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1123,8 +1123,8 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) contents = this->repo_->lookup_name ("my_enum", -1, CORBA::dk_all, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1138,7 +1138,7 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = contents[i]->absolute_name (ACE_TRY_ENV); + str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1156,8 +1156,8 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) CORBA::Container::DescriptionSeq_var cont_desc = this->repo_->describe_contents (CORBA::dk_all, 0, - -1, - ACE_TRY_ENV); + -1 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = cont_desc->length (); @@ -1174,7 +1174,7 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) CORBA::TypeDescription *td; cont_desc[i].value >>= td; - str = td->type->id (ACE_TRY_ENV); + str = td->type->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1211,8 +1211,8 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) } } - svar->name ("your_struct", - ACE_TRY_ENV); + svar->name ("your_struct" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1220,8 +1220,8 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) ACE_TEXT ("\nStructDef::name (set)\n"))); contents = svar->contents (CORBA::dk_all, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1237,7 +1237,7 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = contents[i]->absolute_name (ACE_TRY_ENV); + str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1260,14 +1260,14 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV) ACE_UNUSED_ARG (tmp); #endif /* ACE_NDEBUG */ - e_var->destroy (ACE_TRY_ENV); + e_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - svar->destroy (ACE_TRY_ENV); + svar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV) +Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -1282,19 +1282,19 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV) d_members[2] = CORBA::string_dup ("TWO"); d_members[3] = CORBA::string_dup ("THREE"); - CORBA::EnumDef_var d_var = + CORBA::EnumDef_var d_var = this->repo_->create_enum ("IDL:disc_enum:1.0", "disc_enum", "1.0", - d_members, - ACE_TRY_ENV); + d_members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::StructMemberSeq s_members (1); s_members.length (1); s_members[0].name = CORBA::string_dup ("string_in_struct"); - s_members[0].type_def = this->repo_->create_string (6, - ACE_TRY_ENV); + s_members[0].type_def = this->repo_->create_string (6 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; s_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); @@ -1302,19 +1302,19 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV) this->repo_->create_struct ("IDL:struct_in_union:1.0", "struct_in_union", "1.0", - s_members, - ACE_TRY_ENV); + s_members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::UnionMemberSeq u_members (4); u_members.length (4); u_members[0].name = CORBA::string_dup ("longval"); - u_members[0].type_def = this->repo_->get_primitive (CORBA::pk_long, - ACE_TRY_ENV); + u_members[0].type_def = this->repo_->get_primitive (CORBA::pk_long + TAO_ENV_ARG_PARAMETER); ACE_CHECK; u_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); - CORBA::TypeCode_var d_type = d_var->type (ACE_TRY_ENV); + CORBA::TypeCode_var d_type = d_var->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_OutputCDR maker2; maker2.write_ulong (3); // THREE @@ -1325,8 +1325,8 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV) u_members[0].label = any2; u_members[1].name = CORBA::string_dup ("longval"); - u_members[1].type_def = this->repo_->get_primitive (CORBA::pk_long, - ACE_TRY_ENV); + u_members[1].type_def = this->repo_->get_primitive (CORBA::pk_long + TAO_ENV_ARG_PARAMETER); ACE_CHECK; u_members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); TAO_OutputCDR maker0; @@ -1350,25 +1350,25 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV) u_members[2].label = any1; u_members[3].name = CORBA::string_dup ("stringval"); - u_members[3].type_def = this->repo_->create_string (17, - ACE_TRY_ENV); + u_members[3].type_def = this->repo_->create_string (17 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; u_members[3].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); u_members[3].label <<= CORBA::Any::from_octet (0); // default case (ONE) - CORBA::UnionDef_var u_var = + CORBA::UnionDef_var u_var = this->repo_->create_union ("IDL:my_union:1.0", "my_union", "1.0", d_var.in (), - u_members, - ACE_TRY_ENV); + u_members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::TypeCode_var disc_tc = u_var->discriminator_type (ACE_TRY_ENV); + CORBA::TypeCode_var disc_tc = u_var->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::ULong length = disc_tc->member_count (ACE_TRY_ENV); + CORBA::ULong length = disc_tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1380,10 +1380,10 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (length == 4); - CORBA::TypeCode_var tc = u_var->type (ACE_TRY_ENV); + CORBA::TypeCode_var tc = u_var->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - length = tc->member_count (ACE_TRY_ENV); + length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1393,7 +1393,7 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (length == 3); - CORBA::Long slot = tc->default_index (ACE_TRY_ENV); + CORBA::Long slot = tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1408,8 +1408,8 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV) for (CORBA::ULong i = 0; i < length; i++) { - str = tc->member_name (i, - ACE_TRY_ENV); + str = tc->member_name (i + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1421,8 +1421,8 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV) // Multiple labels for first member shifts index by 1. ACE_ASSERT (!ACE_OS::strcmp (str.in (), u_members[i + 1].name)); - CORBA::Any_var label = tc->member_label (i, - ACE_TRY_ENV); + CORBA::Any_var label = tc->member_label (i + TAO_ENV_ARG_PARAMETER); ACE_CHECK; TAO_InputCDR cdr (label->_tao_get_cdr ()); @@ -1456,16 +1456,16 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV) } } - u_var->destroy (ACE_TRY_ENV); + u_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - s_var->destroy (ACE_TRY_ENV); + s_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - d_var->destroy (ACE_TRY_ENV); + d_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) +Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -1476,17 +1476,17 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) members.length (3); members[0].name = CORBA::string_dup ("ub_string"); - members[0].type_def = this->repo_->get_primitive (CORBA::pk_string, - ACE_TRY_ENV); + members[0].type_def = this->repo_->get_primitive (CORBA::pk_string + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - members[0].type = members[0].type_def->type (ACE_TRY_ENV); + members[0].type = members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; members[1].name = CORBA::string_dup ("bd_string"); - members[1].type_def = this->repo_->create_string (5, - ACE_TRY_ENV); + members[1].type_def = this->repo_->create_string (5 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - members[1].type = members[1].type_def->type (ACE_TRY_ENV); + members[1].type = members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::EnumMemberSeq e_members (2); @@ -1499,27 +1499,27 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) CORBA::EnumDef_var e_var = this->repo_->create_enum ("IDL:my_enum:1.0", "my_enum", "1.0", - e_members, - ACE_TRY_ENV); + e_members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ()); - members[2].type = members[2].type_def->type (ACE_TRY_ENV); + members[2].type = members[2].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ExceptionDef_var exvar = this->repo_->create_exception ("IDL:my_exception:1.0", "my_exception", "1.0", - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::TypeCode_var tc = exvar->type (ACE_TRY_ENV); + CORBA::TypeCode_var tc = exvar->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::ULong length = tc->member_count (ACE_TRY_ENV); + CORBA::ULong length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1534,7 +1534,7 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = tc->member_name (i, ACE_TRY_ENV); + str = tc->member_name (i TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1546,7 +1546,7 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), members[i].name)); } - CORBA::Contained::Description_var desc = exvar->describe (ACE_TRY_ENV); + CORBA::Contained::Description_var desc = exvar->describe (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ExceptionDescription *ed; @@ -1582,24 +1582,24 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) members.length (2); members[0].name = CORBA::string_dup ("long_mem"); - members[0].type_def = this->repo_->get_primitive (CORBA::pk_long, - ACE_TRY_ENV); + members[0].type_def = this->repo_->get_primitive (CORBA::pk_long + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - members[0].type = members[0].type_def->type (ACE_TRY_ENV); + members[0].type = members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; members[1].name = CORBA::string_dup ("array_mem"); - CORBA::ArrayDef_ptr a_ptr = + CORBA::ArrayDef_ptr a_ptr = this->repo_->create_array (5, - members[0].type_def.in (), - ACE_TRY_ENV); + members[0].type_def.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; members[1].type_def = a_ptr; - members[1].type = members[1].type_def->type (ACE_TRY_ENV); + members[1].type = members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - exvar->members (members, - ACE_TRY_ENV); + exvar->members (members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1615,11 +1615,11 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) CORBA::EnumDef_var e_def_var = exvar->create_enum ("IDL:my_def_enum:1.0", "my_enum", "1.0", - def_members, - ACE_TRY_ENV); + def_members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::StructMemberSeq_var out_members = exvar->members (ACE_TRY_ENV); + CORBA::StructMemberSeq_var out_members = exvar->members (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_members->length (); @@ -1637,14 +1637,14 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (out_members[i].name, members[i].name)); } - a_ptr->destroy (ACE_TRY_ENV); + a_ptr->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nArrayDef::destroy\n\n"))); - out_members = exvar->members (ACE_TRY_ENV); + out_members = exvar->members (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_members->length (); @@ -1662,11 +1662,11 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (out_members[i].name, members[i].name)); } - CORBA::Contained_var fox = this->repo_->lookup ("::my_exception::my_enum", - ACE_TRY_ENV); + CORBA::Contained_var fox = this->repo_->lookup ("::my_exception::my_enum" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - str = fox->absolute_name (ACE_TRY_ENV); + str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1676,11 +1676,11 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_exception::my_enum")); - fox = exvar->lookup ("my_enum", - ACE_TRY_ENV); + fox = exvar->lookup ("my_enum" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - str = fox->absolute_name (ACE_TRY_ENV); + str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1691,8 +1691,8 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_exception::my_enum")); CORBA::ContainedSeq_var contents = this->repo_->contents (CORBA::dk_all, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1705,8 +1705,8 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (length == 2); contents = exvar->contents (CORBA::dk_all, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1720,7 +1720,7 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = contents[i]->absolute_name (ACE_TRY_ENV); + str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1738,8 +1738,8 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) contents = this->repo_->lookup_name ("my_enum", -1, CORBA::dk_all, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1753,7 +1753,7 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = contents[i]->absolute_name (ACE_TRY_ENV); + str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1770,8 +1770,8 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) CORBA::Container::DescriptionSeq_var cont_desc = this->repo_->describe_contents (CORBA::dk_all, 0, - -1, - ACE_TRY_ENV); + -1 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = cont_desc->length (); @@ -1792,7 +1792,7 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) cont_desc[i].value >>= ed; CORBA::TypeCode_ptr tc = ed->type.in (); - length = tc->member_count (ACE_TRY_ENV); + length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1818,7 +1818,7 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) cont_desc[i].value >>= td; CORBA::TypeCode_ptr tc = td->type.in (); - length = tc->member_count (ACE_TRY_ENV); + length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1841,8 +1841,8 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) } } - exvar->name ("your_exception", - ACE_TRY_ENV); + exvar->name ("your_exception" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1850,8 +1850,8 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) ACE_TEXT ("\nExceptionDef::name (set)\n\n"))); contents = exvar->contents (CORBA::dk_all, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1859,7 +1859,7 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = contents[i]->absolute_name (ACE_TRY_ENV); + str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1878,22 +1878,22 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV) ACE_UNUSED_ARG (tmp); #endif /* ACE_NDEBUG */ - e_var->destroy (ACE_TRY_ENV); + e_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - exvar->destroy (ACE_TRY_ENV); + exvar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV) +Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, ACE_TEXT ("\n============== CONSTANT TEST ==============\n\n") )); - CORBA::IDLType_var ivar = this->repo_->get_primitive (CORBA::pk_string, - ACE_TRY_ENV); + CORBA::IDLType_var ivar = this->repo_->get_primitive (CORBA::pk_string + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Any any; @@ -1905,13 +1905,13 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV) "my_constant", "1.0", ivar.in (), - any, - ACE_TRY_ENV); + any + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::TypeCode_var tc = cvar->type (ACE_TRY_ENV); + CORBA::TypeCode_var tc = cvar->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::TCKind kind = tc->kind (ACE_TRY_ENV); + CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1921,9 +1921,9 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (kind == CORBA::tk_string); - CORBA::IDLType_var tdef = cvar->type_def (ACE_TRY_ENV); + CORBA::IDLType_var tdef = cvar->type_def (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::DefinitionKind def_kind = tdef->def_kind (ACE_TRY_ENV); + CORBA::DefinitionKind def_kind = tdef->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1934,7 +1934,7 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (def_kind == CORBA::dk_Primitive); CORBA::Any_var out_any; - out_any = cvar->value (ACE_TRY_ENV); + out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const char *out_s; @@ -1947,17 +1947,17 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (out_s, s)); - ivar = this->repo_->get_primitive (CORBA::pk_double, - ACE_TRY_ENV); + ivar = this->repo_->get_primitive (CORBA::pk_double + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - cvar->type_def (ivar.in (), - ACE_TRY_ENV); + cvar->type_def (ivar.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Double double_val = -1223.42256; any <<= double_val; - cvar->value (any, - ACE_TRY_ENV); + cvar->value (any + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1965,7 +1965,7 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV) ACE_TEXT ("\nConstantDef::type_def (set)\n") ACE_TEXT ("ConstantDef::value (set)\n"))); - out_any = cvar->value (ACE_TRY_ENV); + out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Double out_double_val; @@ -1978,10 +1978,10 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (out_double_val == double_val); - ivar = this->repo_->get_primitive (CORBA::pk_short, - ACE_TRY_ENV); - cvar->type_def (ivar.in (), - ACE_TRY_ENV); + ivar = this->repo_->get_primitive (CORBA::pk_short + TAO_ENV_ARG_PARAMETER); + cvar->type_def (ivar.in () + TAO_ENV_ARG_PARAMETER); if (this->debug_) ACE_DEBUG ((LM_DEBUG, @@ -1991,10 +1991,10 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV) CORBA::Short short_val = -65; any <<= short_val; - cvar->value (any, - ACE_TRY_ENV); + cvar->value (any + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - out_any = cvar->value (ACE_TRY_ENV); + out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Short out_short_val; @@ -2007,11 +2007,11 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (out_short_val == short_val); - ivar = this->repo_->get_primitive (CORBA::pk_float, - ACE_TRY_ENV); + ivar = this->repo_->get_primitive (CORBA::pk_float + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - cvar->type_def (ivar.in (), - ACE_TRY_ENV); + cvar->type_def (ivar.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2022,10 +2022,10 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV) CORBA::Float float_val = 2.33f; any <<= float_val; - cvar->value (any, - ACE_TRY_ENV); + cvar->value (any + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - out_any = cvar->value (ACE_TRY_ENV); + out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Float out_float_val; @@ -2038,11 +2038,11 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (out_float_val == float_val); - ivar = this->repo_->get_primitive (CORBA::pk_ulonglong, - ACE_TRY_ENV); + ivar = this->repo_->get_primitive (CORBA::pk_ulonglong + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - cvar->type_def (ivar.in (), - ACE_TRY_ENV); + cvar->type_def (ivar.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2053,10 +2053,10 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV) CORBA::ULongLong ull_val = 1234567890; any <<= ull_val; - cvar->value (any, - ACE_TRY_ENV); + cvar->value (any + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - out_any = cvar->value (ACE_TRY_ENV); + out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULongLong out_ull_val; @@ -2077,12 +2077,12 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV) } ACE_ASSERT (out_ull_val == ull_val); - cvar->destroy (ACE_TRY_ENV); + cvar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) +Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -2098,13 +2098,13 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) this->repo_->create_interface ("IDL:gp_iface:1.0", "gp_iface", "1.0", - in_bases, - ACE_TRY_ENV); + in_bases + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::PrimitiveDef_var p_long = - this->repo_->get_primitive (CORBA::pk_long, - ACE_TRY_ENV); + CORBA::PrimitiveDef_var p_long = + this->repo_->get_primitive (CORBA::pk_long + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::AttributeDef_var gp_attr = @@ -2112,8 +2112,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) "gp_attr", "1.0", p_long.in (), - CORBA::ATTR_NORMAL, - ACE_TRY_ENV); + CORBA::ATTR_NORMAL + TAO_ENV_ARG_PARAMETER); ACE_CHECK; in_bases.length (1); @@ -2123,12 +2123,12 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) this->repo_->create_interface ("IDL:p_iface:1.0", "p_iface", "1.0", - in_bases, - ACE_TRY_ENV); + in_bases + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::StringDef_var p_string = this->repo_->create_string (5, - ACE_TRY_ENV); + CORBA::StringDef_var p_string = this->repo_->create_string (5 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::AttributeDef_var p_attr = @@ -2136,8 +2136,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) "p_attr", "1.0", p_string.in (), - CORBA::ATTR_READONLY, - ACE_TRY_ENV); + CORBA::ATTR_READONLY + TAO_ENV_ARG_PARAMETER); ACE_CHECK; const char *names[] = {"inarg", "inoutarg", "outarg"}; @@ -2158,8 +2158,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) this->repo_->create_exception ("IDL:if_exception:1.0", "if_exception", "1.0", - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ExceptionDefSeq get_seq (1); @@ -2173,7 +2173,7 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) { par_seq[i].name = names[i]; par_seq[i].type_def = CORBA::PrimitiveDef::_duplicate (p_long.in ()); - par_seq[i].type = p_long->type (ACE_TRY_ENV); + par_seq[i].type = p_long->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; par_seq[i].mode = modes[i]; con_seq[i] = contexts[i]; @@ -2187,11 +2187,11 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) CORBA::OP_NORMAL, par_seq, get_seq, - con_seq, - ACE_TRY_ENV); + con_seq + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Contained::Description_var desc = p_op->describe (ACE_TRY_ENV); + CORBA::Contained::Description_var desc = p_op->describe (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::OperationDescription *od; @@ -2206,7 +2206,7 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (od->defined_in, "IDL:p_iface:1.0")); CORBA::TypeCode_var result = od->result; - CORBA::TCKind kind = result->kind (ACE_TRY_ENV); + CORBA::TCKind kind = result->kind (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2252,8 +2252,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (od->parameters[i].mode == modes[i]); } - CORBA::Boolean is_it = p_ivar->is_a ("IDL:p_iface:1.0", - ACE_TRY_ENV); + CORBA::Boolean is_it = p_ivar->is_a ("IDL:p_iface:1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2263,8 +2263,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (is_it == 1); - is_it = p_ivar->is_a ("IDL:gp_iface:1.0", - ACE_TRY_ENV); + is_it = p_ivar->is_a ("IDL:gp_iface:1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2274,8 +2274,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (is_it == 1); - is_it = gp_ivar->is_a ("IDL:p_iface:1.0", - ACE_TRY_ENV); + is_it = gp_ivar->is_a ("IDL:p_iface:1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2286,10 +2286,10 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (is_it == 0); CORBA::InterfaceDef::FullInterfaceDescription_var fifd = - p_ivar->describe_interface (ACE_TRY_ENV); + p_ivar->describe_interface (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var str = fifd->type->id (ACE_TRY_ENV); + CORBA::String_var str = fifd->type->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2374,11 +2374,11 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) this->repo_->create_interface ("IDL:iface:1.0", "iface", "1.0", - in_bases, - ACE_TRY_ENV); + in_bases + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - desc = ivar->describe (ACE_TRY_ENV); + desc = ivar->describe (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::InterfaceDescription *ifd; @@ -2399,7 +2399,7 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { base_iface_id = ifd->base_interfaces[i].in (); - + if (this->debug_) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("InterfaceDef::describe::") @@ -2408,8 +2408,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) base_iface_id)); } - CORBA::InterfaceDefSeq_var out_bases = - ivar->base_interfaces (ACE_TRY_ENV); + CORBA::InterfaceDefSeq_var out_bases = + ivar->base_interfaces (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_bases->length (); @@ -2423,7 +2423,7 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = out_bases[i]->name (ACE_TRY_ENV); + str = out_bases[i]->name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2436,8 +2436,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) } CORBA::ContainedSeq_var contents = ivar->contents (CORBA::dk_all, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -2451,7 +2451,7 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = contents[i]->name (ACE_TRY_ENV); + str = contents[i]->name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2460,14 +2460,14 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) i, str.in ())); - CORBA::Container_var cr = contents[i]->defined_in (ACE_TRY_ENV); + CORBA::Container_var cr = contents[i]->defined_in (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::Contained_var cd = CORBA::Contained::_narrow (cr.in (), - ACE_TRY_ENV); + CORBA::Contained_var cd = CORBA::Contained::_narrow (cr.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - str = cd->name (ACE_TRY_ENV); + str = cd->name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2481,18 +2481,18 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV) || !ACE_OS::strcmp (str.in (), "gp_iface")); } - ex_var->destroy (ACE_TRY_ENV); + ex_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - ivar->destroy (ACE_TRY_ENV); + ivar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - gp_ivar->destroy (ACE_TRY_ENV); + gp_ivar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - p_ivar->destroy (ACE_TRY_ENV); + p_ivar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) +Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -2508,8 +2508,8 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) CORBA::EnumDef_var e_var = this->repo_->create_enum ("IDL:o_enum:1.0", "o_enum", "1.0", - e_members, - ACE_TRY_ENV); + e_members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; e_members[0] = CORBA::string_dup ("TEN"); @@ -2518,8 +2518,8 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) CORBA::EnumDef_var e_var2 = this->repo_->create_enum ("IDL:i_enum:1.0", "i_enum", "1.0", - e_members, - ACE_TRY_ENV); + e_members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::StructMemberSeq s_members (2); @@ -2528,23 +2528,23 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) const char *s_names[] = {"s_string", "s_enum"}; s_members[0].name = s_names[0]; - s_members[0].type_def = this->repo_->get_primitive (CORBA::pk_string, - ACE_TRY_ENV); + s_members[0].type_def = this->repo_->get_primitive (CORBA::pk_string + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - s_members[0].type = s_members[0].type_def->type (ACE_TRY_ENV); + s_members[0].type = s_members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; s_members[1].name = s_names[1]; s_members[1].type_def = CORBA::EnumDef::_duplicate (e_var2.in ()); - s_members[1].type = s_members[1].type_def->type (ACE_TRY_ENV); + s_members[1].type = s_members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::StructDef_var s_var = + CORBA::StructDef_var s_var = this->repo_->create_struct ("IDL:o_struct:1.0", "o_struct", "1.0", - s_members, - ACE_TRY_ENV); + s_members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::UnionMemberSeq u_members (2); @@ -2554,7 +2554,7 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) u_members[0].name = u_names[0]; u_members[0].type_def = CORBA::EnumDef::_duplicate (e_var.in ()); - u_members[0].type = e_var->type (ACE_TRY_ENV); + u_members[0].type = e_var->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Long label = 0; CORBA::Any any; @@ -2563,27 +2563,27 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) u_members[1].name = u_names[1]; u_members[1].type_def = CORBA::StructDef::_duplicate (s_var.in ()); - u_members[1].type = s_var->type (ACE_TRY_ENV); + u_members[1].type = s_var->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; label = 1; any <<= label; u_members[1].label = any; - CORBA::PrimitiveDef_var d_var = - this->repo_->get_primitive (CORBA::pk_long, - ACE_TRY_ENV); + CORBA::PrimitiveDef_var d_var = + this->repo_->get_primitive (CORBA::pk_long + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::UnionDef_var u_var = + CORBA::UnionDef_var u_var = this->repo_->create_union ("IDL:the_union:1.0", "the_union", "1.0", d_var.in (), - u_members, - ACE_TRY_ENV); + u_members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::UnionMemberSeq_var out_u_members = u_var->members (ACE_TRY_ENV); + CORBA::UnionMemberSeq_var out_u_members = u_var->members (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULong length = out_u_members->length (); @@ -2612,8 +2612,8 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) } CORBA::ContainedSeq_var out_contents = u_var->contents (CORBA::dk_all, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = out_contents->length (); @@ -2627,15 +2627,15 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) e_var->move (u_var.in (), u_names[0], - "1.0", - ACE_TRY_ENV); + "1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nEnumDef::move (into union)\n"))); - out_u_members = u_var->members (ACE_TRY_ENV); + out_u_members = u_var->members (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_u_members->length (); @@ -2684,8 +2684,8 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) } out_contents = u_var->contents (CORBA::dk_all, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = out_contents->length (); @@ -2701,7 +2701,7 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = out_contents[i]->absolute_name (ACE_TRY_ENV); + str = out_contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2726,14 +2726,14 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) e_var2->move (s_var.in (), s_names[1], - "1.0", - ACE_TRY_ENV); + "1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; s_var->move (u_var.in (), u_names[1], - "1.0", - ACE_TRY_ENV); + "1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2742,8 +2742,8 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) ACE_TEXT ("StructDef::move (into union)\n"))); out_contents = this->repo_->contents (CORBA::dk_all, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = out_contents->length (); @@ -2755,7 +2755,7 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (length == 1); - out_u_members = u_var->members (ACE_TRY_ENV); + out_u_members = u_var->members (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_u_members->length (); @@ -2781,8 +2781,8 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) } out_contents = u_var->contents (CORBA::dk_all, - 1, - ACE_TRY_ENV); + 1 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = out_contents->length (); @@ -2799,7 +2799,7 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = out_contents[i]->absolute_name (ACE_TRY_ENV); + str = out_contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2813,15 +2813,15 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) if (i == 1) { - s_tmp = CORBA::StructDef::_narrow (out_contents[i], - ACE_TRY_ENV); + s_tmp = CORBA::StructDef::_narrow (out_contents[i] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } out_contents = s_tmp->contents (CORBA::dk_all, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = out_contents->length (); @@ -2837,7 +2837,7 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = out_contents[i]->absolute_name (ACE_TRY_ENV); + str = out_contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2856,7 +2856,7 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) ACE_UNUSED_ARG (base); #endif /* ACE_NDEBUG */ - CORBA::StructMemberSeq_var out_s_members = s_tmp->members (ACE_TRY_ENV); + CORBA::StructMemberSeq_var out_s_members = s_tmp->members (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_s_members->length (); @@ -2881,12 +2881,12 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (tmp, s_names[i])); } - u_var->destroy (ACE_TRY_ENV); + u_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV) +Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -2895,60 +2895,60 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV) CORBA::ModuleDef_var outer = this->repo_->create_module ("IDL:outer:1.0", "outer", - "1.0", - ACE_TRY_ENV); + "1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ModuleDef_var middle = outer->create_module ("IDL:middle:1.0", "middle", - "1.0", - ACE_TRY_ENV); + "1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ModuleDef_var inner = middle->create_module ("IDL:inner:1.0", "inner", - "1.0", - ACE_TRY_ENV); + "1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::InterfaceDefSeq in_bases (1); in_bases.length (0); - CORBA::InterfaceDef_var p_iface = + CORBA::InterfaceDef_var p_iface = outer->create_interface ("IDL:p_iface:1.0", "p_iface", "1.0", - in_bases, - ACE_TRY_ENV); + in_bases + TAO_ENV_ARG_PARAMETER); ACE_CHECK; in_bases.length (1); in_bases[0] = CORBA::InterfaceDef::_duplicate (p_iface.in ()); - CORBA::InterfaceDef_var iface = + CORBA::InterfaceDef_var iface = inner->create_interface ("IDL:iface:1.0", "iface", "1.0", - in_bases, - ACE_TRY_ENV); + in_bases + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::PrimitiveDef_var p_void = - this->repo_->get_primitive (CORBA::pk_void, - ACE_TRY_ENV); + CORBA::PrimitiveDef_var p_void = + this->repo_->get_primitive (CORBA::pk_void + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::PrimitiveDef_var p_long = - this->repo_->get_primitive (CORBA::pk_long, - ACE_TRY_ENV); + CORBA::PrimitiveDef_var p_long = + this->repo_->get_primitive (CORBA::pk_long + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::AttributeDef_var attr = + CORBA::AttributeDef_var attr = p_iface->create_attribute ("IDL:iface/attr:1.0", "attr", "1.0", p_void.in (), - CORBA::ATTR_NORMAL, - ACE_TRY_ENV); + CORBA::ATTR_NORMAL + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ULong length = 3; @@ -2967,7 +2967,7 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV) { par_seq[i].name = p_names[i]; par_seq[i].type_def = CORBA::PrimitiveDef::_duplicate (p_long.in ()); - par_seq[i].type = p_long->type (ACE_TRY_ENV); + par_seq[i].type = p_long->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; par_seq[i].mode = ACE_static_cast (CORBA::ParameterMode, i); @@ -2981,15 +2981,15 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV) this->repo_->create_exception ("IDL:if_exception:1.0", "if_exception", "1.0", - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ExceptionDefSeq get_seq (1); get_seq.length (1); get_seq[0] = CORBA::ExceptionDef::_duplicate (ex_var.in ()); - CORBA::OperationDef_var op = + CORBA::OperationDef_var op = iface->create_operation ("IDL:iface/op:1.0", "op", "1.0", @@ -2997,18 +2997,18 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV) CORBA::OP_NORMAL, par_seq, get_seq, - con_seq, - ACE_TRY_ENV); + con_seq + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var str; CORBA::Contained_var result = - inner->lookup ("::outer::middle::inner::iface::op", - ACE_TRY_ENV); + inner->lookup ("::outer::middle::inner::iface::op" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - str = result->absolute_name (ACE_TRY_ENV); + str = result->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -3021,11 +3021,11 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::outer::middle::inner::iface::op")); - result = middle->lookup ("inner::iface::op", - ACE_TRY_ENV); + result = middle->lookup ("inner::iface::op" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - str = result->absolute_name (ACE_TRY_ENV); + str = result->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -3041,8 +3041,8 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV) CORBA::ContainedSeq_var cseq = this->repo_->lookup_name ("op", -1, CORBA::dk_all, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = cseq->length (); @@ -3056,7 +3056,7 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = cseq[i]->absolute_name (ACE_TRY_ENV); + str = cseq[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -3074,8 +3074,8 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV) cseq = middle->lookup_name ("attr", 3, CORBA::dk_Attribute, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = cseq->length (); @@ -3089,7 +3089,7 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = cseq[i]->absolute_name (ACE_TRY_ENV); + str = cseq[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -3105,8 +3105,8 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV) iface->move (outer.in (), "iface", - "1.0", - ACE_TRY_ENV); + "1.0" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -3116,8 +3116,8 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV) cseq = this->repo_->lookup_name ("op", -1, CORBA::dk_all, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; length = cseq->length (); @@ -3131,7 +3131,7 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV) for (i = 0; i < length; i++) { - str = cseq[i]->absolute_name (ACE_TRY_ENV); + str = cseq[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -3145,6 +3145,6 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::outer::iface::op")); } - outer->destroy (ACE_TRY_ENV); + outer->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h index cedb64af3a3..f6f9e31f68c 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h @@ -50,24 +50,24 @@ public: // Execute test code. private: - void array_test (CORBA::Environment &ACE_TRY_ENV); - void enum_test (CORBA::Environment &ACE_TRY_ENV); - void alias_test (CORBA::Environment &ACE_TRY_ENV); - void native_test (CORBA::Environment &ACE_TRY_ENV); - void struct_test (CORBA::Environment &ACE_TRY_ENV); - void union_test (CORBA::Environment &ACE_TRY_ENV); - void exception_test (CORBA::Environment &ACE_TRY_ENV); - void constant_test (CORBA::Environment &ACE_TRY_ENV); - void interface_test (CORBA::Environment &ACE_TRY_ENV); - void move_test (CORBA::Environment &ACE_TRY_ENV); - void module_test (CORBA::Environment &ACE_TRY_ENV); + void array_test (TAO_ENV_SINGLE_ARG_DECL); + void enum_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void alias_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void native_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void struct_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void union_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void exception_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void constant_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void interface_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void move_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void module_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // The various IFR tests. int parse_args (int argc, char *argv[]); // Process the command line arguments. - void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(CORBA::Environment &); + void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Array of pointers to the test functions. static const char *test_names_[]; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp index fea922f6372..8a3f9375f72 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp @@ -24,8 +24,8 @@ Ptest::init (int argc, { this->orb_ = CORBA::ORB_init (argc, argv, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int retval = this->parse_args (argc, @@ -35,8 +35,8 @@ Ptest::init (int argc, return retval; CORBA::Object_var object = - this->orb_->resolve_initial_references ("InterfaceRepository", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("InterfaceRepository" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) @@ -50,8 +50,8 @@ Ptest::init (int argc, } this->repo_ = - CORBA::Repository::_narrow (object.in (), - ACE_TRY_ENV); + CORBA::Repository::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->repo_.in ())) @@ -75,17 +75,17 @@ Ptest::init (int argc, int Ptest::run (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { if (this->query_ == 1) { - this->query (ACE_TRY_ENV); + this->query (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else { - this->populate (ACE_TRY_ENV); + this->populate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -131,7 +131,7 @@ Ptest::parse_args (int argc, } void -Ptest::populate (CORBA::Environment &ACE_TRY_ENV) +Ptest::populate (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -141,26 +141,26 @@ Ptest::populate (CORBA::Environment &ACE_TRY_ENV) CORBA::StructMemberSeq members (2); members.length (2); members[0].name = CORBA::string_dup ("long_mem"); - members[0].type_def = this->repo_->get_primitive (CORBA::pk_long, - ACE_TRY_ENV); + members[0].type_def = this->repo_->get_primitive (CORBA::pk_long + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - members[0].type = members[0].type_def->type (ACE_TRY_ENV); + members[0].type = members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; members[1].name = CORBA::string_dup ("array_mem"); members[1].type_def = this->repo_->create_array (5, - members[0].type_def.in (), - ACE_TRY_ENV); + members[0].type_def.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - members[1].type = members[1].type_def->type (ACE_TRY_ENV); + members[1].type = members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::StructDef_var svar = this->repo_->create_struct ("IDL:my_struct:1.0", "my_struct", "1.0", - members, - ACE_TRY_ENV); + members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::EnumMemberSeq def_members (2); @@ -172,13 +172,13 @@ Ptest::populate (CORBA::Environment &ACE_TRY_ENV) CORBA::EnumDef_var e_def_var = svar->create_enum ("IDL:my_def_enum:1.0", "my_enum", "1.0", - def_members, - ACE_TRY_ENV); + def_members + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Ptest::query (CORBA::Environment &ACE_TRY_ENV) +Ptest::query (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -193,8 +193,8 @@ Ptest::query (CORBA::Environment &ACE_TRY_ENV) }; CORBA::ContainedSeq_var contents = this->repo_->contents (CORBA::dk_all, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ULong length = contents->length (); @@ -208,13 +208,13 @@ Ptest::query (CORBA::Environment &ACE_TRY_ENV) CORBA::ULong i = 0; - CORBA::StructDef_var svar = CORBA::StructDef::_narrow (contents[i], - ACE_TRY_ENV); + CORBA::StructDef_var svar = CORBA::StructDef::_narrow (contents[i] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (svar.in ())); - CORBA::StructMemberSeq_var out_members = svar->members (ACE_TRY_ENV); + CORBA::StructMemberSeq_var out_members = svar->members (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_members->length (); @@ -265,6 +265,6 @@ Ptest::query (CORBA::Environment &ACE_TRY_ENV) ACE_UNUSED_ARG (members); #endif /* ACE_NDEBUG */ - svar->destroy (ACE_TRY_ENV); + svar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h index 4cc31795596..3996b1be028 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h @@ -50,8 +50,8 @@ public: // Execute test code. private: - void populate (CORBA::Environment &ACE_TRY_ENV); - void query (CORBA::Environment &ACE_TRY_ENV); + void populate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void query (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // The two IFR tests. int parse_args (int argc, diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp index 7e20da7c786..927e5f36aa2 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp @@ -33,7 +33,7 @@ int main (int argc, char *argv []) if (client.init (argc, argv) == -1) return 1; - result = client.run (ACE_TRY_ENV); + result = client.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp index c75da35c1b0..b1b0d4dfdee 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp @@ -145,7 +145,7 @@ NContextExt_Client_i::get_name () } int -NContextExt_Client_i::run (CORBA::Environment &ACE_TRY_ENV) +NContextExt_Client_i::run (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY_EX (OuterBlock) @@ -160,8 +160,8 @@ NContextExt_Client_i::run (CORBA::Environment &ACE_TRY_ENV) // Get the stringified form of the name CORBA::String_var str_name = - this->naming_context_->to_string (name, - ACE_TRY_ENV); + this->naming_context_->to_string (name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (OuterBlock); CORBA::Object_var factory_object; @@ -170,8 +170,8 @@ NContextExt_Client_i::run (CORBA::Environment &ACE_TRY_ENV) { // Resolve the name using the stringified form of the name factory_object = - this->naming_context_->resolve_str (str_name.in (), - ACE_TRY_ENV); + this->naming_context_->resolve_str (str_name.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (InnerBlock); } ACE_CATCH (CosNaming::NamingContext::NotFound, ex) @@ -181,7 +181,7 @@ NContextExt_Client_i::run (CORBA::Environment &ACE_TRY_ENV) // Narrow Web_Server::Iterator_Factory_var factory = - Web_Server::Iterator_Factory::_narrow (factory_object.in (), ACE_TRY_ENV); + Web_Server::Iterator_Factory::_narrow (factory_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (OuterBlock); @@ -191,15 +191,15 @@ NContextExt_Client_i::run (CORBA::Environment &ACE_TRY_ENV) this->naming_context_->list (2, bindings_list.out (), - iter.out (), - ACE_TRY_ENV); + iter.out () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (OuterBlock); // Convert the stringified name back as CosNaming::Name and print // them out. CosNaming::Name *nam = - this->naming_context_->to_name (str_name.in (), - ACE_TRY_ENV); + this->naming_context_->to_name (str_name.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (OuterBlock); // Declare a CosNaming::Name variable and assign length to it. @@ -223,8 +223,8 @@ NContextExt_Client_i::run (CORBA::Environment &ACE_TRY_ENV) CORBA::String_var obj_name = get_name (); CORBA::String_var url_string = this->naming_context_->to_url (address.in (), - obj_name.in(), - ACE_TRY_ENV); + obj_name.in() + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (OuterBlock); if (this->view_ == 0) @@ -263,7 +263,7 @@ NContextExt_Client_i::init (int argc, char **argv) this->argc_ = argc; this->argv_ = argv; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -271,8 +271,8 @@ NContextExt_Client_i::init (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (this->argc_, this->argv_, - "" /* the ORB name, it can be anything! */, - ACE_TRY_ENV); + "" /* the ORB name, it can be anything! */ + TAO_ENV_ARG_PARAMETER); // There must be at least one argument, the file that has to be // retrieved @@ -281,7 +281,7 @@ NContextExt_Client_i::init (int argc, char **argv) // Get a reference to the Naming Service CORBA::Object_var naming_context_object = - orb->resolve_initial_references ("NameService", ACE_TRY_ENV); + orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_context_object.in ())) @@ -291,8 +291,8 @@ NContextExt_Client_i::init (int argc, char **argv) // Narrow to get the correct reference this->naming_context_ = - CosNaming::NamingContextExt::_narrow (naming_context_object.in (), - ACE_TRY_ENV); + CosNaming::NamingContextExt::_narrow (naming_context_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->naming_context_.in ())) diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h index 7872b9f2d42..6592e11fe71 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h @@ -39,7 +39,7 @@ class NContextExt_Client_i NContextExt_Client_i (void); ~NContextExt_Client_i (void); - int run (CORBA::Environment &ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL); // Execute the client example code. int init (int argc, char **argv); diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp index 22c9c9361c3..7f641e692a6 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp @@ -17,8 +17,8 @@ Hash_ReplicaControl::Hash_ReplicaControl (void) void Hash_ReplicaControl::init (CORBA::ORB_ptr orb, - LoadBalancing::LoadBalancer_ptr balancer, - CORBA::Environment &ACE_TRY_ENV) + LoadBalancing::LoadBalancer_ptr balancer + TAO_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Hash_ReplicaControl::init\n")); @@ -28,21 +28,21 @@ Hash_ReplicaControl::init (CORBA::ORB_ptr orb, reactor->schedule_timer (&this->adapter_, 0, interval, restart); LoadBalancing::ReplicaControl_var control = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var replica = - this->replica_._this (ACE_TRY_ENV); + this->replica_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->group_ = - balancer->group_identity (ACE_TRY_ENV); + balancer->group_identity (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_ = balancer->connect (control.in (), - replica.in (), - ACE_TRY_ENV); + replica.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -66,8 +66,8 @@ Hash_ReplicaControl::handle_timeout (const ACE_Time_Value &, ACE_TRY_NEW_ENV { - this->proxy_->current_load (this->current_load_, - ACE_TRY_ENV); + this->proxy_->current_load (this->current_load_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Current_Load = %f\n", this->current_load_)); } @@ -86,7 +86,7 @@ Hash_ReplicaControl::request_received (void) void -Hash_ReplicaControl::request_rejected (CORBA::Environment &ACE_TRY_ENV) +Hash_ReplicaControl::request_rejected (TAO_ENV_SINGLE_ARG_DECL) { // @@ Ossama: notice how we reject a single request. Maybe the // advisory should include how many are we supposed to shed? @@ -97,8 +97,8 @@ Hash_ReplicaControl::request_rejected (CORBA::Environment &ACE_TRY_ENV) } void -Hash_ReplicaControl::high_load_advisory (CORBA::Environment & - /* ACE_TRY_ENV */) +Hash_ReplicaControl::high_load_advisory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED + /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // Notify the replica that it should reject all requests. @@ -107,8 +107,8 @@ Hash_ReplicaControl::high_load_advisory (CORBA::Environment & } void -Hash_ReplicaControl::nominal_load_advisory (CORBA::Environment & - /* ACE_TRY_ENV */) +Hash_ReplicaControl::nominal_load_advisory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED + /* TAO_ENV_SINGLE_ARG_PARAMETER */) ACE_THROW_SPEC ((CORBA::SystemException)) { // Notify the replica that it should once again accept requests. diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.h b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.h index 912e5e550f6..bda5d30bf60 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.h +++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.h @@ -34,8 +34,8 @@ public: // Constructor. void init (CORBA::ORB_ptr the_orb, - LoadBalancing::LoadBalancer_ptr balancer, - CORBA::Environment &ACE_TRY_ENV); + LoadBalancing::LoadBalancer_ptr balancer + TAO_ENV_ARG_DECL); int handle_timeout (const ACE_Time_Value ¤t_time, const void *arg); @@ -44,13 +44,13 @@ public: void request_received (void); // A request has been received - void request_rejected (CORBA::Environment &ACE_TRY_ENV); + void request_rejected (TAO_ENV_SINGLE_ARG_DECL); // A request has been rejected, take appropriate action - virtual void high_load_advisory (CORBA::Environment &ACE_TRY_ENV) + virtual void high_load_advisory (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void nominal_load_advisory (CORBA::Environment &ACE_TRY_ENV) + virtual void nominal_load_advisory (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Object_ptr replica (void); diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp index ecc7970f126..57a4af6f05c 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp @@ -14,13 +14,13 @@ Hash_Replica_Impl::Hash_Replica_Impl (Hash_ReplicaControl *control) } CORBA::ULong -Hash_Replica_Impl::do_hash (const char *str, - CORBA::Environment &ACE_TRY_ENV) +Hash_Replica_Impl::do_hash (const char *str + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->reject_requests_) { - this->control_->request_rejected (ACE_TRY_ENV); + this->control_->request_rejected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 0; } diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h index fd7dff9fc35..7fec1f0db51 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h +++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h @@ -27,8 +27,8 @@ public: Hash_Replica_Impl (Hash_ReplicaControl *control); // Constructor - virtual CORBA::ULong do_hash (const char * str, - CORBA::Environment &ACE_TRY_ENV) + virtual CORBA::ULong do_hash (const char * str + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Perform a simple hashing operation on the input string <str> and // return the hashed string <hash_str>. diff --git a/TAO/orbsvcs/tests/LoadBalancing/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/client.cpp index d4c936ef07c..38cde7ddf4c 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/client.cpp @@ -11,18 +11,18 @@ static void run_test (int iterations, int timeout, - Hash_Replica_ptr hasher, - CORBA::Environment &ACE_TRY_ENV); + Hash_Replica_ptr hasher + TAO_ENV_ARG_DECL); int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; const char *ior = "file://test.ior"; @@ -61,12 +61,12 @@ main (int argc, char *argv[]) } CORBA::Object_var obj = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Hash_Replica_var hasher = - Hash_Replica::_unchecked_narrow (obj.in (), - ACE_TRY_ENV); + Hash_Replica::_unchecked_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (hasher.in ())) @@ -74,10 +74,10 @@ main (int argc, char *argv[]) ACE_TEXT ("Invalid replica IOR.\n")), -1); - run_test (iterations, timeout, hasher.in (), ACE_TRY_ENV); + run_test (iterations, timeout, hasher.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -92,8 +92,8 @@ main (int argc, char *argv[]) void run_test (int iterations, int timeout, - Hash_Replica_ptr hasher, - CORBA::Environment &ACE_TRY_ENV) + Hash_Replica_ptr hasher + TAO_ENV_ARG_DECL) { ACE_Time_Value tv (0, timeout * 1000); ACE_Throughput_Stats stats; @@ -103,7 +103,7 @@ run_test (int iterations, { ACE_UINT64 call_start = ACE_OS::gethrtime (); - hasher->do_hash ("This is a silly test", ACE_TRY_ENV); + hasher->do_hash ("This is a silly test" TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_UINT64 end = ACE_OS::gethrtime (); diff --git a/TAO/orbsvcs/tests/LoadBalancing/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/server.cpp index 1526a5e1343..45087ff4c62 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/server.cpp @@ -9,12 +9,12 @@ int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; const char *balancer_ior = "file://test.ior"; @@ -43,7 +43,7 @@ main (int argc, char *argv[]) } CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -52,23 +52,23 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = - orb->string_to_object (balancer_ior, ACE_TRY_ENV); + orb->string_to_object (balancer_ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; LoadBalancing::LoadBalancer_var load_balancer = - LoadBalancing::LoadBalancer::_narrow (obj.in (), - ACE_TRY_ENV); + LoadBalancing::LoadBalancer::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (load_balancer.in ())) @@ -77,11 +77,11 @@ main (int argc, char *argv[]) -1); CORBA::Object_var group = - load_balancer->group_identity (ACE_TRY_ENV); + load_balancer->group_identity (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = - orb->object_to_string (group.in (), ACE_TRY_ENV); + orb->object_to_string (group.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; FILE *ior = ACE_OS::fopen (ior_output, "w"); @@ -90,27 +90,27 @@ main (int argc, char *argv[]) Hash_ReplicaControl control; control.init (orb.in (), - load_balancer.in (), - ACE_TRY_ENV); + load_balancer.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #ifndef ACE_WIN32 - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; #else while (1) { ACE_Time_Value tv (1, 0); - orb->run (tv, ACE_TRY_ENV); + orb->run (tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; control.handle_timeout (tv, 0); } #endif - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp index 2c9446e889d..e3402c75393 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp @@ -91,10 +91,10 @@ AdminProperties_Test::parse_args(int argc, char *argv[]) } void -AdminProperties_Test::init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV) +AdminProperties_Test::init (int argc, char *argv [] TAO_ENV_ARG_DECL) { // init base class - Notify_Test_Client::init (argc, argv, ACE_TRY_ENV); + Notify_Test_Client::init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ChannelID id; @@ -118,8 +118,8 @@ AdminProperties_Test::init (int argc, char *argv [], CORBA::Environment &ACE_TRY ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, - id, - ACE_TRY_ENV); + id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); @@ -128,33 +128,33 @@ AdminProperties_Test::init (int argc, char *argv [], CORBA::Environment &ACE_TRY CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); } void -AdminProperties_Test::run_test (CORBA::Environment &ACE_TRY_ENV) +AdminProperties_Test::run_test (TAO_ENV_SINGLE_ARG_DECL) { - this->create_suppliers (ACE_TRY_ENV); + this->create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->create_consumers (ACE_TRY_ENV); + this->create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->send_events (ACE_TRY_ENV); + this->send_events (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -AdminProperties_Test::create_suppliers (CORBA::Environment &ACE_TRY_ENV) +AdminProperties_Test::create_suppliers (TAO_ENV_SINGLE_ARG_DECL) { // Create the requested number of suppliers. // @@ CosNotifyChannelAdmin::AdminID adminid; @@ -170,10 +170,10 @@ AdminProperties_Test::create_suppliers (CORBA::Environment &ACE_TRY_ENV) for (index = 0; index < this->suppliers_; ++index) { supplier = new TAO_Notify_StructuredPushSupplier (); - supplier->init (root_poa_.in (), ACE_TRY_ENV); + supplier->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - supplier->connect (this->supplier_admin_.in (), ACE_TRY_ENV); + supplier->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -186,7 +186,7 @@ AdminProperties_Test::create_suppliers (CORBA::Environment &ACE_TRY_ENV) } void -AdminProperties_Test::create_consumers (CORBA::Environment &ACE_TRY_ENV) +AdminProperties_Test::create_consumers (TAO_ENV_SINGLE_ARG_DECL) { // Create the requested number of suppliers. // @@ CosNotifyChannelAdmin::AdminID adminid; @@ -202,10 +202,10 @@ AdminProperties_Test::create_consumers (CORBA::Environment &ACE_TRY_ENV) for (index = 0; index < this->consumers_; ++index) { consumer = new TAO_Notify_StructuredPushConsumer (); - consumer->init (root_poa_.in (), ACE_TRY_ENV); + consumer->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - consumer->connect (this->consumer_admin_.in (), ACE_TRY_ENV); + consumer->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -218,7 +218,7 @@ AdminProperties_Test::create_consumers (CORBA::Environment &ACE_TRY_ENV) } void -AdminProperties_Test::send_events (CORBA::Environment &ACE_TRY_ENV) +AdminProperties_Test::send_events (TAO_ENV_SINGLE_ARG_DECL) { // operations: CosNotification::StructuredEvent event; @@ -255,10 +255,10 @@ AdminProperties_Test::send_events (CORBA::Environment &ACE_TRY_ENV) TAO_Notify_StructuredPushSupplier *supplier = new TAO_Notify_StructuredPushSupplier (); - supplier->init (root_poa_.in (), ACE_TRY_ENV); + supplier->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier->connect (this->supplier_admin_.in (), ACE_TRY_ENV); + supplier->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; int i = 0; @@ -271,7 +271,7 @@ AdminProperties_Test::send_events (CORBA::Environment &ACE_TRY_ENV) // any event.remainder_of_body <<= (CORBA::Long)i; - supplier->send_event (event, ACE_TRY_ENV); + supplier->send_event (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -294,11 +294,11 @@ main (int argc, char* argv[]) ACE_TRY_NEW_ENV { - test.init (argc, argv, - ACE_TRY_ENV); //Init the Client + test.init (argc, argv + TAO_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; - test.run_test (ACE_TRY_ENV); + test.run_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.h index 9a28c99459d..432ab6d490e 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.h +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.h @@ -36,16 +36,16 @@ public: int parse_args(int argc, char *argv[]) ; - void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + void init (int argc, char *argv [] TAO_ENV_ARG_DECL); // Initialization. - void run_test (CORBA::Environment &ACE_TRY_ENV); + void run_test (TAO_ENV_SINGLE_ARG_DECL); // Run the test. protected: - void create_suppliers (CORBA::Environment &ACE_TRY_ENV); - void create_consumers (CORBA::Environment &ACE_TRY_ENV); - void send_events (CORBA::Environment &ACE_TRY_ENV); + void create_suppliers (TAO_ENV_SINGLE_ARG_DECL); + void create_consumers (TAO_ENV_SINGLE_ARG_DECL); + void send_events (TAO_ENV_SINGLE_ARG_DECL); // Data Members CosNotifyChannelAdmin::EventChannel_var ec_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp index d2dbf62a7db..290f3b1a335 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp @@ -68,26 +68,26 @@ ConnectDisconnect::on_entity_destroyed (void) } void -ConnectDisconnect::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_ENV) +ConnectDisconnect::init (int argc, char* argv [] TAO_ENV_ARG_DECL) { // init base class - Notify_Test_Client::init (argc, argv, ACE_TRY_ENV); + Notify_Test_Client::init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create all participents ... - this->create_EC (ACE_TRY_ENV); + this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); @@ -160,21 +160,21 @@ ConnectDisconnect::parse_args(int argc, char *argv[]) } void -ConnectDisconnect::create_EC (CORBA::Environment &ACE_TRY_ENV) +ConnectDisconnect::create_EC (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, - id, - ACE_TRY_ENV); + id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -ConnectDisconnect::run_test (CORBA::Environment &ACE_TRY_ENV) +ConnectDisconnect::run_test (TAO_ENV_SINGLE_ARG_DECL) { for (int iterations = 0; iterations < count_; ++iterations) { @@ -184,85 +184,85 @@ ConnectDisconnect::run_test (CORBA::Environment &ACE_TRY_ENV) { // Create and connect Any consumers any_consumer_[i] = new CD_PushConsumer (this, i); - any_consumer_[i]->init (root_poa_.in (), ACE_TRY_ENV); + any_consumer_[i]->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - any_consumer_[i]->connect (this->consumer_admin_.in (), ACE_TRY_ENV); + any_consumer_[i]->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create and connect Structured consumers structured_consumer_[i] = new CD_StructuredPushConsumer (this, i); - structured_consumer_[i]->init (root_poa_.in (), ACE_TRY_ENV); + structured_consumer_[i]->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - structured_consumer_[i]->connect (this->consumer_admin_.in (), ACE_TRY_ENV); + structured_consumer_[i]->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create and connect Sequence consumers sequence_consumer_[i] = new CD_SequencePushConsumer (this, i); - sequence_consumer_[i]->init (root_poa_.in (), ACE_TRY_ENV); + sequence_consumer_[i]->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - sequence_consumer_[i]->connect (this->consumer_admin_.in (), ACE_TRY_ENV); + sequence_consumer_[i]->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } for (i = 0; i < this->suppliers_; ++i) { any_supplier_[i] = new CD_PushSupplier (this, i); - any_supplier_[i]->init (root_poa_.in (), ACE_TRY_ENV); + any_supplier_[i]->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - any_supplier_[i]->connect (this->supplier_admin_.in (), ACE_TRY_ENV); + any_supplier_[i]->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create and connect Structured suppliers structured_supplier_[i] = new CD_StructuredPushSupplier (this, i); - structured_supplier_[i]->init (root_poa_.in (), ACE_TRY_ENV); + structured_supplier_[i]->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - structured_supplier_[i]->connect (this->supplier_admin_.in (), ACE_TRY_ENV); + structured_supplier_[i]->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create and connect Sequence suppliers sequence_supplier_[i] = new CD_SequencePushSupplier (this, i); - sequence_supplier_[i]->init (root_poa_.in (), ACE_TRY_ENV); + sequence_supplier_[i]->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - sequence_supplier_[i]->connect (this->supplier_admin_.in (), ACE_TRY_ENV); + sequence_supplier_[i]->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } for (i = 0; i < this->consumers_; ++i) { // Disconnnect Any consumers. - any_consumer_[i]->disconnect (ACE_TRY_ENV); + any_consumer_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Disconnect Structured Consumers. - structured_consumer_[i]->disconnect (ACE_TRY_ENV); + structured_consumer_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Disconnect Sequence Consumers. - sequence_consumer_[i]->disconnect (ACE_TRY_ENV); + sequence_consumer_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } for (i = 0; i < this->suppliers_; ++i) { // Disconnnect Any suppliers. - any_supplier_[i]->disconnect (ACE_TRY_ENV); + any_supplier_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Disconnect Structured Suppliers. - structured_supplier_[i]->disconnect (ACE_TRY_ENV); + structured_supplier_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Disconnect Sequence Suppliers. - sequence_supplier_[i]->disconnect (ACE_TRY_ENV); + sequence_supplier_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } } void -ConnectDisconnect::end_test (CORBA::Environment &ACE_TRY_ENV) +ConnectDisconnect::end_test (TAO_ENV_SINGLE_ARG_DECL) { - this->shutdown (ACE_TRY_ENV); + this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); } int @@ -277,8 +277,8 @@ ConnectDisconnect::check_results (void) ACE_DEBUG ((LM_DEBUG, "ConnectDisconnect test succeded\n")); // Destroy the channel - ACE_DECLARE_NEW_CORBA_ENV; - this->ec_->destroy (ACE_TRY_ENV); + TAO_ENV_DECLARE_NEW_ENV; + this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -296,14 +296,14 @@ main (int argc, char* argv[]) ACE_TRY_NEW_ENV { - client.init (argc, argv, - ACE_TRY_ENV); //Init the Client + client.init (argc, argv + TAO_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; - client.run_test (ACE_TRY_ENV); + client.run_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - client.end_test (ACE_TRY_ENV); + client.end_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h index 8abb0fca5f7..710f1b3c846 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h @@ -73,20 +73,20 @@ public: int parse_args(int argc, char *argv[]) ; - void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + void init (int argc, char *argv [] TAO_ENV_ARG_DECL); // initialization. - void run_test (CORBA::Environment &ACE_TRY_ENV); + void run_test (TAO_ENV_SINGLE_ARG_DECL); // Run the test. - void end_test (CORBA::Environment &ACE_TRY_ENV); + void end_test (TAO_ENV_SINGLE_ARG_DECL); // End the test. int check_results (void); // check if we got the expected results. protected: - void create_EC (CORBA::Environment &ACE_TRY_ENV); + void create_EC (TAO_ENV_SINGLE_ARG_DECL); // Create EC CosNotifyChannelAdmin::EventChannel_var ec_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp index 09c7187dc62..7272dfe3f5b 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp @@ -14,7 +14,9 @@ Event_StructuredPushConsumer::Event_StructuredPushConsumer (Events_Test *test_cl } void -Event_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification, CORBA::Environment &/*ACE_TRY_ENV*/) +Event_StructuredPushConsumer::push_structured_event + (const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -50,48 +52,48 @@ Events_Test::~Events_Test () } void -Events_Test::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_ENV) +Events_Test::init (int argc, char* argv [] TAO_ENV_ARG_DECL) { // init base class - Notify_Test_Client::init (argc, argv, ACE_TRY_ENV); + Notify_Test_Client::init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create all participents ... - this->create_EC (ACE_TRY_ENV); + this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); consumer_ = new Event_StructuredPushConsumer (this); - consumer_->init (root_poa_.in (), ACE_TRY_ENV); + consumer_->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_->connect (this->consumer_admin_.in (), ACE_TRY_ENV); + consumer_->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; Event_StructuredPushConsumer* consumer2; consumer2 = new Event_StructuredPushConsumer (this); - consumer2->init (root_poa_.in (), ACE_TRY_ENV); + consumer2->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer2->connect (this->consumer_admin_.in (), ACE_TRY_ENV); + consumer2->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; supplier_ = new Event_StructuredPushSupplier (this); - supplier_->init (root_poa_.in (), ACE_TRY_ENV); + supplier_->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_->connect (this->supplier_admin_.in (), ACE_TRY_ENV); + supplier_->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the CA to receive all type of events @@ -103,7 +105,7 @@ Events_Test::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_ENV) added[0].domain_name = CORBA::string_dup ("*"); added[0].type_name = CORBA::string_dup ("*"); - this->consumer_admin_->subscription_change (added, removed, ACE_TRY_ENV); + this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -141,14 +143,14 @@ Events_Test::parse_args(int argc, char *argv[]) } void -Events_Test::create_EC (CORBA::Environment &ACE_TRY_ENV) +Events_Test::create_EC (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, - id, - ACE_TRY_ENV); + id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; /****************************************************************/ @@ -166,7 +168,7 @@ Events_Test::create_EC (CORBA::Environment &ACE_TRY_ENV) admin[1].value <<= (CORBA::Long)2; - ec_->set_admin (admin, ACE_TRY_ENV); + ec_->set_admin (admin TAO_ENV_ARG_PARAMETER); ACE_CHECK;*/ /****************************************************************/ @@ -182,14 +184,14 @@ Events_Test::on_event_received (void) if (this->result_count_ == 2*this->event_count_) { - ACE_DECLARE_NEW_CORBA_ENV; - this->end_test (ACE_TRY_ENV); + TAO_ENV_DECLARE_NEW_ENV; + this->end_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } void -Events_Test::run_test (CORBA::Environment &ACE_TRY_ENV) +Events_Test::run_test (TAO_ENV_SINGLE_ARG_DECL) { // operations: CosNotification::StructuredEvent event; @@ -235,23 +237,23 @@ Events_Test::run_test (CORBA::Environment &ACE_TRY_ENV) qos[0].name = CORBA::string_dup (CosNotification::Priority); qos[0].value <<= (CORBA::Short)prio++; - supplier_->send_event (event, ACE_TRY_ENV); + supplier_->send_event (event TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -Events_Test::end_test (CORBA::Environment &ACE_TRY_ENV) +Events_Test::end_test (TAO_ENV_SINGLE_ARG_DECL) { - this->shutdown (ACE_TRY_ENV); // break out of run + this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); // break out of run } int Events_Test::check_results (void) { // Destroy the channel - ACE_DECLARE_NEW_CORBA_ENV; - this->ec_->destroy (ACE_TRY_ENV); + TAO_ENV_DECLARE_NEW_ENV; + this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (this->result_count_ == 2*this->event_count_) @@ -278,11 +280,11 @@ main (int argc, char* argv[]) ACE_TRY_NEW_ENV { - events.init (argc, argv, - ACE_TRY_ENV); //Init the Client + events.init (argc, argv + TAO_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; - events.run_test (ACE_TRY_ENV); + events.run_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; events.ORB_run (); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h index 414553d430f..9801654d362 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h @@ -38,8 +38,8 @@ public: // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -76,23 +76,23 @@ public: int parse_args(int argc, char *argv[]) ; - void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + void init (int argc, char *argv [] TAO_ENV_ARG_DECL); // initialization. void on_event_received (void); // Called when an event is received. - void run_test (CORBA::Environment &ACE_TRY_ENV); + void run_test (TAO_ENV_SINGLE_ARG_DECL); // Run the test. - void end_test (CORBA::Environment &ACE_TRY_ENV); + void end_test (TAO_ENV_SINGLE_ARG_DECL); // End the test. int check_results (void); // check if we got the expected results. protected: - void create_EC (CORBA::Environment &ACE_TRY_ENV); + void create_EC (TAO_ENV_SINGLE_ARG_DECL); // Create EC ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp index 930b704b64a..8f38e8a7f54 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp @@ -72,13 +72,13 @@ IdAssignment::parse_args(int argc, char *argv[]) } void -IdAssignment::init(int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) +IdAssignment::init(int argc, char *argv[] TAO_ENV_ARG_DECL) { - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var rootObj = orb->resolve_initial_references("NameService", - ACE_TRY_ENV); + CORBA::Object_var rootObj = orb->resolve_initial_references("NameService" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil(rootObj.in())) @@ -89,14 +89,14 @@ IdAssignment::init(int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) } CosNaming::NamingContext_var rootNC = - CosNaming::NamingContext::_narrow(rootObj.in(), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow(rootObj.in() TAO_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name name(1); name.length(1); name[0].id = CORBA::string_dup("NotifyEventChannelFactory"); - CORBA::Object_var obj = rootNC->resolve(name, ACE_TRY_ENV); + CORBA::Object_var obj = rootNC->resolve(name TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil(obj.in())) @@ -107,14 +107,14 @@ IdAssignment::init(int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) } notify_factory_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow( - obj.in(), - ACE_TRY_ENV); + obj.in() + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } CosNotifyChannelAdmin::ChannelID -IdAssignment::create_ec(CORBA::Environment &ACE_TRY_ENV) +IdAssignment::create_ec(TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; CosNotification::QoSProperties initial_qos; @@ -122,8 +122,8 @@ IdAssignment::create_ec(CORBA::Environment &ACE_TRY_ENV) CosNotifyChannelAdmin::EventChannel_var ec = notify_factory_->create_channel(initial_qos, initial_admin, - id, - ACE_TRY_ENV); + id + TAO_ENV_ARG_PARAMETER); // ACE_CHECK_RETURN; return id; @@ -131,11 +131,11 @@ IdAssignment::create_ec(CORBA::Environment &ACE_TRY_ENV) void -IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id, - CORBA::Environment &ACE_TRY_ENV) +IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id + TAO_ENV_ARG_DECL) { CosNotifyChannelAdmin::EventChannel_var ec = - notify_factory_->get_event_channel(id, ACE_TRY_ENV); + notify_factory_->get_event_channel(id TAO_ENV_ARG_PARAMETER); ACE_CHECK; @@ -147,20 +147,20 @@ IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id, } - ec->destroy(ACE_TRY_ENV); + ec->destroy(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } CosNotifyChannelAdmin::AdminID -IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id, - CORBA::Environment &ACE_TRY_ENV) +IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id + TAO_ENV_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = CosNotifyChannelAdmin::OR_OP; CosNotifyChannelAdmin::EventChannel_var ec = - notify_factory_->get_event_channel(channel_id, ACE_TRY_ENV); + notify_factory_->get_event_channel(channel_id TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -173,7 +173,7 @@ IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id } CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin = - ec->new_for_suppliers (ifgop, adminid, ACE_TRY_ENV); + ec->new_for_suppliers (ifgop, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (CORBA::is_nil (supplier_admin.in())) @@ -186,15 +186,15 @@ IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id } CosNotifyChannelAdmin::AdminID -IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id, - CORBA::Environment &ACE_TRY_ENV) +IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id + TAO_ENV_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = CosNotifyChannelAdmin::OR_OP; CosNotifyChannelAdmin::EventChannel_var ec = - notify_factory_->get_event_channel(channel_id, ACE_TRY_ENV); + notify_factory_->get_event_channel(channel_id TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -207,7 +207,7 @@ IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id } CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->new_for_consumers (ifgop, adminid, ACE_TRY_ENV); + ec->new_for_consumers (ifgop, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (CORBA::is_nil (consumer_admin.in())) @@ -222,11 +222,11 @@ IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id void IdAssignment::destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id, - CosNotifyChannelAdmin::AdminID admin_id, - CORBA::Environment &ACE_TRY_ENV) + CosNotifyChannelAdmin::AdminID admin_id + TAO_ENV_ARG_DECL) { CosNotifyChannelAdmin::EventChannel_var ec = - notify_factory_->get_event_channel(channel_id, ACE_TRY_ENV); + notify_factory_->get_event_channel(channel_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; @@ -239,14 +239,14 @@ IdAssignment::destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_i } CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->get_consumeradmin (admin_id, ACE_TRY_ENV); + ec->get_consumeradmin (admin_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer_admin.in())) ACE_ERROR ((LM_ERROR, " (%P|%t) Unable to get consumer admin\n")); - consumer_admin->destroy(ACE_TRY_ENV); + consumer_admin->destroy(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG((LM_DEBUG, "destroyed consumer admin\n")); @@ -255,11 +255,11 @@ IdAssignment::destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_i void IdAssignment::destroy_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id, - CosNotifyChannelAdmin::AdminID admin_id, - CORBA::Environment &ACE_TRY_ENV) + CosNotifyChannelAdmin::AdminID admin_id + TAO_ENV_ARG_DECL) { CosNotifyChannelAdmin::EventChannel_var ec = - notify_factory_->get_event_channel(channel_id, ACE_TRY_ENV); + notify_factory_->get_event_channel(channel_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; @@ -270,21 +270,21 @@ IdAssignment::destroy_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_i } CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin = - ec->get_supplieradmin (admin_id, ACE_TRY_ENV); + ec->get_supplieradmin (admin_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier_admin.in())) ACE_ERROR ((LM_ERROR, " (%P|%t) Unable to get supplier admin\n")); - supplier_admin->destroy(ACE_TRY_ENV); + supplier_admin->destroy(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG((LM_DEBUG, "destroyed supplier admin\n")); } void -IdAssignment::run_test(CORBA::Environment &ACE_TRY_ENV) +IdAssignment::run_test(TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID* ec_id = new CosNotifyChannelAdmin::ChannelID [this->ec_count_]; @@ -303,22 +303,22 @@ IdAssignment::run_test(CORBA::Environment &ACE_TRY_ENV) int ec_count; for (ec_count = 0; ec_count < this->ec_count_; ++ec_count) { - ec_id [ec_count] = create_ec(ACE_TRY_ENV); + ec_id [ec_count] = create_ec(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // connect <consumer_admin_count_> number of consumers to the current ec. for (int cons_count = 0; cons_count < this->consumer_admin_count_; ++cons_count) { - consumer_admin_id [cons_count] = create_consumer_admin (ec_id [ec_count], - ACE_TRY_ENV); + consumer_admin_id [cons_count] = create_consumer_admin (ec_id [ec_count] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // connect <supplier_admin_count_> number of suppliers to the current ec. for (int supp_count = 0; supp_count < this->supplier_admin_count_; ++supp_count) { - supplier_admin_id [supp_count] = create_supplier_admin (ec_id [ec_count], - ACE_TRY_ENV); + supplier_admin_id [supp_count] = create_supplier_admin (ec_id [ec_count] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -326,7 +326,7 @@ IdAssignment::run_test(CORBA::Environment &ACE_TRY_ENV) // destroy the ec, the admins should destroy too. for (ec_count = 0; ec_count < this->ec_count_; ++ec_count) { - this->destroy_ec (ec_id [ec_count], ACE_TRY_ENV); + this->destroy_ec (ec_id [ec_count] TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -340,23 +340,23 @@ IdAssignment::run_test(CORBA::Environment &ACE_TRY_ENV) int ec_count; for (ec_count = 0; ec_count < this->ec_count_; ++ec_count) { - ec_id [ec_count] = create_ec(ACE_TRY_ENV); + ec_id [ec_count] = create_ec(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; int cons_count, supp_count; // connect <consumer_admin_count_> number of consumers to the current ec. for (cons_count = 0; cons_count < this->consumer_admin_count_; ++cons_count) { - consumer_admin_id [cons_count] = create_consumer_admin (ec_id [ec_count], - ACE_TRY_ENV); + consumer_admin_id [cons_count] = create_consumer_admin (ec_id [ec_count] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // connect <supplier_admin_count_> number of suppliers to the current ec. for (supp_count = 0; supp_count < this->supplier_admin_count_; ++supp_count) { - supplier_admin_id [supp_count] = create_supplier_admin (ec_id [ec_count], - ACE_TRY_ENV); + supplier_admin_id [supp_count] = create_supplier_admin (ec_id [ec_count] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // destroy the admins @@ -364,16 +364,16 @@ IdAssignment::run_test(CORBA::Environment &ACE_TRY_ENV) // destroy consumer admins for (cons_count = 0; cons_count < this->consumer_admin_count_; ++cons_count) { - destroy_consumer_admin (ec_id [ec_count],consumer_admin_id [cons_count], - ACE_TRY_ENV); + destroy_consumer_admin (ec_id [ec_count],consumer_admin_id [cons_count] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } // destroy supplier admins for (supp_count = 0; supp_count < this->supplier_admin_count_; ++supp_count) { - destroy_supplier_admin (ec_id [ec_count], supplier_admin_id [supp_count], - ACE_TRY_ENV); + destroy_supplier_admin (ec_id [ec_count], supplier_admin_id [supp_count] + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -382,7 +382,7 @@ IdAssignment::run_test(CORBA::Environment &ACE_TRY_ENV) // destroy the ec, for (ec_count = 0; ec_count < this->ec_count_; ++ec_count) { - this->destroy_ec (ec_id [ec_count], ACE_TRY_ENV); + this->destroy_ec (ec_id [ec_count] TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -393,17 +393,17 @@ IdAssignment::run_test(CORBA::Environment &ACE_TRY_ENV) int main(int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { IdAssignment test; test.parse_args (argc, argv); - test.init(argc, argv, ACE_TRY_ENV); + test.init(argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - test.run_test(ACE_TRY_ENV); + test.run_test(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h index a1b4f7e293d..66c132225c8 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h @@ -25,19 +25,19 @@ public: ~IdAssignment (); int parse_args(int argc, char *argv[]); - void init(int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV); - void run_test(CORBA::Environment &ACE_TRY_ENV); + void init(int argc, char *argv[] TAO_ENV_ARG_DECL); + void run_test(TAO_ENV_SINGLE_ARG_DECL); private: - CosNotifyChannelAdmin::ChannelID create_ec(CORBA::Environment &ACE_TRY_ENV); - void destroy_ec(CosNotifyChannelAdmin::ChannelID id, - CORBA::Environment &ACE_TRY_ENV); + CosNotifyChannelAdmin::ChannelID create_ec(TAO_ENV_SINGLE_ARG_DECL); + void destroy_ec(CosNotifyChannelAdmin::ChannelID id + TAO_ENV_ARG_DECL); - CosNotifyChannelAdmin::AdminID create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id, CORBA::Environment &ACE_TRY_ENV); - CosNotifyChannelAdmin::AdminID create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id, CORBA::Environment &ACE_TRY_ENV); + CosNotifyChannelAdmin::AdminID create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id TAO_ENV_ARG_DECL); + CosNotifyChannelAdmin::AdminID create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id TAO_ENV_ARG_DECL); - void destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id, CosNotifyChannelAdmin::AdminID admin_id, CORBA::Environment &ACE_TRY_ENV); - void destroy_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id, CosNotifyChannelAdmin::AdminID admin_id, CORBA::Environment &ACE_TRY_ENV); + void destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id, CosNotifyChannelAdmin::AdminID admin_id TAO_ENV_ARG_DECL); + void destroy_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id, CosNotifyChannelAdmin::AdminID admin_id TAO_ENV_ARG_DECL); // = Data members CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.cpp index 48926181bba..90b0620ab35 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.cpp @@ -53,13 +53,13 @@ LifeCycleTest::parse_args(int argc, char *argv[]) } void -LifeCycleTest::init(int argc, char* argv[], CORBA::Environment &ACE_TRY_ENV) +LifeCycleTest::init(int argc, char* argv[] TAO_ENV_ARG_DECL) { - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var rootObj = orb->resolve_initial_references("NameService", - ACE_TRY_ENV); + CORBA::Object_var rootObj = orb->resolve_initial_references("NameService" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil(rootObj.in())) @@ -69,20 +69,20 @@ LifeCycleTest::init(int argc, char* argv[], CORBA::Environment &ACE_TRY_ENV) return; } CosNaming::NamingContext_var rootNC = - CosNaming::NamingContext::_narrow(rootObj.in(), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow(rootObj.in() + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CosNaming::Name name(1); name.length(1); name[0].id = CORBA::string_dup("NotifyEventChannelFactory"); - CORBA::Object_var obj = rootNC->resolve(name, ACE_TRY_ENV); + CORBA::Object_var obj = rootNC->resolve(name TAO_ENV_ARG_PARAMETER); ACE_CHECK; notify_factory_ = - CosNotifyChannelAdmin::EventChannelFactory::_narrow(obj.in(), - ACE_TRY_ENV); + CosNotifyChannelAdmin::EventChannelFactory::_narrow(obj.in() + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil(notify_factory_.in())) @@ -95,32 +95,32 @@ LifeCycleTest::init(int argc, char* argv[], CORBA::Environment &ACE_TRY_ENV) } void -LifeCycleTest::run_test(CORBA::Environment &ACE_TRY_ENV) +LifeCycleTest::run_test(TAO_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->count_; ++i) { - this->create_ec(ACE_TRY_ENV); + this->create_ec(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->create_supplier_admin(ACE_TRY_ENV); + this->create_supplier_admin(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->create_consumer_admin(ACE_TRY_ENV); + this->create_consumer_admin(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->destroy_consumer_admin(ACE_TRY_ENV); + this->destroy_consumer_admin(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->destroy_supplier_admin(ACE_TRY_ENV); + this->destroy_supplier_admin(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->destroy_ec(ACE_TRY_ENV); + this->destroy_ec(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } void -LifeCycleTest::create_ec(CORBA::Environment &ACE_TRY_ENV) +LifeCycleTest::create_ec(TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; CosNotification::QoSProperties initial_qos; @@ -128,8 +128,8 @@ LifeCycleTest::create_ec(CORBA::Environment &ACE_TRY_ENV) ec_ = notify_factory_->create_channel(initial_qos, initial_admin, - id, - ACE_TRY_ENV); + id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (ec_.in())) { @@ -143,13 +143,13 @@ LifeCycleTest::create_ec(CORBA::Environment &ACE_TRY_ENV) void -LifeCycleTest::create_supplier_admin(CORBA::Environment &ACE_TRY_ENV) +LifeCycleTest::create_supplier_admin(TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = CosNotifyChannelAdmin::OR_OP; - supplier_admin_ = ec_->new_for_suppliers (ifgop, adminid, ACE_TRY_ENV); + supplier_admin_ = ec_->new_for_suppliers (ifgop, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier_admin_.in())) { @@ -162,13 +162,13 @@ LifeCycleTest::create_supplier_admin(CORBA::Environment &ACE_TRY_ENV) } void -LifeCycleTest::create_consumer_admin(CORBA::Environment &ACE_TRY_ENV) +LifeCycleTest::create_consumer_admin(TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = CosNotifyChannelAdmin::OR_OP; - consumer_admin_ = ec_->new_for_consumers (ifgop, adminid, ACE_TRY_ENV); + consumer_admin_ = ec_->new_for_consumers (ifgop, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer_admin_.in())) { @@ -181,27 +181,27 @@ LifeCycleTest::create_consumer_admin(CORBA::Environment &ACE_TRY_ENV) } void -LifeCycleTest::destroy_supplier_admin(CORBA::Environment &ACE_TRY_ENV) +LifeCycleTest::destroy_supplier_admin(TAO_ENV_SINGLE_ARG_DECL) { - supplier_admin_->destroy(ACE_TRY_ENV); + supplier_admin_->destroy(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG((LM_DEBUG, "destroyed supplier admin\n")); } void -LifeCycleTest::destroy_consumer_admin(CORBA::Environment &ACE_TRY_ENV) +LifeCycleTest::destroy_consumer_admin(TAO_ENV_SINGLE_ARG_DECL) { - consumer_admin_->destroy(ACE_TRY_ENV); + consumer_admin_->destroy(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG((LM_DEBUG, "destroyed consumer admin\n")); } void -LifeCycleTest::destroy_ec(CORBA::Environment &ACE_TRY_ENV) +LifeCycleTest::destroy_ec(TAO_ENV_SINGLE_ARG_DECL) { - ec_->destroy(ACE_TRY_ENV); + ec_->destroy(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG((LM_DEBUG, "destroyed event channel\n")); } @@ -210,17 +210,17 @@ LifeCycleTest::destroy_ec(CORBA::Environment &ACE_TRY_ENV) int main(int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { LifeCycleTest test; test.parse_args (argc, argv); - test.init(argc, argv, ACE_TRY_ENV); + test.init(argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - test.run_test(ACE_TRY_ENV); + test.run_test(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH(CosNotification::UnsupportedAdmin, ex) diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.h b/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.h index bba9561b41b..2787eb2063c 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.h +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.h @@ -22,17 +22,17 @@ public: LifeCycleTest (void); ~LifeCycleTest (); - void init(int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV); - void run_test(CORBA::Environment &ACE_TRY_ENV); + void init(int argc, char *argv[] TAO_ENV_ARG_DECL); + void run_test(TAO_ENV_SINGLE_ARG_DECL); int parse_args(int argc, char *argv[]); private: - void create_ec(CORBA::Environment &ACE_TRY_ENV); - void create_supplier_admin(CORBA::Environment &ACE_TRY_ENV); - void create_consumer_admin(CORBA::Environment &ACE_TRY_ENV); - void destroy_ec(CORBA::Environment &ACE_TRY_ENV); - void destroy_supplier_admin(CORBA::Environment &ACE_TRY_ENV); - void destroy_consumer_admin(CORBA::Environment &ACE_TRY_ENV); + void create_ec(TAO_ENV_SINGLE_ARG_DECL); + void create_supplier_admin(TAO_ENV_SINGLE_ARG_DECL); + void create_consumer_admin(TAO_ENV_SINGLE_ARG_DECL); + void destroy_ec(TAO_ENV_SINGLE_ARG_DECL); + void destroy_supplier_admin(TAO_ENV_SINGLE_ARG_DECL); + void destroy_consumer_admin(TAO_ENV_SINGLE_ARG_DECL); CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_; CosNotifyChannelAdmin::EventChannel_var ec_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp index bc5a9d903ea..c41fef13020 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp @@ -14,7 +14,7 @@ Event_AnyPushConsumer::Event_AnyPushConsumer (Simple_Test *test_client) } void -Event_AnyPushConsumer::push (const CORBA::Any & data, CORBA::Environment &/*ACE_TRY_ENV*/) +Event_AnyPushConsumer::push (const CORBA::Any & data TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -50,48 +50,48 @@ Simple_Test::~Simple_Test () } void -Simple_Test::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_ENV) +Simple_Test::init (int argc, char* argv [] TAO_ENV_ARG_DECL) { // init base class - Notify_Test_Client::init (argc, argv, ACE_TRY_ENV); + Notify_Test_Client::init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create all participents ... - this->create_EC (ACE_TRY_ENV); + this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); consumer_ = new Event_AnyPushConsumer (this); - consumer_->init (root_poa_.in (), ACE_TRY_ENV); + consumer_->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_->connect (this->consumer_admin_.in (), ACE_TRY_ENV); + consumer_->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; Event_AnyPushConsumer* consumer2; consumer2 = new Event_AnyPushConsumer (this); - consumer2->init (root_poa_.in (), ACE_TRY_ENV); + consumer2->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer2->connect (this->consumer_admin_.in (), ACE_TRY_ENV); + consumer2->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; supplier_ = new Event_AnyPushSupplier (this); - supplier_->init (root_poa_.in (), ACE_TRY_ENV); + supplier_->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_->connect (this->supplier_admin_.in (), ACE_TRY_ENV); + supplier_->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the CA to receive all type of events @@ -103,7 +103,7 @@ Simple_Test::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_ENV) added[0].domain_name = CORBA::string_dup ("*"); added[0].type_name = CORBA::string_dup ("*"); - this->consumer_admin_->subscription_change (added, removed, ACE_TRY_ENV); + this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -141,14 +141,14 @@ Simple_Test::parse_args(int argc, char *argv[]) } void -Simple_Test::create_EC (CORBA::Environment &ACE_TRY_ENV) +Simple_Test::create_EC (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, - id, - ACE_TRY_ENV); + id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); @@ -163,14 +163,14 @@ Simple_Test::on_event_received (void) if (this->result_count_ == 2*this->event_count_) { - ACE_DECLARE_NEW_CORBA_ENV; - this->end_test (ACE_TRY_ENV); + TAO_ENV_DECLARE_NEW_ENV; + this->end_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } void -Simple_Test::run_test (CORBA::Environment &ACE_TRY_ENV) +Simple_Test::run_test (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Any data; @@ -178,23 +178,23 @@ Simple_Test::run_test (CORBA::Environment &ACE_TRY_ENV) { data <<= (CORBA::Long)i; - supplier_->send_event (data, ACE_TRY_ENV); + supplier_->send_event (data TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -Simple_Test::end_test (CORBA::Environment &ACE_TRY_ENV) +Simple_Test::end_test (TAO_ENV_SINGLE_ARG_DECL) { - this->shutdown (ACE_TRY_ENV); // break out of run + this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); // break out of run } int Simple_Test::check_results (void) { // Destroy the channel - ACE_DECLARE_NEW_CORBA_ENV; - this->ec_->destroy (ACE_TRY_ENV); + TAO_ENV_DECLARE_NEW_ENV; + this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (this->result_count_ == 2*this->event_count_) @@ -221,11 +221,11 @@ main (int argc, char* argv[]) ACE_TRY_NEW_ENV { - events.init (argc, argv, - ACE_TRY_ENV); //Init the Client + events.init (argc, argv + TAO_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; - events.run_test (ACE_TRY_ENV); + events.run_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; events.ORB_run (); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h index 403755e4367..3cd47fb83fa 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h @@ -39,8 +39,8 @@ public: // = PushSupplier methods virtual void push ( - const CORBA::Any & data, - CORBA::Environment &ACE_TRY_ENV + const CORBA::Any & data + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -77,23 +77,23 @@ public: int parse_args(int argc, char *argv[]) ; - void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + void init (int argc, char *argv [] TAO_ENV_ARG_DECL); // initialization. void on_event_received (void); // Called when an event is received. - void run_test (CORBA::Environment &ACE_TRY_ENV); + void run_test (TAO_ENV_SINGLE_ARG_DECL); // Run the test. - void end_test (CORBA::Environment &ACE_TRY_ENV); + void end_test (TAO_ENV_SINGLE_ARG_DECL); // End the test. int check_results (void); // check if we got the expected results. protected: - void create_EC (CORBA::Environment &ACE_TRY_ENV); + void create_EC (TAO_ENV_SINGLE_ARG_DECL); // Create EC ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp index f375cbc5464..84d8fdc0877 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp @@ -14,8 +14,8 @@ Update_StructuredPushConsumer::Update_StructuredPushConsumer (Updates *test_clie void Update_StructuredPushConsumer::offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -25,14 +25,14 @@ Update_StructuredPushConsumer::offer_change ( if (added.length () > 0) { test_client_->offers_added_ = added.length (); - this->test_client_->end_test (ACE_TRY_ENV); + this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (removed.length () > 0) { test_client_->offers_removed_ = removed.length (); - this->test_client_->end_test (ACE_TRY_ENV); + this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -51,8 +51,8 @@ Update_StructuredPushSupplier::~Update_StructuredPushSupplier () void Update_StructuredPushSupplier::subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -62,14 +62,14 @@ Update_StructuredPushSupplier::subscription_change ( if (added.length () > 0) { test_client_->subscriptions_added_ = added.length (); - this->test_client_->end_test (ACE_TRY_ENV); + this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (removed.length () > 0) { test_client_->subscriptions_removed_ = removed.length (); - this->test_client_->end_test (ACE_TRY_ENV); + this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -87,42 +87,42 @@ Updates::~Updates () } void -Updates::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_ENV) +Updates::init (int argc, char* argv [] TAO_ENV_ARG_DECL) { // init base class - Notify_Test_Client::init (argc, argv, ACE_TRY_ENV); + Notify_Test_Client::init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create all participents ... - this->create_EC (ACE_TRY_ENV); + this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); consumer_ = new Update_StructuredPushConsumer (this); - consumer_->init (root_poa_.in (), ACE_TRY_ENV); + consumer_->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_->connect (this->consumer_admin_.in (), ACE_TRY_ENV); + consumer_->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; supplier_ = new Update_StructuredPushSupplier (this); - supplier_->init (root_poa_.in (), ACE_TRY_ENV); + supplier_->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_->connect (this->supplier_admin_.in (), ACE_TRY_ENV); + supplier_->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -160,21 +160,21 @@ Updates::parse_args(int argc, char *argv[]) } void -Updates::create_EC (CORBA::Environment &ACE_TRY_ENV) +Updates::create_EC (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, - id, - ACE_TRY_ENV); + id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -Updates::run_test (CORBA::Environment &ACE_TRY_ENV) +Updates::run_test (TAO_ENV_SINGLE_ARG_DECL) { CosNotification::EventTypeSeq added (update_count_), removed (update_count_); added.length (update_count_); @@ -193,11 +193,11 @@ Updates::run_test (CORBA::Environment &ACE_TRY_ENV) } // test added - this->supplier_->get_proxy_consumer ()->offer_change (added, removed, ACE_TRY_ENV); + this->supplier_->get_proxy_consumer ()->offer_change (added, removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_->get_proxy_supplier ()->subscription_change (added, removed, - ACE_TRY_ENV); + this->consumer_->get_proxy_supplier ()->subscription_change (added, removed + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // test removed @@ -214,20 +214,20 @@ Updates::run_test (CORBA::Environment &ACE_TRY_ENV) removed[i].type_name = CORBA::string_dup (update_test_buf); } - this->supplier_->get_proxy_consumer ()->offer_change (added, removed, ACE_TRY_ENV); + this->supplier_->get_proxy_consumer ()->offer_change (added, removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_->get_proxy_supplier ()->subscription_change (added, removed, - ACE_TRY_ENV); + this->consumer_->get_proxy_supplier ()->subscription_change (added, removed + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Updates::end_test (CORBA::Environment &ACE_TRY_ENV) +Updates::end_test (TAO_ENV_SINGLE_ARG_DECL) { if (++this->result_count_ == 4) { - this->shutdown (ACE_TRY_ENV); + this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -236,8 +236,8 @@ int Updates::check_results (void) { // Destroy the channel - ACE_DECLARE_NEW_CORBA_ENV; - this->ec_->destroy (ACE_TRY_ENV); + TAO_ENV_DECLARE_NEW_ENV; + this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG((LM_DEBUG, "offers_added_ = %d, offers_removed_ = %d, subscriptions_added_= %d, subscriptions_removed_ = %d\n", @@ -267,11 +267,11 @@ main (int argc, char* argv[]) ACE_TRY_NEW_ENV { - updates.init (argc, argv, - ACE_TRY_ENV); //Init the Client + updates.init (argc, argv + TAO_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; - updates.run_test (ACE_TRY_ENV); + updates.run_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; updates.ORB_run (); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h index 501fad463f0..659194ebb61 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h @@ -38,8 +38,8 @@ public: virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -64,8 +64,8 @@ public: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -88,20 +88,20 @@ public: int parse_args(int argc, char *argv[]) ; - void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + void init (int argc, char *argv [] TAO_ENV_ARG_DECL); // initialization. - void run_test (CORBA::Environment &ACE_TRY_ENV); + void run_test (TAO_ENV_SINGLE_ARG_DECL); // Run the test. - void end_test (CORBA::Environment &ACE_TRY_ENV); + void end_test (TAO_ENV_SINGLE_ARG_DECL); // End the test. int check_results (void); // check if we got the expected results. protected: - void create_EC (CORBA::Environment &ACE_TRY_ENV); + void create_EC (TAO_ENV_SINGLE_ARG_DECL); // Create EC ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_; diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp index 59d648ee2c9..5546115643c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp @@ -18,40 +18,40 @@ TAO_Notify_PushConsumer::~TAO_Notify_PushConsumer () CosNotifyChannelAdmin::ProxyPushSupplier::_nil (); } -void TAO_Notify_PushConsumer::init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/) +void TAO_Notify_PushConsumer::init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL_NOT_USED) { this->default_POA_ = PortableServer::POA::_duplicate (poa); } PortableServer::POA_ptr -TAO_Notify_PushConsumer::_default_POA (CORBA::Environment &/*env*/) +TAO_Notify_PushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_Notify_PushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_PushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ - CosNotifyComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV); + CosNotifyComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = - consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, this->proxy_id_, ACE_TRY_ENV); + consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, this->proxy_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); // narrow this->supplier_proxy_ = - CosNotifyChannelAdmin::ProxyPushSupplier::_narrow (proxysupplier.in (), - ACE_TRY_ENV); + CosNotifyChannelAdmin::ProxyPushSupplier::_narrow (proxysupplier.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_proxy_.in ())); - this->supplier_proxy_->connect_any_push_consumer (objref.in (), - ACE_TRY_ENV); + this->supplier_proxy_->connect_any_push_consumer (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // give ownership to POA @@ -59,32 +59,35 @@ TAO_Notify_PushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consu } void -TAO_Notify_PushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_PushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) { PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_PushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_PushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { - this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_PushConsumer::offer_change (const CosNotification::EventTypeSeq &/*added*/, const CosNotification::EventTypeSeq &/*removed*/, CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_PushConsumer::offer_change + (const CosNotification::EventTypeSeq &/*added*/, + const CosNotification::EventTypeSeq &/*removed*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -94,7 +97,9 @@ TAO_Notify_PushConsumer::offer_change (const CosNotification::EventTypeSeq &/*ad } void -TAO_Notify_PushConsumer::push (const CORBA::Any & /*data*/, CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_PushConsumer::push + (const CORBA::Any & /*data*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -104,10 +109,10 @@ TAO_Notify_PushConsumer::push (const CORBA::Any & /*data*/, CORBA::Environment & } void -TAO_Notify_PushConsumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_PushConsumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h index f13fb64cca5..a936d5e2d27 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h @@ -51,21 +51,21 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_PushConsumer : public POA_CosNotifyComm: TAO_Notify_PushConsumer (void); // Constructor. - void init (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV); + void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); // Init - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV); + void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL); // Activates this object with the <default_POA_> // Creates a new proxy supplier and connects to it. - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. - void deactivate (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + void deactivate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Deactivate the object from the POA. // = ServantBase operations - virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: virtual ~TAO_Notify_PushConsumer (); @@ -74,9 +74,8 @@ protected: // = NotifyPublish method void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -84,8 +83,8 @@ protected: )); void push ( - const CORBA::Any & data, - CORBA::Environment &ACE_TRY_ENV + const CORBA::Any & data + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -94,7 +93,7 @@ protected: // The default operation is no op. void disconnect_push_consumer ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp index 98a33f33ebc..59ae4ad8fe5 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp @@ -18,33 +18,34 @@ TAO_Notify_PushSupplier::~TAO_Notify_PushSupplier () CosNotifyChannelAdmin::ProxyPushConsumer::_nil (); } -void TAO_Notify_PushSupplier::init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/) +void TAO_Notify_PushSupplier::init + (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL_NOT_USED) { this->default_POA_ = PortableServer::POA::_duplicate (poa); } void -TAO_Notify_PushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_PushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ - CosNotifyComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV); + CosNotifyComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = - supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::ANY_EVENT, this->my_id_, ACE_TRY_ENV); + supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::ANY_EVENT, this->my_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->consumer_proxy_ = - CosNotifyChannelAdmin::ProxyPushConsumer::_narrow (proxyconsumer.in (), - ACE_TRY_ENV); + CosNotifyChannelAdmin::ProxyPushConsumer::_narrow (proxyconsumer.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_proxy_.in ())); - this->consumer_proxy_->connect_any_push_supplier (objref.in (), - ACE_TRY_ENV); + this->consumer_proxy_->connect_any_push_supplier (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // give ownership to POA @@ -52,43 +53,46 @@ TAO_Notify_PushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr suppl } void -TAO_Notify_PushSupplier::send_event (const CORBA::Any & data, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_PushSupplier::send_event (const CORBA::Any & data TAO_ENV_ARG_DECL) { - this->consumer_proxy_->push (data, ACE_TRY_ENV); + this->consumer_proxy_->push (data TAO_ENV_ARG_PARAMETER); } void -TAO_Notify_PushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_PushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) { PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_PushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_PushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { - this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV); + this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_Notify_PushSupplier::_default_POA (CORBA::Environment& /* env */) +TAO_Notify_PushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* env */) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_Notify_PushSupplier::subscription_change (const CosNotification::EventTypeSeq &/*added*/, const CosNotification::EventTypeSeq &/*removed*/, CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_PushSupplier::subscription_change + (const CosNotification::EventTypeSeq &/*added*/, + const CosNotification::EventTypeSeq &/*removed*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -98,10 +102,10 @@ TAO_Notify_PushSupplier::subscription_change (const CosNotification::EventTypeSe } void -TAO_Notify_PushSupplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_PushSupplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h index 9d458bb61f8..b91dbbbf799 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h @@ -21,24 +21,24 @@ public: TAO_Notify_PushSupplier (void); // Constructor. - void init (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV); + void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); // Init - void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV); + void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL); // Activates this object with the <default_POA_> // Creates a new proxy consumer and connects to it. - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the consumer proxy. - void send_event (const CORBA::Any & data, CORBA::Environment &ACE_TRY_ENV); + void send_event (const CORBA::Any & data TAO_ENV_ARG_DECL); // Send the event to the channel. - void deactivate (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + void deactivate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Deactivate the object. // = ServantBase operations - virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); CosNotifyChannelAdmin::ProxyID my_id_; // This supplier's id. @@ -50,8 +50,8 @@ public: // = NotifySubscribe methods void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -59,7 +59,7 @@ public: )); void disconnect_push_supplier ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp index 9ff88819d37..9b6b0460f8c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp @@ -18,13 +18,14 @@ TAO_Notify_SequencePushConsumer::~TAO_Notify_SequencePushConsumer (void) CosNotifyChannelAdmin::SequenceProxyPushSupplier::_nil (); } -void TAO_Notify_SequencePushConsumer::init (PortableServer::POA_ptr poa, CORBA::Environment &/*ACE_TRY_ENV*/) +void TAO_Notify_SequencePushConsumer::init + (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL_NOT_USED) { this->default_POA_ = PortableServer::POA::_duplicate (poa); } PortableServer::POA_ptr -TAO_Notify_SequencePushConsumer::_default_POA (CORBA::Environment &/*env*/) +TAO_Notify_SequencePushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } @@ -37,60 +38,62 @@ TAO_Notify_SequencePushConsumer::get_proxy_supplier (void) } void -TAO_Notify_SequencePushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequencePushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ CosNotifyComm::SequencePushConsumer_var consumer_ref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = - consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_supplier_id_, ACE_TRY_ENV); + consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); // narrow this->proxy_supplier_ = CosNotifyChannelAdmin::SequenceProxyPushSupplier:: - _narrow (proxysupplier.in (), ACE_TRY_ENV); + _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); - proxy_supplier_->connect_sequence_push_consumer (consumer_ref.in (), - ACE_TRY_ENV); + proxy_supplier_->connect_sequence_push_consumer (consumer_ref.in () + TAO_ENV_ARG_PARAMETER); // give ownership to POA this->_remove_ref (); } void -TAO_Notify_SequencePushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequencePushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) { PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_SequencePushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequencePushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { - this->proxy_supplier_->disconnect_sequence_push_supplier(ACE_TRY_ENV); + this->proxy_supplier_->disconnect_sequence_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_SequencePushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/, CORBA::Environment & //ACE_TRY_ENV -) +TAO_Notify_SequencePushConsumer::offer_change + (const CosNotification::EventTypeSeq & /*added*/, + const CosNotification::EventTypeSeq & /*removed*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -100,16 +103,18 @@ TAO_Notify_SequencePushConsumer::offer_change (const CosNotification::EventTypeS } void -TAO_Notify_SequencePushConsumer::disconnect_sequence_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequencePushConsumer::disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_SequencePushConsumer:: push_structured_events (const CosNotification::EventBatch &/*notifications*/, CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_SequencePushConsumer::push_structured_events + (const CosNotification::EventBatch &/*notifications*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h index b6405abf4e6..c8a7effdd71 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h @@ -44,25 +44,25 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_SequencePushConsumer : public POA_CosNot TAO_Notify_SequencePushConsumer (void); // Constructor. - void init (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV); + void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); // Saves the POA ref. - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV); + void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL); // Activates this servant with the POA supplied in init. // Creates a new proxy supplier via the <consumer_admin> supplied and connects // to it. - virtual void disconnect (CORBA::Environment &ACE_TRY_ENV); + virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. - void deactivate (CORBA::Environment &ACE_TRY_ENV); + void deactivate (TAO_ENV_SINGLE_ARG_DECL); // Deactivate the object from the default POA. CosNotifyChannelAdmin::SequenceProxyPushSupplier_ptr get_proxy_supplier (void); // Accessor for <proxy_supplier_>. // = ServantBase operations - virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: // = Data Members CosNotifyChannelAdmin::SequenceProxyPushSupplier_var proxy_supplier_; @@ -80,8 +80,8 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -90,8 +90,8 @@ protected: // = SequencePushConsumer methods virtual void push_structured_events ( - const CosNotification::EventBatch & notifications, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventBatch & notifications + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -100,7 +100,7 @@ protected: // Default does nothing. virtual void disconnect_sequence_push_consumer ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp index 9559eb9e68a..0dc6672b483 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp @@ -19,7 +19,8 @@ TAO_Notify_SequencePushSupplier::~TAO_Notify_SequencePushSupplier () } void -TAO_Notify_SequencePushSupplier::init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/) +TAO_Notify_SequencePushSupplier::init + (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL_NOT_USED) { this->default_POA_ = PortableServer::POA::_duplicate (poa); } @@ -31,27 +32,27 @@ TAO_Notify_SequencePushSupplier::get_proxy_consumer (void) } void -TAO_Notify_SequencePushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequencePushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL) { CosNotifyComm::SequencePushSupplier_var supplier_ref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = - supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_consumer_id_, ACE_TRY_ENV); + supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->proxy_consumer_ = - CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow (proxyconsumer.in (), ACE_TRY_ENV); + CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); - proxy_consumer_->connect_sequence_push_supplier (supplier_ref.in (), - ACE_TRY_ENV); + proxy_consumer_->connect_sequence_push_supplier (supplier_ref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // give ownership to POA @@ -59,22 +60,21 @@ TAO_Notify_SequencePushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_p } void -TAO_Notify_SequencePushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequencePushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_sequence_push_consumer(ACE_TRY_ENV); + this->proxy_consumer_->disconnect_sequence_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_SequencePushSupplier::subscription_change ( - const CosNotification::EventTypeSeq & /*added*/, - const CosNotification::EventTypeSeq & /*removed */, - CORBA::Environment & //ACE_TRY_ENV - ) +TAO_Notify_SequencePushSupplier::subscription_change + (const CosNotification::EventTypeSeq & /*added*/, + const CosNotification::EventTypeSeq & /*removed */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -84,45 +84,45 @@ TAO_Notify_SequencePushSupplier::subscription_change ( } PortableServer::POA_ptr -TAO_Notify_SequencePushSupplier::_default_POA (CORBA::Environment& /* env */) +TAO_Notify_SequencePushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* env */) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_Notify_SequencePushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequencePushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) { PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_Notify_SequencePushSupplier::disconnect_sequence_push_supplier ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->proxy_consumer_->disconnect_sequence_push_consumer (ACE_TRY_ENV); + this->proxy_consumer_->disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_SequencePushSupplier::send_events (const CosNotification::EventBatch & notifications, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_SequencePushSupplier::send_events (const CosNotification::EventBatch & notifications TAO_ENV_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->push_structured_events (notifications, ACE_TRY_ENV); + this->proxy_consumer_->push_structured_events (notifications TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h index d2e5750296b..6f652397267 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h @@ -44,28 +44,28 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_SequencePushSupplier:public POA_CosNotif TAO_Notify_SequencePushSupplier (void); // Constructor. - void init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/); + void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); // Init - void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV); + void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL); // Activates this servant with the POA supplied in init. // Creates a new proxy supplier and connects to it. - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. - virtual void send_events (const CosNotification::EventBatch & notifications, - CORBA::Environment &ACE_TRY_ENV); + virtual void send_events (const CosNotification::EventBatch & notifications + TAO_ENV_ARG_DECL); // Send one event. CosNotifyChannelAdmin::SequenceProxyPushConsumer_ptr get_proxy_consumer (void); // Accessor for <proxy_consumer_>. - void deactivate (CORBA::Environment &ACE_TRY_ENV); + void deactivate (TAO_ENV_SINGLE_ARG_DECL); // Deactivate the object. // = ServantBase operations - virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: // = Data Members @@ -84,8 +84,8 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -94,7 +94,7 @@ protected: // = SequencePushSupplier method virtual void disconnect_sequence_push_supplier ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp index e5d45b87e82..7b661a374a8 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp @@ -24,13 +24,14 @@ TAO_Notify_StructuredPushConsumer::~TAO_Notify_StructuredPushConsumer (void) // @@ Carlos: The <connect> method will activate the servant with the supplied poa. // This is the contract for clients of this class. // -void TAO_Notify_StructuredPushConsumer::init (PortableServer::POA_ptr poa, CORBA::Environment &/*ACE_TRY_ENV*/) +void TAO_Notify_StructuredPushConsumer::init + (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL_NOT_USED) { this->default_POA_ = PortableServer::POA::_duplicate (poa); } PortableServer::POA_ptr -TAO_Notify_StructuredPushConsumer::_default_POA (CORBA::Environment &/*env*/) +TAO_Notify_StructuredPushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } @@ -43,60 +44,62 @@ TAO_Notify_StructuredPushConsumer::get_proxy_supplier (void) } void -TAO_Notify_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ CosNotifyComm::StructuredPushConsumer_var consumer_ref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = - consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_, ACE_TRY_ENV); + consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); // narrow this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier:: - _narrow (proxysupplier.in (), ACE_TRY_ENV); + _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); - proxy_supplier_->connect_structured_push_consumer (consumer_ref.in (), - ACE_TRY_ENV); + proxy_supplier_->connect_structured_push_consumer (consumer_ref.in () + TAO_ENV_ARG_PARAMETER); // give ownership to POA this->_remove_ref (); } void -TAO_Notify_StructuredPushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) { PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_Notify_StructuredPushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { - this->proxy_supplier_->disconnect_structured_push_supplier(ACE_TRY_ENV); + this->proxy_supplier_->disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/, CORBA::Environment & //ACE_TRY_ENV -) +TAO_Notify_StructuredPushConsumer::offer_change + (const CosNotification::EventTypeSeq & /*added*/, + const CosNotification::EventTypeSeq & /*removed*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -106,16 +109,19 @@ TAO_Notify_StructuredPushConsumer::offer_change (const CosNotification::EventTyp } void -TAO_Notify_StructuredPushConsumer::disconnect_structured_push_consumer (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredPushConsumer::disconnect_structured_push_consumer + (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_StructuredPushConsumer:: push_structured_event (const CosNotification::StructuredEvent &/*notification*/, CORBA::Environment &/*ACE_TRY_ENV*/) +TAO_Notify_StructuredPushConsumer::push_structured_event + (const CosNotification::StructuredEvent &/*notification*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h index 6d901251faf..9a8705f82d0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h @@ -44,25 +44,25 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_StructuredPushConsumer : public POA_CosN TAO_Notify_StructuredPushConsumer (void); // Constructor. - void init (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV); + void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); // Saves the POA ref. - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV); + void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL); // Activates this servant with the POA supplied in init. // Creates a new proxy supplier via the <consumer_admin> supplied and connects // to it. - virtual void disconnect (CORBA::Environment &ACE_TRY_ENV); + virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. - void deactivate (CORBA::Environment &ACE_TRY_ENV); + void deactivate (TAO_ENV_SINGLE_ARG_DECL); // Deactivate the object from the default POA. CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void); // Accessor for <proxy_supplier_>. // = ServantBase operations - virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: // = Data Members CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_; @@ -80,8 +80,8 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -90,8 +90,8 @@ protected: // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -100,7 +100,7 @@ protected: // Default does nothing. virtual void disconnect_structured_push_consumer ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp index 66ea97f7f7a..8e9081e8564 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp @@ -19,7 +19,8 @@ TAO_Notify_StructuredPushSupplier::~TAO_Notify_StructuredPushSupplier () } void -TAO_Notify_StructuredPushSupplier::init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/) +TAO_Notify_StructuredPushSupplier::init + (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL_NOT_USED) { this->default_POA_ = PortableServer::POA::_duplicate (poa); } @@ -31,27 +32,27 @@ TAO_Notify_StructuredPushSupplier::get_proxy_consumer (void) } void -TAO_Notify_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL) { CosNotifyComm::StructuredPushSupplier_var supplier_ref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = - supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_, ACE_TRY_ENV); + supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->proxy_consumer_ = - CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in (), ACE_TRY_ENV); + CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); - proxy_consumer_->connect_structured_push_supplier (supplier_ref.in (), - ACE_TRY_ENV); + proxy_consumer_->connect_structured_push_supplier (supplier_ref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // give ownership to POA @@ -59,22 +60,21 @@ TAO_Notify_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin } void -TAO_Notify_StructuredPushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_structured_push_consumer(ACE_TRY_ENV); + this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_StructuredPushSupplier::subscription_change ( - const CosNotification::EventTypeSeq & /*added*/, - const CosNotification::EventTypeSeq & /*removed */, - CORBA::Environment & //ACE_TRY_ENV - ) +TAO_Notify_StructuredPushSupplier::subscription_change + (const CosNotification::EventTypeSeq & /*added*/, + const CosNotification::EventTypeSeq & /*removed */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -84,45 +84,45 @@ TAO_Notify_StructuredPushSupplier::subscription_change ( } PortableServer::POA_ptr -TAO_Notify_StructuredPushSupplier::_default_POA (CORBA::Environment& /* env */) +TAO_Notify_StructuredPushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* env */) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_Notify_StructuredPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) { PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (this, - ACE_TRY_ENV); + poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), - ACE_TRY_ENV); + poa->deactivate_object (id.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_Notify_StructuredPushSupplier::disconnect_structured_push_supplier ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException )) { - this->proxy_consumer_->disconnect_structured_push_consumer (ACE_TRY_ENV); + this->proxy_consumer_->disconnect_structured_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->deactivate (ACE_TRY_ENV); + this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); } void -TAO_Notify_StructuredPushSupplier::send_event (const CosNotification::StructuredEvent& event, CORBA::Environment &ACE_TRY_ENV) +TAO_Notify_StructuredPushSupplier::send_event (const CosNotification::StructuredEvent& event TAO_ENV_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->push_structured_event (event, ACE_TRY_ENV); + this->proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h index 5516ed84b4c..df8f50407c5 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h @@ -44,28 +44,28 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_StructuredPushSupplier:public POA_CosNot TAO_Notify_StructuredPushSupplier (void); // Constructor. - void init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/); + void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL); // Init - void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV); + void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL); // Activates this servant with the POA supplied in init. // Creates a new proxy supplier and connects to it. - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. - virtual void send_event (const CosNotification::StructuredEvent& event, - CORBA::Environment &ACE_TRY_ENV); + virtual void send_event (const CosNotification::StructuredEvent& event + TAO_ENV_ARG_DECL); // Send one event. CosNotifyChannelAdmin::StructuredProxyPushConsumer_ptr get_proxy_consumer (void); // Accessor for <proxy_consumer_>. - void deactivate (CORBA::Environment &ACE_TRY_ENV); + void deactivate (TAO_ENV_SINGLE_ARG_DECL); // Deactivate the object. // = ServantBase operations - virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: // = Data Members @@ -84,8 +84,8 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -94,7 +94,7 @@ protected: // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp index 4fe0bcabd7c..bfefc4a4a1d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp @@ -19,30 +19,30 @@ Notify_Test_Client::~Notify_Test_Client () } void -Notify_Test_Client::init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV) +Notify_Test_Client::init (int argc, char *argv [] TAO_ENV_ARG_DECL) { - this->init_ORB (argc, argv, ACE_TRY_ENV); + this->init_ORB (argc, argv TAO_ENV_ARG_PARAMETER); ACE_CHECK; - this->resolve_naming_service (ACE_TRY_ENV); + this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->resolve_Notify_factory (ACE_TRY_ENV); + this->resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void Notify_Test_Client::init_ORB (int argc, - char *argv [], - CORBA::Environment &ACE_TRY_ENV) + char *argv [] + TAO_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_ptr poa_object = - this->orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object)) @@ -52,23 +52,23 @@ Notify_Test_Client::init_ORB (int argc, return; } this->root_poa_ = - PortableServer::POA::_narrow (poa_object, ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (ACE_TRY_ENV); + root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Notify_Test_Client::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) +Notify_Test_Client::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references (NAMING_SERVICE_NAME, - ACE_TRY_ENV); + this->orb_->resolve_initial_references (NAMING_SERVICE_NAME + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -76,25 +76,25 @@ Notify_Test_Client::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) ACE_THROW (CORBA::UNKNOWN ()); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Notify_Test_Client::resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV) +Notify_Test_Client::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME); CORBA::Object_var obj = - this->naming_context_->resolve (name, - ACE_TRY_ENV); + this->naming_context_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->notify_factory_ = - CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in (), - ACE_TRY_ENV); + CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -109,7 +109,7 @@ Notify_Test_Client::ORB_run (void) } void -Notify_Test_Client::shutdown (CORBA::Environment &/*ACE_TRY_ENV*/) +Notify_Test_Client::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { this->done_ = 1; } diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h index 4efcf103d49..ed7d79f16e9 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h @@ -33,23 +33,23 @@ class TAO_NOTIFY_TEST_Export Notify_Test_Client Notify_Test_Client (void); virtual ~Notify_Test_Client (); - virtual void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + virtual void init (int argc, char *argv [] TAO_ENV_ARG_DECL); // starts the orb and resolves the notify factory via a naming service. int ORB_run (void); // Call ORB::run to accept requests. - void shutdown (CORBA::Environment &ACE_TRY_ENV); + void shutdown (TAO_ENV_SINGLE_ARG_DECL); // Shutdown the ORB protected: - void init_ORB (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV); + void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); // Try to get hold of a running naming service. - void resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV); + void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL); // Try to resolve the Notify factory from the Naming service. // = Data Members diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp index 4407eed9915..33400229323 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -70,30 +70,30 @@ RedGreen_Test::~RedGreen_Test () } void -RedGreen_Test::init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test::init (int argc, char *argv [] TAO_ENV_ARG_DECL) { - init_ORB (argc, argv, ACE_TRY_ENV); + init_ORB (argc, argv TAO_ENV_ARG_PARAMETER); ACE_CHECK; - resolve_naming_service (ACE_TRY_ENV); + resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - resolve_Notify_factory (ACE_TRY_ENV); + resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_EC (ACE_TRY_ENV); + create_EC (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_supplieradmin (ACE_TRY_ENV); + create_supplieradmin (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumeradmin (ACE_TRY_ENV); + create_consumeradmin (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_consumers (ACE_TRY_ENV); + create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - create_suppliers (ACE_TRY_ENV); + create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -RedGreen_Test::run (CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test::run (TAO_ENV_SINGLE_ARG_DECL) { - this->send_events (ACE_TRY_ENV); + this->send_events (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; worker_.thr_mgr ()->wait (); @@ -108,18 +108,18 @@ RedGreen_Test::done (void) void RedGreen_Test::init_ORB (int argc, - char *argv [], - CORBA::Environment &ACE_TRY_ENV) + char *argv [] + TAO_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_ptr poa_object = - this->orb_->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + this->orb_->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object)) @@ -129,14 +129,14 @@ RedGreen_Test::init_ORB (int argc, return; } this->root_poa_ = - PortableServer::POA::_narrow (poa_object, ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object TAO_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (ACE_TRY_ENV); + root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; worker_.orb (this->orb_.in ()); @@ -148,11 +148,11 @@ RedGreen_Test::init_ORB (int argc, } void -RedGreen_Test::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references (NAMING_SERVICE_NAME, - ACE_TRY_ENV); + this->orb_->resolve_initial_references (NAMING_SERVICE_NAME + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Need to check return value for errors. @@ -160,91 +160,91 @@ RedGreen_Test::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV) ACE_THROW (CORBA::UNKNOWN ()); this->naming_context_ = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -RedGreen_Test::resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME); CORBA::Object_var obj = - this->naming_context_->resolve (name, - ACE_TRY_ENV); + this->naming_context_->resolve (name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->notify_factory_ = - CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in (), - ACE_TRY_ENV); + CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -RedGreen_Test::create_EC (CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test::create_EC (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, - id, - ACE_TRY_ENV); + id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -RedGreen_Test::create_supplieradmin (CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); } void -RedGreen_Test:: create_consumeradmin (CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::AdminID adminid; consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); } void -RedGreen_Test::create_consumers (CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test::create_consumers (TAO_ENV_SINGLE_ARG_DECL) { normal_consumer_ = new RedGreen_Test_StructuredPushConsumer (this); - normal_consumer_->connect (this->consumer_admin_.in (), - ACE_TRY_ENV); + normal_consumer_->connect (this->consumer_admin_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; slow_consumer_ = new SlowConsumer (this); - slow_consumer_->connect (this->consumer_admin_.in (), - ACE_TRY_ENV); + slow_consumer_->connect (this->consumer_admin_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -RedGreen_Test::create_suppliers (CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test::create_suppliers (TAO_ENV_SINGLE_ARG_DECL) { supplier_ = new RedGreen_Test_StructuredPushSupplier (); - supplier_->connect (this->supplier_admin_.in (), - ACE_TRY_ENV); + supplier_->connect (this->supplier_admin_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -RedGreen_Test::send_events (CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test::send_events (TAO_ENV_SINGLE_ARG_DECL) { // Setup the Consumer 1 to receive event_type : "DOMAIN_GREEN", "DOMAIN_GREEN" CosNotification::EventTypeSeq added_1(1); @@ -255,8 +255,8 @@ RedGreen_Test::send_events (CORBA::Environment &ACE_TRY_ENV) added_1.length (1); removed_1.length (0); - this->normal_consumer_->get_proxy_supplier ()->subscription_change (added_1, removed_1, - ACE_TRY_ENV); + this->normal_consumer_->get_proxy_supplier ()->subscription_change (added_1, removed_1 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the Consumer 2 to receive event_type : "DOMAIN_RED", "TYPE_RED" @@ -268,8 +268,8 @@ RedGreen_Test::send_events (CORBA::Environment &ACE_TRY_ENV) added_2.length (1); removed_2.length (0); - this->slow_consumer_->get_proxy_supplier ()->subscription_change (added_2, removed_2, - ACE_TRY_ENV); + this->slow_consumer_->get_proxy_supplier ()->subscription_change (added_2, removed_2 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Create the events - one of each type @@ -301,10 +301,10 @@ RedGreen_Test::send_events (CORBA::Environment &ACE_TRY_ENV) // let supplier 1 send all these events for (int i = 0; i < this->burst_size_; ++i) { - supplier_->send_event (red_event, ACE_TRY_ENV); + supplier_->send_event (red_event TAO_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_->send_event (green_event, ACE_TRY_ENV); + supplier_->send_event (green_event TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -365,15 +365,15 @@ RedGreen_Test_StructuredPushConsumer::dump_stats (const char* msg, ACE_UINT32 gs } void -RedGreen_Test_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL) { // Activate the consumer with the default_POA_ CosNotifyComm::StructuredPushConsumer_var objref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxySupplier_var proxysupplier = - consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_, ACE_TRY_ENV); + consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ())); @@ -381,27 +381,29 @@ RedGreen_Test_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAd // narrow this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier:: - _narrow (proxysupplier.in (), ACE_TRY_ENV); + _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); - proxy_supplier_->connect_structured_push_consumer (objref.in (), - ACE_TRY_ENV); + proxy_supplier_->connect_structured_push_consumer (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -RedGreen_Test_StructuredPushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { this->proxy_supplier_-> - disconnect_structured_push_supplier(ACE_TRY_ENV); + disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -RedGreen_Test_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/, CORBA::Environment & //ACE_TRY_ENV -) +RedGreen_Test_StructuredPushConsumer::offer_change + (const CosNotification::EventTypeSeq & /*added*/, + const CosNotification::EventTypeSeq & /*removed*/ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -411,7 +413,9 @@ RedGreen_Test_StructuredPushConsumer::offer_change (const CosNotification::Event } void -RedGreen_Test_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification, CORBA::Environment &/*ACE_TRY_ENV*/) +RedGreen_Test_StructuredPushConsumer::push_structured_event + (const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -451,7 +455,8 @@ RedGreen_Test_StructuredPushConsumer::push_structured_event (const CosNotificati } void -RedGreen_Test_StructuredPushConsumer::disconnect_structured_push_consumer (CORBA::Environment &/*ACE_TRY_ENV*/) +RedGreen_Test_StructuredPushConsumer::disconnect_structured_push_consumer + (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -476,8 +481,8 @@ SlowConsumer::SlowConsumer (RedGreen_Test* RedGreen_Test) void SlowConsumer::push_structured_event ( - const CosNotification::StructuredEvent & notification, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -487,7 +492,7 @@ SlowConsumer::push_structured_event ( // Slow it down ... ACE_OS::sleep (1); - RedGreen_Test_StructuredPushConsumer::push_structured_event (notification, ACE_TRY_ENV); + RedGreen_Test_StructuredPushConsumer::push_structured_event (notification TAO_ENV_ARG_PARAMETER); } /*****************************************************************/ @@ -513,41 +518,43 @@ RedGreen_Test_StructuredPushSupplier::dump_stats (const char* msg, ACE_UINT32 gs } void -RedGreen_Test_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL) { CosNotifyComm::StructuredPushSupplier_var objref = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer = - supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_, ACE_TRY_ENV); + supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ())); // narrow this->proxy_consumer_ = - CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in (), ACE_TRY_ENV); + CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ())); - proxy_consumer_->connect_structured_push_supplier (objref.in (), - ACE_TRY_ENV); + proxy_consumer_->connect_structured_push_supplier (objref.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -RedGreen_Test_StructuredPushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); - this->proxy_consumer_->disconnect_structured_push_consumer(ACE_TRY_ENV); + this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER); } void -RedGreen_Test_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */, CORBA::Environment & /*ACE_TRY_ENV*/ - ) +RedGreen_Test_StructuredPushSupplier::subscription_change + (const CosNotification::EventTypeSeq & /*added*/, + const CosNotification::EventTypeSeq & /*removed */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException, CosNotifyComm::InvalidEventType @@ -557,7 +564,7 @@ RedGreen_Test_StructuredPushSupplier::subscription_change (const CosNotification } void -RedGreen_Test_StructuredPushSupplier::send_event (CosNotification::StructuredEvent& event, CORBA::Environment &ACE_TRY_ENV) +RedGreen_Test_StructuredPushSupplier::send_event (CosNotification::StructuredEvent& event TAO_ENV_ARG_DECL) { event.filterable_data.length (1); event.filterable_data[0].name = CORBA::string_dup("latency_base"); @@ -570,7 +577,7 @@ RedGreen_Test_StructuredPushSupplier::send_event (CosNotification::StructuredEve start); // any event.filterable_data[0].value <<= latency_base; - proxy_consumer_->push_structured_event (event, ACE_TRY_ENV); + proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t end = ACE_OS::gethrtime (); @@ -581,7 +588,8 @@ RedGreen_Test_StructuredPushSupplier::send_event (CosNotification::StructuredEve } void -RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier (CORBA::Environment &/*ACE_TRY_ENV*/) +RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier + (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index 1be06a52b22..529134d0773 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -52,15 +52,15 @@ public: virtual int svc (void); // The thread entry point. - void done (void); - // set done flag. + void done (void); + // set done flag. private: CORBA::ORB_var orb_; // The orb - CORBA::Boolean done_; - // Flag to tell that we're done servicing. + CORBA::Boolean done_; + // Flag to tell that we're done servicing. }; class RedGreen_Test @@ -79,10 +79,10 @@ class RedGreen_Test void dump_results (void); - void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + void init (int argc, char *argv [] TAO_ENV_ARG_DECL); // Init the Client. - void run (CORBA::Environment &ACE_TRY_ENV); + void run (TAO_ENV_SINGLE_ARG_DECL); // Run the demo. void done (void); @@ -94,31 +94,31 @@ class RedGreen_Test int nthreads_; protected: - void init_ORB (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL); // Initializes the ORB. - void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV); + void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); // Try to get hold of a running naming service. - void resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV); + void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL); // Try to resolve the Notify factory from the Naming service. - void create_EC (CORBA::Environment &ACE_TRY_ENV); + void create_EC (TAO_ENV_SINGLE_ARG_DECL); // Create an EC. - void create_supplieradmin(CORBA::Environment &ACE_TRY_ENV); + void create_supplieradmin(TAO_ENV_SINGLE_ARG_DECL); // Create the Supplier Admin. - void create_consumeradmin (CORBA::Environment &ACE_TRY_ENV); + void create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL); // Create the Consumer Admin. - void create_consumers (CORBA::Environment &ACE_TRY_ENV); + void create_consumers (TAO_ENV_SINGLE_ARG_DECL); // Create and initialize the consumers. - void create_suppliers (CORBA::Environment &ACE_TRY_ENV); + void create_suppliers (TAO_ENV_SINGLE_ARG_DECL); // create and initialize the suppliers. - void send_events (CORBA::Environment &ACE_TRY_ENV); + void send_events (TAO_ENV_SINGLE_ARG_DECL); // send the events. // = Data Members @@ -173,11 +173,11 @@ class RedGreen_Test_StructuredPushConsumer : public POA_CosNotifyComm::Structure RedGreen_Test_StructuredPushConsumer (RedGreen_Test* RedGreen_Test); // Constructor. - void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV); + void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL); // Connect the Consumer to the EventChannel. // Creates a new proxy supplier and connects to it. - virtual void disconnect (CORBA::Environment &ACE_TRY_ENV); + virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void); @@ -215,8 +215,8 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -225,8 +225,8 @@ protected: // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -234,7 +234,7 @@ protected: )); virtual void disconnect_structured_push_consumer ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException @@ -249,8 +249,8 @@ public: SlowConsumer (RedGreen_Test* RedGreen_Test); virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -273,16 +273,16 @@ class RedGreen_Test_StructuredPushSupplier : public POA_CosNotifyComm::Structure RedGreen_Test_StructuredPushSupplier (void); // Constructor. - void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, - CORBA::Environment &ACE_TRY_ENV); + void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin + TAO_ENV_ARG_DECL); // Connect the Supplier to the EventChannel. // Creates a new proxy supplier and connects to it. - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); // Disconnect from the supplier. - virtual void send_event (CosNotification::StructuredEvent& event, - CORBA::Environment &ACE_TRY_ENV); + virtual void send_event (CosNotification::StructuredEvent& event + TAO_ENV_ARG_DECL); // Send one event. void accumulate_into (ACE_Throughput_Stats &throughput) const; @@ -309,8 +309,8 @@ protected: // = NotifyRedGreen_Test virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::EventTypeSeq & removed + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -319,7 +319,7 @@ protected: // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier ( - CORBA::Environment &ACE_TRY_ENV + TAO_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp index 34716eacf32..78216136b95 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp @@ -14,11 +14,11 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { - client.init (argc, argv, - ACE_TRY_ENV); //Init the Client + client.init (argc, argv + TAO_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; - client.run (ACE_TRY_ENV); + client.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 42acc73fe89..ba0367da876 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -36,7 +36,9 @@ Throughput_StructuredPushConsumer::dump_stats (const char* msg, ACE_UINT32 gsf) } void -Throughput_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification, CORBA::Environment &/*ACE_TRY_ENV*/) +Throughput_StructuredPushConsumer::push_structured_event + (const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, CosEventComm::Disconnected @@ -71,10 +73,9 @@ Throughput_StructuredPushConsumer::push_structured_event (const CosNotification: ACE_DEBUG ((LM_DEBUG,"(%P)(%t) event count = %d\n", this->push_count_)); - ACE_DECLARE_NEW_CORBA_ENV; test_client_->g_consumer_done_count++; if (test_client_->g_consumer_done_count.value () >= test_client_->expected_count_) - test_client_->end_test (ACE_TRY_ENV); + test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER); } @@ -139,7 +140,7 @@ Throughput_StructuredPushSupplier::svc (void) // The "remainder_of_body" carries a flag that indicates shutdown. // 0 - no, 1 = yes for shutdown. - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; this->throughput_start_ = ACE_OS::gethrtime (); @@ -155,7 +156,7 @@ Throughput_StructuredPushSupplier::svc (void) // any event.filterable_data[0].value <<= Throughput_base; - this->proxy_consumer_->push_structured_event (event, ACE_TRY_ENV); + this->proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_hrtime_t end = ACE_OS::gethrtime (); @@ -175,7 +176,7 @@ Throughput_StructuredPushSupplier::svc (void) start); event.filterable_data[0].value <<= Throughput_base; - this->proxy_consumer_->push_structured_event (event, ACE_TRY_ENV); + this->proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); test_client_->g_consumer_done_count++; @@ -202,7 +203,7 @@ Notify_Throughput::~Notify_Throughput () } void -Notify_Throughput::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_ENV) +Notify_Throughput::init (int argc, char* argv [] TAO_ENV_ARG_DECL) { expected_count_ = burst_count_*burst_size_*supplier_count_*consumer_count_; @@ -210,7 +211,7 @@ Notify_Throughput::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_EN ACE_DEBUG ((LM_DEBUG, "expected count = %d\n", expected_count_)); // init base class - Notify_Test_Client::init_ORB (argc, argv, ACE_TRY_ENV); + Notify_Test_Client::init_ORB (argc, argv TAO_ENV_ARG_PARAMETER); ACE_CHECK; worker_.orb (this->orb_.in ()); @@ -220,19 +221,19 @@ Notify_Throughput::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_EN ACE_ERROR ((LM_ERROR, "Cannot activate client threads\n")); // Create all participents ... - this->create_EC (ACE_TRY_ENV); + this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV); + ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); @@ -247,9 +248,9 @@ Notify_Throughput::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_EN for (i = 0; i < this->consumer_count_; ++i) { consumers_[i] = new Throughput_StructuredPushConsumer (this); - consumers_[i]->init (root_poa_.in (), ACE_TRY_ENV); + consumers_[i]->init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - consumers_[i]->connect (this->consumer_admin_.in (), ACE_TRY_ENV); + consumers_[i]->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -257,9 +258,9 @@ Notify_Throughput::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_EN { suppliers_[i] = new Throughput_StructuredPushSupplier (this); suppliers_[i]-> - TAO_Notify_StructuredPushSupplier::init (root_poa_.in (), ACE_TRY_ENV); + TAO_Notify_StructuredPushSupplier::init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - suppliers_[i]->connect (this->supplier_admin_.in (), ACE_TRY_ENV); + suppliers_[i]->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -274,7 +275,7 @@ Notify_Throughput::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_EN added[0].domain_name = CORBA::string_dup ("*"); added[0].type_name = CORBA::string_dup ("*"); - this->consumer_admin_->subscription_change (added, removed, ACE_TRY_ENV); + this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -350,22 +351,22 @@ Notify_Throughput::parse_args(int argc, char *argv[]) } void -Notify_Throughput::create_EC (CORBA::Environment &ACE_TRY_ENV) +Notify_Throughput::create_EC (TAO_ENV_SINGLE_ARG_DECL) { if (this->colocated_ec_ == 1) { this->notify_factory_ = - TAO_Notify_EventChannelFactory_i::create (this->root_poa_.in (), - ACE_TRY_ENV); + TAO_Notify_EventChannelFactory_i::create (this->root_poa_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ())); } else { - this->resolve_naming_service (ACE_TRY_ENV); + this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->resolve_Notify_factory (ACE_TRY_ENV); + this->resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -373,15 +374,15 @@ Notify_Throughput::create_EC (CORBA::Environment &ACE_TRY_ENV) ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, - id, - ACE_TRY_ENV); + id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -Notify_Throughput::run_test (CORBA::Environment &ACE_TRY_ENV) +Notify_Throughput::run_test (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "colocated_ec_ %d ," @@ -402,7 +403,7 @@ Notify_Throughput::run_test (CORBA::Environment &ACE_TRY_ENV) for (int i = 0; i < this->supplier_count_; ++i) { suppliers_[i]-> - TAO_Notify_StructuredPushSupplier::init (root_poa_.in (), ACE_TRY_ENV); + TAO_Notify_StructuredPushSupplier::init (root_poa_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (suppliers_[i]->activate (THR_NEW_LWP | THR_JOINABLE) != 0) @@ -416,12 +417,12 @@ Notify_Throughput::run_test (CORBA::Environment &ACE_TRY_ENV) } void -Notify_Throughput::end_test (CORBA::Environment &ACE_TRY_ENV) +Notify_Throughput::end_test (TAO_ENV_SINGLE_ARG_DECL) { dump_results (); ACE_DEBUG ((LM_DEBUG, "calling shutdown\n")); - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); } @@ -470,14 +471,14 @@ main (int argc, char* argv[]) ACE_TRY_NEW_ENV { - events.init (argc, argv, - ACE_TRY_ENV); //Init the Client + events.init (argc, argv + TAO_ENV_ARG_PARAMETER); //Init the Client ACE_TRY_CHECK; - events.run_test (ACE_TRY_ENV); + events.run_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - events.end_test (ACE_TRY_ENV); + events.end_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ue) diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h index 16b67a6c4d7..6f8caa80147 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h @@ -64,8 +64,8 @@ public: // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification, - CORBA::Environment &ACE_TRY_ENV + const CosNotification::StructuredEvent & notification + TAO_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -138,13 +138,13 @@ public: int parse_args(int argc, char *argv[]) ; - void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV); + void init (int argc, char *argv [] TAO_ENV_ARG_DECL); // initialization. - void run_test (CORBA::Environment &ACE_TRY_ENV); + void run_test (TAO_ENV_SINGLE_ARG_DECL); // Run the test. - void end_test (CORBA::Environment &ACE_TRY_ENV); + void end_test (TAO_ENV_SINGLE_ARG_DECL); // End the test. void dump_results (void); @@ -152,7 +152,7 @@ public: Worker worker_; protected: - void create_EC (CORBA::Environment &ACE_TRY_ENV); + void create_EC (TAO_ENV_SINGLE_ARG_DECL); // Create participants. ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_; diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp index 9e6fd9eaeda..f578d7fc690 100644 --- a/TAO/orbsvcs/tests/Property/client.cpp +++ b/TAO/orbsvcs/tests/Property/client.cpp @@ -27,13 +27,13 @@ ACE_RCSID(CosPropertyService, client, "$Id$") int Client::init (int argc, - char *argv[], - CORBA::Environment &ACE_TRY_ENV) + char *argv[] + TAO_ENV_ARG_DECL) { // Init the ORB. manager_.init (argc, - argv, - ACE_TRY_ENV); + argv + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Initialize the naming services @@ -48,12 +48,12 @@ Client::init (int argc, CosNaming::Name propsetdef_name (1); propsetdef_name.length (1); propsetdef_name [0].id = CORBA::string_dup ("PropertySetDef"); - CORBA::Object_var propsetdef_obj = my_name_client_->resolve (propsetdef_name, - ACE_TRY_ENV); + CORBA::Object_var propsetdef_obj = my_name_client_->resolve (propsetdef_name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - this->propsetdef_ = CosPropertyService::PropertySetDef::_narrow (propsetdef_obj.in (), - ACE_TRY_ENV); + this->propsetdef_ = CosPropertyService::PropertySetDef::_narrow (propsetdef_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->propsetdef_.in ())) @@ -67,62 +67,62 @@ Client::init (int argc, // Testing the methods of the property service. int -Client::property_tester (CORBA::Environment &ACE_TRY_ENV) +Client::property_tester (TAO_ENV_SINGLE_ARG_DECL) { // = Testing PropertySet & Iterators. // Testing define_property () of PropertySet interface. - this->test_define_property (ACE_TRY_ENV); + this->test_define_property (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Test the number of properties. - this->test_get_number_of_properties (ACE_TRY_ENV); + this->test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Testing get_all_property_names. - this->test_get_all_property_names (ACE_TRY_ENV); + this->test_get_all_property_names (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Test get_property_value. - this->test_get_property_value (ACE_TRY_ENV); + this->test_get_property_value (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Testing delete property. - this->test_delete_property ("no_property",ACE_TRY_ENV); + this->test_delete_property ("no_property" TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Testing get_properties. - this->test_get_properties (ACE_TRY_ENV); + this->test_get_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Testing delete_properties. - this->test_delete_properties (ACE_TRY_ENV); + this->test_delete_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Test the number of properties. - this->test_get_number_of_properties (ACE_TRY_ENV); + this->test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Testing define_properties. - this->test_define_properties (ACE_TRY_ENV); + this->test_define_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Test the number of properties. - this->test_get_number_of_properties (ACE_TRY_ENV); + this->test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Testing get_all_property_names. - this->test_get_all_property_names (ACE_TRY_ENV); + this->test_get_all_property_names (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Testing get_all_properties. - this->test_get_all_properties (ACE_TRY_ENV); + this->test_get_all_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // = Testing PropertySetDef & Iterators. // Testing define_property_with_mode. - this->test_define_property_with_mode (ACE_TRY_ENV); + this->test_define_property_with_mode (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -131,7 +131,7 @@ Client::property_tester (CORBA::Environment &ACE_TRY_ENV) // Testing define_property. int -Client::test_define_property (CORBA::Environment &ACE_TRY_ENV) +Client::test_define_property (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Any anyval; @@ -142,8 +142,8 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV) anyval >>= CORBA::Any::to_char (ch); this->propsetdef_->define_property ("char_property", - anyval, - ACE_TRY_ENV); + anyval + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Prepare a Short and "define" that in the PropertySet. @@ -153,8 +153,8 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV) anyval >>= s; propsetdef_->define_property ("short_property", - anyval, - ACE_TRY_ENV); + anyval + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Prepare a Long and "define" that in the PropertySet. @@ -164,8 +164,8 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV) anyval >>= l; CORBA::Any newany(anyval); propsetdef_->define_property ("long_property", - anyval, - ACE_TRY_ENV); + anyval + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Prepare a Float and "define" that in the PropertySet. @@ -175,8 +175,8 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV) anyval >>= f; propsetdef_->define_property ("float_property", - anyval, - ACE_TRY_ENV); + anyval + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -186,8 +186,8 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV) const char * newstr; anyval >>= newstr; propsetdef_->define_property ("string_property", - anyval, - ACE_TRY_ENV); + anyval + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -197,11 +197,11 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV) // Testing get_all_property_names of the PropertySet. int -Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV) +Client::test_get_all_property_names (TAO_ENV_SINGLE_ARG_DECL) { // Get the size. CORBA::ULong num_of_properties = - propsetdef_->get_number_of_properties (ACE_TRY_ENV); + propsetdef_->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get half on the names and half of on the iterator. @@ -219,8 +219,8 @@ Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV) propsetdef_->get_all_property_names (how_many, names_out, - iterator_out, - ACE_TRY_ENV); + iterator_out + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get the values back to var. @@ -249,7 +249,7 @@ Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV) CosPropertyService::PropertyName_out name_out (name_ptr); // Call the function. - CORBA::Boolean next_one_result = iterator_var->next_one (name_out, ACE_TRY_ENV); + CORBA::Boolean next_one_result = iterator_var->next_one (name_out TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get the values back on a _var variable. @@ -260,7 +260,7 @@ Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, "%s\n", name_var.in ())); // Call the function to iterate again. - next_one_result = iterator_var->next_one (name_out, ACE_TRY_ENV); + next_one_result = iterator_var->next_one (name_out TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get the values back on a _var variable. @@ -277,7 +277,7 @@ Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV) // properties. int -Client::test_get_properties (CORBA::Environment &ACE_TRY_ENV) +Client::test_get_properties (TAO_ENV_SINGLE_ARG_DECL) { // Get float_property, string_property and no_property. If return // value is false and type is tc_void then that name is not there in @@ -303,8 +303,8 @@ Client::test_get_properties (CORBA::Environment &ACE_TRY_ENV) // Get the properties. CORBA::Boolean return_val = propsetdef_->get_properties (names.in (), - properties_out, - ACE_TRY_ENV); + properties_out + TAO_ENV_ARG_PARAMETER); ACE_UNUSED_ARG (return_val); ACE_CHECK_RETURN (-1); @@ -369,9 +369,9 @@ Client::test_get_properties (CORBA::Environment &ACE_TRY_ENV) // Testing, get_number_of_properties. int -Client::test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV) +Client::test_get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL) { - CORBA::ULong nproperties = this->propsetdef_->get_number_of_properties (ACE_TRY_ENV); + CORBA::ULong nproperties = this->propsetdef_->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (TAO_debug_level > 0) @@ -386,15 +386,15 @@ Client::test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV) // Test delete_property. int -Client::test_delete_property (const char *property_name, - CORBA::Environment &ACE_TRY_ENV) +Client::test_delete_property (const char *property_name + TAO_ENV_ARG_DECL) { ACE_TRY { CORBA::String_var property_name_var (property_name); - this->propsetdef_->delete_property (property_name_var.in (), - ACE_TRY_ENV); + this->propsetdef_->delete_property (property_name_var.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::UserException, ex) @@ -419,7 +419,7 @@ Client::test_delete_property (const char *property_name, // properties. int -Client::test_delete_properties (CORBA::Environment &ACE_TRY_ENV) +Client::test_delete_properties (TAO_ENV_SINGLE_ARG_DECL) { CosPropertyService::PropertyNames prop_names; prop_names.length (3); @@ -427,8 +427,8 @@ Client::test_delete_properties (CORBA::Environment &ACE_TRY_ENV) prop_names [1] = CORBA::string_dup ("short_property"); prop_names [2] = CORBA::string_dup ("long_property"); // prop_names [3] = CORBA::string_dup ("no_property"); - this->propsetdef_->delete_properties (prop_names, - ACE_TRY_ENV); + this->propsetdef_->delete_properties (prop_names + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( 0); return 0; @@ -438,7 +438,7 @@ Client::test_delete_properties (CORBA::Environment &ACE_TRY_ENV) // float in the property set. int -Client::test_define_properties (CORBA::Environment &ACE_TRY_ENV) +Client::test_define_properties (TAO_ENV_SINGLE_ARG_DECL) { CosPropertyService::Properties nproperties; nproperties.length (4); @@ -476,7 +476,7 @@ Client::test_define_properties (CORBA::Environment &ACE_TRY_ENV) nproperties[3].property_value <<= f; // Define this sequence of properties now. - this->propsetdef_->define_properties (nproperties, ACE_TRY_ENV); + this->propsetdef_->define_properties (nproperties TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( -1); return 0; @@ -485,11 +485,11 @@ Client::test_define_properties (CORBA::Environment &ACE_TRY_ENV) // Test get_all_properties. int -Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV) +Client::test_get_all_properties (TAO_ENV_SINGLE_ARG_DECL) { // Get the number of current properties. CORBA::ULong num_of_properties = - this->propsetdef_->get_number_of_properties (ACE_TRY_ENV); + this->propsetdef_->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN ( -1); ACE_UNUSED_ARG (num_of_properties); @@ -504,8 +504,8 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV) propsetdef_->get_all_properties (how_many, properties_out, - iterator_out, - ACE_TRY_ENV); + iterator_out + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( -1); // Get these values to the _var's. @@ -561,8 +561,8 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV) CosPropertyService::Property_out property_out (property_ptr); // Call the funtion. - CORBA::Boolean next_one_result = iterator->next_one (property_out, - ACE_TRY_ENV); + CORBA::Boolean next_one_result = iterator->next_one (property_out + TAO_ENV_ARG_PARAMETER); // Get the value to the _var variable. CosPropertyService::Property_var property = property_out.ptr (); @@ -611,8 +611,8 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV) } // Call the function for the next iteraton. - next_one_result = iterator->next_one (property_out, - ACE_TRY_ENV); + next_one_result = iterator->next_one (property_out + TAO_ENV_ARG_PARAMETER); // Get the value to the _var variable. property = property_out.ptr (); @@ -626,7 +626,7 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV) // Testing define property with mode. // Defines char, short, long and float properties with different modes. int -Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV) +Client::test_define_property_with_mode (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Any anyval; @@ -638,8 +638,8 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV) this->propsetdef_->define_property_with_mode ("char_property", anyval, - CosPropertyService::normal, - ACE_TRY_ENV); + CosPropertyService::normal + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Prepare a Short and "define" that in the PropertySet. @@ -650,8 +650,8 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV) propsetdef_->define_property_with_mode ("short_property", anyval, - CosPropertyService::read_only, - ACE_TRY_ENV); + CosPropertyService::read_only + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Prepare a Long and "define" that in the PropertySet. @@ -662,8 +662,8 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV) CORBA::Any newany(anyval); propsetdef_->define_property_with_mode ("long_property", anyval, - CosPropertyService::fixed_normal, - ACE_TRY_ENV); + CosPropertyService::fixed_normal + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( -1); @@ -674,8 +674,8 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV) anyval >>= f; propsetdef_->define_property_with_mode ("float_property", anyval, - CosPropertyService::fixed_readonly, - ACE_TRY_ENV); + CosPropertyService::fixed_readonly + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( -1); // Prepare a String and "define" that in the PropertySet. @@ -685,21 +685,21 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV) anyval >>= newstr; propsetdef_->define_property ("string_property", - anyval, - ACE_TRY_ENV); + anyval + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( -1); return 0; } int -Client::test_get_property_value (CORBA::Environment &ACE_TRY_ENV) +Client::test_get_property_value (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY { // Get the ior property. - CORBA::Any_ptr any_ptr = this->propsetdef_->get_property_value ("PropertySetDef_IOR", - ACE_TRY_ENV); + CORBA::Any_ptr any_ptr = this->propsetdef_->get_property_value ("PropertySetDef_IOR" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check whether the IOR is fine. @@ -707,8 +707,8 @@ Client::test_get_property_value (CORBA::Environment &ACE_TRY_ENV) (*any_ptr) >>= CORBA::Any::to_object (propsetdef_object.out ()); CosPropertyService::PropertySetDef_var propsetdef = - CosPropertyService::PropertySetDef::_narrow (propsetdef_object.in (), - ACE_TRY_ENV); + CosPropertyService::PropertySetDef::_narrow (propsetdef_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (propsetdef.in ())) @@ -730,20 +730,20 @@ Client::test_get_property_value (CORBA::Environment &ACE_TRY_ENV) int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { Client client; if (client.init (argc, - argv, - ACE_TRY_ENV) == -1) + argv + TAO_ENV_ARG_PARAMETER) == -1) return 1; ACE_TRY_CHECK; - // client.run (ACE_TRY_ENV); - int ret = client.property_tester (ACE_TRY_ENV); + // client.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int ret = client.property_tester (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ret != 0) ACE_DEBUG ((LM_DEBUG, "Test failed\n")); diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h index bd4952c64b1..95934187979 100644 --- a/TAO/orbsvcs/tests/Property/client.h +++ b/TAO/orbsvcs/tests/Property/client.h @@ -45,53 +45,53 @@ public: // Constructor. int init (int argc, - char **argv, - CORBA::Environment &ACE_TRY_ENV); + char **argv + TAO_ENV_ARG_DECL); // Initialize the ORB etc, and bind the MMDevices. - int run (CORBA::Environment &ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL); // Run the client. This will call StreamCtrl::bind_devs. - int property_tester (CORBA::Environment &ACE_TRY_ENV); + int property_tester (TAO_ENV_SINGLE_ARG_DECL); // Testing the property service methods. protected: int bind_to_remote_mmdevice (int argc, - char *argv[], - CORBA::Environment &ACE_TRY_ENV); + char *argv[] + TAO_ENV_ARG_DECL); // Bind to the remote MMDevice. // = Property Testing. - int test_define_property (CORBA::Environment &ACE_TRY_ENV); + int test_define_property (TAO_ENV_SINGLE_ARG_DECL); // Testing the define property method. - int test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV); + int test_get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL); // Testing the number of properties, currently in the Property Set. - int test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV); + int test_get_all_property_names (TAO_ENV_SINGLE_ARG_DECL); //Testing get_all_property_names. - int test_get_property_value (CORBA::Environment &ACE_TRY_ENV); + int test_get_property_value (TAO_ENV_SINGLE_ARG_DECL); // Testing get_property_value. - int test_get_properties (CORBA::Environment &ACE_TRY_ENV); + int test_get_properties (TAO_ENV_SINGLE_ARG_DECL); //Testing get_properties. Give the names and get their properties. - int test_get_all_properties (CORBA::Environment &ACE_TRY_ENV); + int test_get_all_properties (TAO_ENV_SINGLE_ARG_DECL); // Testing get_all_properties. - int test_delete_property (const char *property_name, - CORBA::Environment &ACE_TRY_ENV); + int test_delete_property (const char *property_name + TAO_ENV_ARG_DECL); // Testing delete_property. - int test_delete_properties (CORBA::Environment &ACE_TRY_ENV); + int test_delete_properties (TAO_ENV_SINGLE_ARG_DECL); // Testing delete_properties. - int test_define_properties (CORBA::Environment &ACE_TRY_ENV); + int test_define_properties (TAO_ENV_SINGLE_ARG_DECL); // Defining a sequence of properties. - int test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV); + int test_define_property_with_mode (TAO_ENV_SINGLE_ARG_DECL); // Defines properties with various modes. TAO_ORB_Manager manager_; diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp index c6410361fde..d9aa1ef279b 100644 --- a/TAO/orbsvcs/tests/Property/main.cpp +++ b/TAO/orbsvcs/tests/Property/main.cpp @@ -40,31 +40,31 @@ public: ~TAO_PropertySet_Tester (void); // Destructor. - int test_define_property (CORBA::Environment &ACE_TRY_ENV); + int test_define_property (TAO_ENV_SINGLE_ARG_DECL); // Defines a char,a short, a long, a float and a string property. - int test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV); + int test_get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL); // Gets the number of properties currently defined in the PropertySet. - int test_delete_property (const char *property_name, - CORBA::Environment &ACE_TRY_ENV); + int test_delete_property (const char *property_name + TAO_ENV_ARG_DECL); // Delete a given property. - int test_is_property_defined (CORBA::Environment &ACE_TRY_ENV); + int test_is_property_defined (TAO_ENV_SINGLE_ARG_DECL); // Check the following properties are defined or // no. "char_property", "short_property" and a "string_property". - int test_get_property_value (CORBA::Environment &ACE_TRY_ENV); + int test_get_property_value (TAO_ENV_SINGLE_ARG_DECL); // Get the "float_property" and "string_property" and print them // out. - int test_delete_properties (CORBA::Environment &ACE_TRY_ENV); + int test_delete_properties (TAO_ENV_SINGLE_ARG_DECL); // Delete char, short,long, and string properties. - int test_delete_all_properties (CORBA::Environment &ACE_TRY_ENV); + int test_delete_all_properties (TAO_ENV_SINGLE_ARG_DECL); // Delete all the properties. - int test_define_properties (CORBA::Environment &ACE_TRY_ENV); + int test_define_properties (TAO_ENV_SINGLE_ARG_DECL); // Define a sequence of properties. a char, a short, a long, a float // and a string. @@ -89,14 +89,14 @@ public: ~TAO_PropertyNamesIterator_Tester (void); // Destructor. - int test_next_one (CORBA::Environment &ACE_TRY_ENV); + int test_next_one (TAO_ENV_SINGLE_ARG_DECL); // Test next one method. Iterate thru all the names in the // PropertySet and print them out. - int test_reset (CORBA::Environment &ACE_TRY_ENV); + int test_reset (TAO_ENV_SINGLE_ARG_DECL); // Test the reset method. - int test_next_n (size_t n, CORBA::Environment &ACE_TRY_ENV); + int test_next_n (size_t n TAO_ENV_ARG_DECL); // Test the next_n method. private: TAO_PropertyNamesIterator iterator_; @@ -116,7 +116,7 @@ TAO_PropertySet_Tester::~TAO_PropertySet_Tester (void) // Defines a char, a short, a long, a float and a string. int -TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySet_Tester::test_define_property (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "\nChecking define_property\n")); @@ -132,8 +132,8 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV) "Main : Char ch = %c\n", ch)); property_set_.define_property ("char_property", - anyval, - ACE_TRY_ENV); + anyval + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( 1); // Prepare a Short and "define" that in the PropertySet. @@ -145,8 +145,8 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV) "Main : Short s = %d\n", s)); property_set_.define_property ("short_property", - anyval, - ACE_TRY_ENV); + anyval + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( 1); @@ -161,8 +161,8 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV) CORBA::Any newany(anyval); property_set_.define_property ("long_property", - anyval, - ACE_TRY_ENV); + anyval + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( 1); // Prepare a Float and "define" that in the PropertySet. @@ -174,8 +174,8 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV) "Main : Float f = %f\n", f)); property_set_.define_property ("float_property", - anyval, - ACE_TRY_ENV); + anyval + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( 1); // Prepare a String and "define" that in the PropertySet. @@ -190,8 +190,8 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV) strvar.in (), newstr)); property_set_.define_property ("string_property", - anyval, - ACE_TRY_ENV); + anyval + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( 1); return 0; @@ -199,11 +199,11 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV) // Testing, get_number_of_properties. int -TAO_PropertySet_Tester::test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySet_Tester::test_get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Main : Number of props : %d\n", - property_set_.get_number_of_properties (ACE_TRY_ENV))); + property_set_.get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER))); ACE_CHECK_RETURN ( 1); return 0; @@ -212,12 +212,12 @@ TAO_PropertySet_Tester::test_get_number_of_properties (CORBA::Environment &ACE_T // Testing the delete_property. Delets property, with the given name, // if that exsists. int -TAO_PropertySet_Tester::test_delete_property (const char *property_name, - CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySet_Tester::test_delete_property (const char *property_name + TAO_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "\nChecking delete_property\n")); - property_set_.delete_property (property_name, - ACE_TRY_ENV); + property_set_.delete_property (property_name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( 1); return 0; @@ -226,13 +226,13 @@ TAO_PropertySet_Tester::test_delete_property (const char *property_name, // Gets the value of "short_property" and "string_property". int -TAO_PropertySet_Tester::test_get_property_value (CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySet_Tester::test_get_property_value (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "\nChecking get_property_value\n")); - CORBA::Any_ptr anyptr = property_set_.get_property_value ("short_property", - ACE_TRY_ENV); + CORBA::Any_ptr anyptr = property_set_.get_property_value ("short_property" + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( 1); // Get the short value. @@ -248,8 +248,8 @@ TAO_PropertySet_Tester::test_get_property_value (CORBA::Environment &ACE_TRY_ENV ACE_DEBUG ((LM_DEBUG, "Short property not found\n")); // Get the string. - anyptr = property_set_.get_property_value ("string_property", - ACE_TRY_ENV); + anyptr = property_set_.get_property_value ("string_property" + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( 1); if (anyptr != 0) { @@ -268,28 +268,28 @@ TAO_PropertySet_Tester::test_get_property_value (CORBA::Environment &ACE_TRY_ENV // "string_property" and "char_property". int -TAO_PropertySet_Tester::test_is_property_defined (CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySet_Tester::test_is_property_defined (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "\nChecking is_property_defined ()\n")); - if (property_set_.is_property_defined ("short_property", - ACE_TRY_ENV) == 0) + if (property_set_.is_property_defined ("short_property" + TAO_ENV_ARG_PARAMETER) == 0) ACE_DEBUG ((LM_DEBUG, "short_property not defined\n")); else ACE_DEBUG ((LM_DEBUG, "short_property defined\n")); ACE_CHECK_RETURN ( 1); - if (property_set_.is_property_defined ("string_property", - ACE_TRY_ENV) == 0) + if (property_set_.is_property_defined ("string_property" + TAO_ENV_ARG_PARAMETER) == 0) ACE_DEBUG ((LM_DEBUG, "string_property not defined\n")); else ACE_DEBUG ((LM_DEBUG, "string_property defined\n")); ACE_CHECK_RETURN ( 1); - if (property_set_.is_property_defined ("char_property", - ACE_TRY_ENV) == 0) + if (property_set_.is_property_defined ("char_property" + TAO_ENV_ARG_PARAMETER) == 0) ACE_DEBUG ((LM_DEBUG, "char_property not defined\n")); else @@ -304,7 +304,7 @@ TAO_PropertySet_Tester::test_is_property_defined (CORBA::Environment &ACE_TRY_EN // PropertySet. Deleting char, short, long, float and string // properties. int -TAO_PropertySet_Tester::test_delete_properties (CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySet_Tester::test_delete_properties (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "\nChecking delete_properties == Deleting a sequence of Properties\n")); @@ -318,8 +318,8 @@ TAO_PropertySet_Tester::test_delete_properties (CORBA::Environment &ACE_TRY_ENV) "Length of sequence %d, Maxlength : %d\n", prop_names.length (), prop_names.maximum ())); - property_set_.delete_properties (prop_names, - ACE_TRY_ENV); + property_set_.delete_properties (prop_names + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( 0); return 0; @@ -328,7 +328,7 @@ TAO_PropertySet_Tester::test_delete_properties (CORBA::Environment &ACE_TRY_ENV) // Defines a sequnce of properties containing, char, short, long, // float and string property in the property set. int -TAO_PropertySet_Tester::test_define_properties (CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySet_Tester::test_define_properties (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "\nChecking define_properties == Defining sequence of properties\n")); @@ -376,7 +376,7 @@ TAO_PropertySet_Tester::test_define_properties (CORBA::Environment &ACE_TRY_ENV) nproperties[4].property_value <<= strvar.in (); // Define this sequence of properties now. - property_set_.define_properties (nproperties, ACE_TRY_ENV); + property_set_.define_properties (nproperties TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN ( 1); return 0; @@ -384,12 +384,12 @@ TAO_PropertySet_Tester::test_define_properties (CORBA::Environment &ACE_TRY_ENV) // Delete all the properties. int -TAO_PropertySet_Tester::test_delete_all_properties (CORBA::Environment &ACE_TRY_ENV) +TAO_PropertySet_Tester::test_delete_all_properties (TAO_ENV_SINGLE_ARG_DECL) { // Deleting all the properties ACE_DEBUG ((LM_DEBUG, "\nChecking delete_all_properties\n")); - int ret = property_set_.delete_all_properties (ACE_TRY_ENV); + int ret = property_set_.delete_all_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ret == 1) ACE_DEBUG ((LM_DEBUG, @@ -414,18 +414,18 @@ TAO_PropertyNamesIterator_Tester::~TAO_PropertyNamesIterator_Tester (void) // Test next one method. Iterate thru all the names in the // PropertySet and print them out. int -TAO_PropertyNamesIterator_Tester::test_next_one (CORBA::Environment &ACE_TRY_ENV) +TAO_PropertyNamesIterator_Tester::test_next_one (TAO_ENV_SINGLE_ARG_DECL) { CORBA::String_var strvar; ACE_DEBUG ((LM_DEBUG, "\nTesting next_one of NamesIterator, Iterating thru names.\n")); // Let us iterate, now. - int ret = iterator_.next_one (strvar.out (), ACE_TRY_ENV); + int ret = iterator_.next_one (strvar.out () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (1); while (ret != 0) { ACE_DEBUG ((LM_DEBUG, "Str : %s\n", strvar.in ())); - ret = iterator_.next_one (strvar.out (), ACE_TRY_ENV); + ret = iterator_.next_one (strvar.out () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (1); } return 0; @@ -433,25 +433,25 @@ TAO_PropertyNamesIterator_Tester::test_next_one (CORBA::Environment &ACE_TRY_ENV // Reset the names iterator. int -TAO_PropertyNamesIterator_Tester::test_reset (CORBA::Environment &ACE_TRY_ENV) +TAO_PropertyNamesIterator_Tester::test_reset (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Resetting (reset ()) the NamesIterator.")); - iterator_.reset (ACE_TRY_ENV); + iterator_.reset (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN ( 1); return 0; } // Test the next_n method. Get the next n names and print them all. int -TAO_PropertyNamesIterator_Tester::test_next_n (size_t n, - CORBA::Environment &ACE_TRY_ENV) +TAO_PropertyNamesIterator_Tester::test_next_n (size_t n + TAO_ENV_ARG_DECL) { CosPropertyService::PropertyNames_var pnames_var; ACE_DEBUG ((LM_DEBUG, "Checking next_n (), next %d\n", n)); - int ret = iterator_.next_n (n, pnames_var.out (), ACE_TRY_ENV); + int ret = iterator_.next_n (n, pnames_var.out () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (1); if (ret == 0) { @@ -474,8 +474,8 @@ main (int argc, char *argv []) { CORBA::ORB_var orb_var = CORBA::ORB_init (argc, argv, - "internet", - ACE_TRY_ENV); + "internet" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // = Checking PropertySet interface. @@ -486,57 +486,57 @@ main (int argc, char *argv []) // Checking define_property. define a char, a short,a long, a float // and a string. - propertyset_tester.test_define_property (ACE_TRY_ENV); + propertyset_tester.test_define_property (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Test the number of properties and print it out. - propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV); + propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Test delete property. Delete "string_property" - propertyset_tester.test_delete_property ("string_property", ACE_TRY_ENV); + propertyset_tester.test_delete_property ("string_property" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Test the number of properties and print it out. - propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV); + propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Test delete_properties. Delete char, short, long and float. - propertyset_tester.test_delete_properties (ACE_TRY_ENV); + propertyset_tester.test_delete_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Test the number of properties and print it out. - propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV); + propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Define a sequence of properties. char, short, long, float and // string. - propertyset_tester.test_define_properties (ACE_TRY_ENV); + propertyset_tester.test_define_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Test the number of properties and print it out. - propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV); + propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Checking get_property_value. get the value of short and string. - propertyset_tester.test_get_property_value (ACE_TRY_ENV); + propertyset_tester.test_get_property_value (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Checking delete_all_properties. - propertyset_tester.test_delete_all_properties (ACE_TRY_ENV); + propertyset_tester.test_delete_all_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Test the number of properties and print it out. - propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV); + propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Define a sequence of properties. char, short, long, float and // string. - propertyset_tester.test_define_properties (ACE_TRY_ENV); + propertyset_tester.test_define_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Test the number of properties and print it out. - propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV); + propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // = Checking the PropertyNamesIterator interface. @@ -548,37 +548,37 @@ main (int argc, char *argv []) TAO_PropertyNamesIterator_Tester names_iterator_tester (propertyset_tester); // Checking next_one. Iterate thru the property names. - names_iterator_tester.test_next_one (ACE_TRY_ENV); + names_iterator_tester.test_next_one (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Checking the reset () method. - names_iterator_tester.test_reset (ACE_TRY_ENV); + names_iterator_tester.test_reset (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Iterating again thru the property names. - names_iterator_tester.test_next_one (ACE_TRY_ENV); + names_iterator_tester.test_next_one (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Reset again. - names_iterator_tester.test_reset (ACE_TRY_ENV); + names_iterator_tester.test_reset (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Checking next_n. Prints out all the names it has got. - names_iterator_tester.test_next_n (6, ACE_TRY_ENV); + names_iterator_tester.test_next_n (6 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try next_n without resetting. - names_iterator_tester.test_next_n (6, ACE_TRY_ENV); + names_iterator_tester.test_next_n (6 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) { - ACE_TRY_ENV.print_exception ("System Exception"); + TAO_ENV_ARG_PARAMETER.print_exception ("System Exception"); return -1; } ACE_CATCH (CORBA::UserException, userex) { - ACE_TRY_ENV.print_exception ("User Exception"); + TAO_ENV_ARG_PARAMETER.print_exception ("User Exception"); return -1; } ACE_ENDTRY; diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp index b23ecdb1fea..12eac84b999 100644 --- a/TAO/orbsvcs/tests/Property/server.cpp +++ b/TAO/orbsvcs/tests/Property/server.cpp @@ -25,8 +25,8 @@ ACE_RCSID(CosPropertyService, server, "$Id$") int main (int argc, char ** argv) { - ACE_DECLARE_NEW_CORBA_ENV; - + TAO_ENV_DECLARE_NEW_ENV; + ACE_TRY { TAO_ORB_Manager m; @@ -34,72 +34,72 @@ main (int argc, char ** argv) // Initialize the ORB. m.init_child_poa (argc, argv, - "child_poa", - ACE_TRY_ENV); + "child_poa" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Using naming server. TAO_Naming_Client my_name_client; if (my_name_client.init (m.orb ()) < 0) return 1; - + // Create PropertySetDef object and register. TAO_PropertySetDef *propsetdef_impl; ACE_NEW_RETURN (propsetdef_impl, TAO_PropertySetDef, -1); CosPropertyService::PropertySetDef_var propsetdef = - propsetdef_impl->_this (ACE_TRY_ENV); + propsetdef_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name propsetdef_name (1); propsetdef_name.length (1); propsetdef_name[0].id = CORBA::string_dup ("PropertySetDef"); my_name_client->bind (propsetdef_name, - propsetdef.in (), - ACE_TRY_ENV); + propsetdef.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any any_val; // Make this IOR as one of the properties in there. - any_val <<= propsetdef_impl->_this (ACE_TRY_ENV); + any_val <<= propsetdef_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Object_var ior = propsetdef_impl->_this (ACE_TRY_ENV); + CORBA::Object_var ior = propsetdef_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_ptr ior_ptr = ior.in (); any_val <<= ior_ptr; // any_val.replace (CORBA::_tc_Object, // &ior_ptr, - // 1, - // ACE_TRY_ENV); + // 1 + // TAO_ENV_ARG_PARAMETER); // ACE_TRY_CHECK; - + propsetdef_impl->define_property_with_mode ("PropertySetDef_IOR", any_val, - CosPropertyService::fixed_readonly, - ACE_TRY_ENV); + CosPropertyService::fixed_readonly + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + // Create PropertySet factory and then register. TAO_PropertySetFactory *propset_factory_impl; ACE_NEW_RETURN (propset_factory_impl, TAO_PropertySetFactory, -1); CosPropertyService::PropertySetFactory_var propset_factory = - propset_factory_impl->_this (ACE_TRY_ENV); + propset_factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name propset_factory_name (1); propset_factory_name.length (1); propset_factory_name[0].id = CORBA::string_dup ("PropertySetFactory"); my_name_client->bind (propset_factory_name, - propset_factory.in (), - ACE_TRY_ENV); + propset_factory.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB Event loop. - m.run (ACE_TRY_ENV); + m.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp index a4df4e07ba5..28c3e09023c 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp @@ -322,11 +322,11 @@ main (int argc, char *argv[]) { // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil(poa_object.in ())) @@ -335,14 +335,14 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in(), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in() TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the naming services @@ -368,8 +368,8 @@ main (int argc, char *argv[]) { // create the RT_Info config_infos[i].handle = - ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point, - ACE_TRY_ENV); + ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // initialize the RT_Info @@ -383,8 +383,8 @@ main (int argc, char *argv[]) ACE_static_cast (RtecScheduler::Importance_t, config_infos[i].importance), config_infos[i].quantum, config_infos[i].threads, - ACE_static_cast (RtecScheduler::Info_Type_t, config_infos[i].info_type), - ACE_TRY_ENV); + ACE_static_cast (RtecScheduler::Info_Type_t, config_infos[i].info_type) + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // make operations in second half dependant on @@ -396,8 +396,8 @@ main (int argc, char *argv[]) add_dependency (config_infos[i].handle, config_infos[i - (operation_count / 2)].handle, 2, // number of calls - RtecBase::ONE_WAY_CALL, // type of dependency - ACE_TRY_ENV); + RtecBase::ONE_WAY_CALL // type of dependency + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -425,14 +425,16 @@ main (int argc, char *argv[]) ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos_out, configs_out, anomalies_out, ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check + infos_out, configs_out, anomalies_out + TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check #else /* ! __SUNPRO_CC */ ACE_Scheduler_Factory::server ()->compute_scheduling (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos.out (), configs.out (), anomalies.out (), ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check + infos.out (), configs.out (), anomalies.out () + TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check #endif /* ! __SUNPRO_CC */ ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp index e86e9d3c2b3..88a9c87d98a 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp @@ -194,11 +194,11 @@ main (int argc, char *argv[]) { // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil(poa_object.in ())) @@ -207,11 +207,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in(), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in() TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the naming services @@ -237,8 +237,8 @@ main (int argc, char *argv[]) { // create the RT_Info config_infos[i].handle = - ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point, - ACE_TRY_ENV); + ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // initialize the RT_Info @@ -255,8 +255,8 @@ main (int argc, char *argv[]) config_infos[i].quantum, config_infos[i].threads, ACE_static_cast (RtecScheduler::Info_Type_t, - config_infos[i].info_type), - ACE_TRY_ENV); + config_infos[i].info_type) + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -267,7 +267,7 @@ main (int argc, char *argv[]) config_infos[0].handle, 1, // number of calls RtecBase::ONE_WAY_CALL, // type of dependency - ACE_TRY_ENV); + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // register dependency of consumer that will have unresolved remote @@ -277,7 +277,7 @@ main (int argc, char *argv[]) config_infos[2].handle, 1, // number of calls RtecBase::ONE_WAY_CALL, // type of dependency - ACE_TRY_ENV); + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -288,7 +288,7 @@ main (int argc, char *argv[]) config_infos[4].handle, 1, // number of calls RtecBase::ONE_WAY_CALL, // type of dependency - ACE_TRY_ENV); + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -299,7 +299,7 @@ main (int argc, char *argv[]) config_infos[0].handle, 1, // number of calls RtecBase::ONE_WAY_CALL, // type of dependency - ACE_TRY_ENV); + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Scheduler_Factory::server ()-> @@ -307,7 +307,7 @@ main (int argc, char *argv[]) config_infos[2].handle, 1, // number of calls RtecBase::ONE_WAY_CALL, // type of dependency - ACE_TRY_ENV); + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Scheduler_Factory::server ()-> @@ -315,7 +315,7 @@ main (int argc, char *argv[]) config_infos[4].handle, 1, // number of calls RtecBase::ONE_WAY_CALL, // type of dependency - ACE_TRY_ENV); + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register dependencies on each of the other consumers by second @@ -326,7 +326,7 @@ main (int argc, char *argv[]) config_infos[1].handle, 1, // number of calls RtecBase::ONE_WAY_CALL, // type of dependency - ACE_TRY_ENV); + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Scheduler_Factory::server ()-> @@ -334,7 +334,7 @@ main (int argc, char *argv[]) config_infos[3].handle, 1, // number of calls RtecBase::ONE_WAY_CALL, // type of dependency - ACE_TRY_ENV); + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Scheduler_Factory::server ()-> @@ -342,7 +342,7 @@ main (int argc, char *argv[]) config_infos[5].handle, 1, // number of calls RtecBase::ONE_WAY_CALL, // type of dependency - ACE_TRY_ENV); + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Scheduler_Factory::server ()-> @@ -350,7 +350,7 @@ main (int argc, char *argv[]) config_infos[6].handle, 1, // number of calls RtecBase::ONE_WAY_CALL, // type of dependency - ACE_TRY_ENV); + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecScheduler::RT_Info_Set_var infos; @@ -376,14 +376,14 @@ main (int argc, char *argv[]) ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos_out, configs_out, anomalies_out, ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check + infos_out, configs_out, anomalies_out TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check #else /* ! __SUNPRO_CC */ ACE_Scheduler_Factory::server ()->compute_scheduling (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos.out (), configs.out (), anomalies.out (), ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check + infos.out (), configs.out (), anomalies.out () TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check #endif /* ! __SUNPRO_CC */ ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp index a6744d42c5f..90e248ce9fd 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp @@ -24,11 +24,11 @@ main (int argc, char *argv[]) { // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil(poa_object.in ())) @@ -37,14 +37,14 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in(), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in() TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Store a pointer to the local run-time scheduler. @@ -63,19 +63,19 @@ main (int argc, char *argv[]) // Make sure the correct handle is returned by the // run-time scheduler's create and lookup methods. ACE_ASSERT (infos [i].handle == - runtime_scheduler->create (infos [i].entry_point, - ACE_TRY_ENV)); + runtime_scheduler->create (infos [i].entry_point + TAO_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; ACE_ASSERT (infos [i].handle == - runtime_scheduler->lookup (infos [i].entry_point, - ACE_TRY_ENV)); + runtime_scheduler->lookup (infos [i].entry_point + TAO_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; // Make sure the values in the RT_Info returned by get are OK. delete rt_info; - rt_info = runtime_scheduler->get (infos [i].handle, - ACE_TRY_ENV); + rt_info = runtime_scheduler->get (infos [i].handle + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT (rt_info != 0); @@ -122,16 +122,16 @@ main (int argc, char *argv[]) infos [i].quantum, infos [i].threads, ACE_static_cast (RtecScheduler::Info_Type_t, - infos [i].info_type), - ACE_TRY_ENV); + infos [i].info_type) + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Make sure the correct priority values are returned. runtime_scheduler->priority (infos [i].handle, priority, subpriority, - p_priority, - ACE_TRY_ENV); + p_priority + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT (priority == infos [i].priority); @@ -140,8 +140,8 @@ main (int argc, char *argv[]) runtime_scheduler->entry_point_priority (infos [i].entry_point, priority, subpriority, - p_priority, - ACE_TRY_ENV); + p_priority + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT (priority == infos [i].priority); @@ -158,8 +158,8 @@ main (int argc, char *argv[]) runtime_scheduler-> dispatch_configuration (configs [j].preemption_priority, priority, - dispatching_type, - ACE_TRY_ENV); + dispatching_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT (priority == configs [j].thread_priority); diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp index 0747ca1a3ee..8428a57369a 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp @@ -19,8 +19,8 @@ TX_Object_i::~TX_Object_i (void) } void -TX_Object_i::send (const DataSeq & data, - CORBA::Environment & /* ACE_TRY_ENV */) +TX_Object_i::send (const DataSeq & data + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->data_ = data; @@ -31,8 +31,8 @@ TX_Object_i::send (const DataSeq & data, } void -TX_Object_i::recv (DataSeq_out data, - CORBA::Environment &ACE_TRY_ENV) +TX_Object_i::recv (DataSeq_out data + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_THROW_EX (data, @@ -48,8 +48,8 @@ TX_Object_i::recv (DataSeq_out data, } void -TX_Object_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +TX_Object_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h index dd49762157f..df9720482f0 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h +++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h @@ -33,18 +33,15 @@ public: // Destructor virtual ~TX_Object_i (void); - virtual void send (const DataSeq & data, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void send (const DataSeq & data + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void recv (DataSeq_out data, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void recv (DataSeq_out data + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp index 74fbd9e11d4..80c2b156565 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp @@ -41,14 +41,14 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) return 1; CORBA::Object_var obj = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (obj.in ())) @@ -57,7 +57,7 @@ main (int argc, char *argv[]) -1); TX_Object_var txObject = - TX_Object::_narrow (obj.in (), ACE_TRY_ENV); + TX_Object::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DataSeq data_input; @@ -74,19 +74,19 @@ main (int argc, char *argv[]) "Sending octet sequence of length:\t%u\n", data_input.length())); - txObject->send (data_input, ACE_TRY_ENV); + txObject->send (data_input TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DataSeq_var data_output; - txObject->recv (data_output.out (), ACE_TRY_ENV); + txObject->recv (data_output.out () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Received octet sequence of length:\t%u\n", data_output->length())); - txObject->shutdown (ACE_TRY_ENV); + txObject->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Sanity check diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp index 54ed08d79ec..2b5bfd756b3 100644 --- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp +++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp @@ -23,13 +23,13 @@ parse_args (int argc, char *argv[]) switch (c) { case 'o': - ior_output_file = get_opts.optarg; - break; + ior_output_file = get_opts.optarg; + break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "Usage: %s " - "-o <iorfile>" + "-o <iorfile>" "\n", argv [0]), -1); @@ -46,22 +46,22 @@ main (int argc, char * argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poaObj = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var rootPoa = - PortableServer::POA::_narrow (poaObj.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poaObj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - rootPoa->the_POAManager (ACE_TRY_ENV); + rootPoa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) @@ -69,39 +69,39 @@ main (int argc, char * argv[]) TX_Object_i implObject (orb.in ()); - TX_Object_var txObject = implObject._this (ACE_TRY_ENV); + TX_Object_var txObject = implObject._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (txObject.in (), ACE_TRY_ENV); + orb->object_to_string (txObject.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); // If the ior_output_file exists, output the ior to it. if (ior_output_file != 0) - { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s\n", - ior_output_file), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - } - - orb->run (ACE_TRY_ENV); + { + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s\n", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + } + + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\n" "Event loop finished.\n")); - rootPoa->destroy (1, 1, ACE_TRY_ENV); + rootPoa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp index 166445e286f..b4ea8515927 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp @@ -11,7 +11,7 @@ Client_Worker::Client_Worker (Simple_Server_ptr server, } void -Client_Worker::validate_connection (CORBA::Environment &ACE_TRY_ENV) +Client_Worker::validate_connection (TAO_ENV_SINGLE_ARG_DECL) { // Ping the object 100 times, ignoring all exceptions. // It would be better to use validate_connection() but the test must @@ -21,7 +21,7 @@ Client_Worker::validate_connection (CORBA::Environment &ACE_TRY_ENV) { ACE_TRY { - this->server_->test_method (j, ACE_TRY_ENV); + this->server_->test_method (j TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if(TAO_debug_level > 0) ACE_DEBUG (( LM_DEBUG, @@ -37,17 +37,17 @@ Client_Worker::validate_connection (CORBA::Environment &ACE_TRY_ENV) int Client_Worker::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Validate connections befire doing any actual work.. - this->validate_connection (ACE_TRY_ENV); + this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (int i = 0; i < this->niterations_; ++i) { - this->server_->test_method (i, ACE_TRY_ENV); + this->server_->test_method (i TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h index e4e4da436ec..3324b086ffc 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h @@ -45,7 +45,7 @@ public: // thread entry point private: - void validate_connection (CORBA::Environment &); + void validate_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); // Validate the connection private: diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp index 6709ae95527..e0e9030be77 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp @@ -12,7 +12,7 @@ Server_Worker::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp index 71b307d1757..a99610317c7 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp @@ -53,12 +53,12 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -66,12 +66,12 @@ main (int argc, char *argv[]) // Get Object Reference using IOR file CORBA::Object_var object = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Cast to Appropriate Type Simple_Server_var server = - Simple_Server::_narrow (object.in (), ACE_TRY_ENV); + Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -97,12 +97,12 @@ main (int argc, char *argv[]) // Shut down the server if -x option given in command line if (do_shutdown) { - server->shutdown (ACE_TRY_ENV); + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // Destroying the ORB.. - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp index c1e27ecb3f8..189e4ea5804 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp @@ -41,16 +41,16 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -60,11 +60,11 @@ main (int argc, char *argv[]) // Get a Root POA reference PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -73,11 +73,11 @@ main (int argc, char *argv[]) Simple_Server_i server_impl (orb.in ()); Simple_Server_var server = - server_impl._this (ACE_TRY_ENV); + server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in (), ACE_TRY_ENV); + orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -95,7 +95,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Server_Worker worker (orb.in ()); diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp index c0810d5df9e..cd3bc2abbc3 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp @@ -10,7 +10,7 @@ ACE_RCSID(MT_Server, test_i, "$Id$") CORBA::Long -Simple_Server_i::test_method (CORBA::Long x, CORBA::Environment&) +Simple_Server_i::test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) @@ -21,8 +21,8 @@ Simple_Server_i::test_method (CORBA::Long x, CORBA::Environment&) } void -Simple_Server_i::shutdown (CORBA::Environment& ACE_TRY_ENV) +Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h index c49f47c8741..60fdc9a457b 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h @@ -31,10 +31,10 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Long x, CORBA::Environment&) + CORBA::Long test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment&) + void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp index 15b052f6053..715d498538c 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp @@ -16,7 +16,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb, } void -Foo_i::baz (CORBA::Environment &ACE_TRY_ENV) +Foo_i::baz (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Foo::Bar::NoSecurityAttributes)) { @@ -36,8 +36,8 @@ Foo_i::baz (CORBA::Environment &ACE_TRY_ENV) // Get the desired security attributes Security::AttributeList_var attribute_list = - this->current_->get_attributes (attribute_type_list, - ACE_TRY_ENV); + this->current_->get_attributes (attribute_type_list + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // If the SecurityLevel1::Current::get_attributes() call above @@ -81,7 +81,7 @@ Foo_i::baz (CORBA::Environment &ACE_TRY_ENV) // internal format. X509 *peer = ::d2i_X509 (0, &der_cert, - attribute.value.length ()); + attribute.value.length ()); ::X509_NAME_oneline (::X509_get_issuer_name (peer), buf, @@ -109,8 +109,8 @@ Foo_i::baz (CORBA::Environment &ACE_TRY_ENV) } void -Foo_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +Foo_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h index 19760b5b615..7af168555f1 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h @@ -27,13 +27,11 @@ public: SecurityLevel2::Current_ptr current); /// Test method. - virtual void baz (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void baz (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Foo::Bar::NoSecurityAttributes)); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp index e7ff0b33106..7dc2b43d35e 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp @@ -13,8 +13,8 @@ const char *ior = "file://test.ior"; void insecure_invocation_test (CORBA::ORB_ptr orb, - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL) { // Disable protection for this insecure invocation test. @@ -26,8 +26,8 @@ insecure_invocation_test (CORBA::ORB_ptr orb, // Create the Security::QOPPolicy. CORBA::Policy_var policy = orb->create_policy (Security::SecQOPPolicy, - no_protection, - ACE_TRY_ENV); + no_protection + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::PolicyList policy_list (1); @@ -38,12 +38,12 @@ insecure_invocation_test (CORBA::ORB_ptr orb, // protection). CORBA::Object_var object = obj->_set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_CHECK; Foo::Bar_var server = - Foo::Bar::_narrow (object.in (), ACE_TRY_ENV); + Foo::Bar::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (server.in ())) @@ -60,7 +60,7 @@ insecure_invocation_test (CORBA::ORB_ptr orb, { // This invocation should result in a CORBA::NO_PERMISSION // exception. - server->baz (ACE_TRY_ENV); + server->baz (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::NO_PERMISSION, exc) @@ -82,11 +82,11 @@ insecure_invocation_test (CORBA::ORB_ptr orb, } void -secure_invocation_test (CORBA::Object_ptr object, - CORBA::Environment &ACE_TRY_ENV) +secure_invocation_test (CORBA::Object_ptr object + TAO_ENV_ARG_DECL) { Foo::Bar_var server = - Foo::Bar::_narrow (object, ACE_TRY_ENV); + Foo::Bar::_narrow (object TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (server.in ())) @@ -100,10 +100,10 @@ secure_invocation_test (CORBA::Object_ptr object, } // This invocation should return successfully. - server->baz (ACE_TRY_ENV); + server->baz (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - server->shutdown (ACE_TRY_ENV); + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -138,14 +138,14 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This test sets creates a Security::QOPPolicy with the @@ -154,17 +154,17 @@ main (int argc, char *argv[]) // then result in a CORBA::NO_PERMISSION exception. // // The server is not shutdown by this test. - insecure_invocation_test (orb.in (), object.in (), ACE_TRY_ENV); + insecure_invocation_test (orb.in (), object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This test uses the default secure SSLIOP settings to securely // invoke a method on the server. No exception should occur. // // The server *is* shutdown by this test. - secure_invocation_test (object.in (), ACE_TRY_ENV); + secure_invocation_test (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp index 7090e8040f5..cbd5ea22072 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp @@ -19,13 +19,13 @@ parse_args (int argc, char *argv[]) switch (c) { case 'o': - ior_output_file = get_opts.optarg; - break; + ior_output_file = get_opts.optarg; + break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "Usage: %s " - "-o <iorfile>" + "-o <iorfile>" "\n", argv [0]), -1); @@ -40,11 +40,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (obj.in ())) @@ -54,23 +54,23 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; - obj = orb->resolve_initial_references ("SecurityCurrent", - ACE_TRY_ENV); + obj = orb->resolve_initial_references ("SecurityCurrent" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; SecurityLevel2::Current_var security_current = - SecurityLevel2::Current::_narrow (obj.in (), - ACE_TRY_ENV); + SecurityLevel2::Current::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (security_current.in ())) @@ -82,42 +82,42 @@ main (int argc, char *argv[]) Foo_i server_impl (orb.in (), security_current.in ()); Foo::Bar_var server = - server_impl._this (ACE_TRY_ENV); + server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in (), ACE_TRY_ENV); + orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) - { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s", - ior_output_file), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - } - - poa_manager->activate (ACE_TRY_ENV); + { + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + } + + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\n" "Event loop finished.\n")); - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp index 402f1e7fdd0..fd43bfedff5 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp @@ -14,7 +14,7 @@ SLevel1_Server_i::SLevel1_Server_i (CORBA::ORB_ptr orb, } CORBA::Boolean -SLevel1_Server_i::authorize_level1 (CORBA::Environment &ACE_TRY_ENV) +SLevel1_Server_i::authorize_level1 (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -42,8 +42,8 @@ SLevel1_Server_i::authorize_level1 (CORBA::Environment &ACE_TRY_ENV) /// the attribute type/s that we want and the return parameter is the /// value/s of the attribute type/s that we want. Security::AttributeList_var attribute_list = - this->ss_current_->get_attributes (attribute_type_list, - ACE_TRY_ENV); + this->ss_current_->get_attributes (attribute_type_list + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (1); /// Just a preliminary check to see if we received something or @@ -217,8 +217,8 @@ SLevel1_Server_i::create_check_cert () } void -SLevel1_Server_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +SLevel1_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h index f1716a12bf7..765d81005c0 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h @@ -27,11 +27,10 @@ class SLevel1_Server_i : public POA_SLevel1_Server SecurityLevel1::Current_ptr ss_current); /// Simple method invoked to test if the client reached server etc. - CORBA::Boolean authorize_level1 (CORBA::Environment &) + CORBA::Boolean authorize_level1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); X509 *create_check_cert (); diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp index 16936a44b4e..8e7d836f771 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp @@ -39,18 +39,18 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; SLevel1_Server_var server = - SLevel1_Server::_narrow (object.in (), ACE_TRY_ENV); + SLevel1_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -62,7 +62,7 @@ main (int argc, char *argv []) } CORBA::Boolean authorized = - server->authorize_level1 (ACE_TRY_ENV); + server->authorize_level1 (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (authorized == 0) @@ -71,11 +71,11 @@ main (int argc, char *argv []) else if (authorized == 1) ACE_DEBUG ((LM_DEBUG, "DENIED: You Do NOT have enough privileges\n")); - - server->shutdown (ACE_TRY_ENV); + + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp index fb2d9fc3c85..e4565c73fa2 100644 --- a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp +++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp @@ -20,13 +20,13 @@ parse_args (int argc, char *argv[]) switch (c) { case 'o': - ior_output_file = get_opts.optarg; - break; + ior_output_file = get_opts.optarg; + break; case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "Usage: %s " - "-o <iorfile>" + "-o <iorfile>" "\n", argv [0]), -1); @@ -42,12 +42,12 @@ main (int argc, char *argv[]) { /// Our regular ORB Initialization. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Get a reference to the RootPOA. CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) @@ -57,25 +57,25 @@ main (int argc, char *argv[]) /// Narrow down the reference to the currect interface. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; // Resolve reference to SecurityCurrent Object. - object = orb->resolve_initial_references ("SecurityCurrent", - ACE_TRY_ENV); + object = orb->resolve_initial_references ("SecurityCurrent" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow it down to get the correct reference. SecurityLevel1::Current_var ss_current = - SecurityLevel1::Current::_narrow (object.in (), - ACE_TRY_ENV); + SecurityLevel1::Current::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ss_current.in ())) @@ -87,38 +87,38 @@ main (int argc, char *argv[]) SLevel1_Server_i level1_server (orb.in (), ss_current.in ()); SLevel1_Server_var server = - level1_server._this (ACE_TRY_ENV); + level1_server._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in (), - ACE_TRY_ENV); + orb->object_to_string (server.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) - { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s", - ior_output_file), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); - } - - poa_manager->activate (ACE_TRY_ENV); + { + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + } + + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Start the ORB - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index 11c303e6fd9..12b1ff7e0c2 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp @@ -42,11 +42,11 @@ public: // = Interface implementation accessor methods. - void id (CORBA::Short id, CORBA::Environment &ACE_TRY_ENV) + void id (CORBA::Short id TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Sets id. - CORBA::Short id (CORBA::Environment &ACE_TRY_ENV) + CORBA::Short id (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Gets id. @@ -64,14 +64,14 @@ My_Test_Object::~My_Test_Object (void) } CORBA::Short -My_Test_Object::id (CORBA::Environment &) +My_Test_Object::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return id_; } void -My_Test_Object::id (CORBA::Short id, CORBA::Environment &) +My_Test_Object::id (CORBA::Short id TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { id_ = id; @@ -206,16 +206,16 @@ CosNaming_Client::init (int argc, char **argv) this->argc_ = argc; this->argv_ = argv; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Initialize ORB. this->orbmgr_.init (this->argc_, - this->argv_, - ACE_TRY_ENV); + this->argv_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->orbmgr_.activate_poa_manager (ACE_TRY_ENV); + this->orbmgr_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -250,16 +250,16 @@ MT_Test::svc (void) CosNaming::NamingContext_var name_service; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY_EX (SETUP) { CORBA::Object_var name_service_obj = - orb_->string_to_object (name_service_ior_, ACE_TRY_ENV); + orb_->string_to_object (name_service_ior_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (SETUP); name_service = - CosNaming::NamingContext::_narrow (name_service_obj.in (), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (name_service_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (SETUP); } ACE_CATCHANY @@ -277,8 +277,8 @@ MT_Test::svc (void) ACE_TRY_EX (BIND) { name_service->bind (test_name_, - test_ref_.in (), - ACE_TRY_ENV); + test_ref_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (BIND); ACE_DEBUG ((LM_DEBUG, "Bound name OK in thread %t\n")); @@ -305,18 +305,18 @@ MT_Test::svc (void) ACE_TRY_EX (RESOLVE) { CORBA::Object_var result_obj_ref = - name_service->resolve (test_name_, - ACE_TRY_ENV); + name_service->resolve (test_name_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (RESOLVE); Test_Object_var result_object = - Test_Object::_narrow (result_obj_ref.in (), - ACE_TRY_ENV); + Test_Object::_narrow (result_obj_ref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (RESOLVE); if (!CORBA::is_nil (result_object.in ())) { - CORBA::Short id = result_object->id (ACE_TRY_ENV); + CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (RESOLVE); if (id == CosNaming_Client::OBJ1_ID) @@ -340,8 +340,8 @@ MT_Test::svc (void) // Unbind the object from the Naming Context. ACE_TRY_EX (UNBIND) { - name_service->unbind (test_name_, - ACE_TRY_ENV); + name_service->unbind (test_name_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (UNBIND); ACE_DEBUG ((LM_DEBUG, "Unbound name OK in thread %t\n")); @@ -374,14 +374,14 @@ MT_Test::execute (TAO_Naming_Client &root_context) My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { test_ref_ = - test_obj_impl->_this (ACE_TRY_ENV); + test_obj_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - test_obj_impl->_remove_ref (ACE_TRY_ENV); + test_obj_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the IOR for the Naming Service. Each thread can use it @@ -394,8 +394,8 @@ MT_Test::execute (TAO_Naming_Client &root_context) root_context.get_context (); name_service_ior_ = - orb_->object_to_string (context.in (), - ACE_TRY_ENV); + orb_->object_to_string (context.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -425,17 +425,17 @@ MT_Test::execute (TAO_Naming_Client &root_context) int Simple_Test::execute (TAO_Naming_Client &root_context) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Dummy object instantiation. My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID); Test_Object_var test_obj_ref = - test_obj_impl->_this (ACE_TRY_ENV); + test_obj_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Give ownership of this object to POA. - test_obj_impl->_remove_ref (ACE_TRY_ENV); + test_obj_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Bind an object to the Naming Context. @@ -443,32 +443,32 @@ Simple_Test::execute (TAO_Naming_Client &root_context) test_name.length (1); test_name[0].id = CORBA::string_dup ("Foo"); root_context->bind (test_name, - test_obj_ref.in (), - ACE_TRY_ENV); + test_obj_ref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Bound name OK\n")); // Resolve the object from the Naming Context. CORBA::Object_var result_obj_ref = - root_context->resolve (test_name, - ACE_TRY_ENV); + root_context->resolve (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Object_var result_object = - Test_Object::_narrow (result_obj_ref.in (), - ACE_TRY_ENV); + Test_Object::_narrow (result_obj_ref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (result_object.in ())) { - CORBA::Short id = result_object->id (ACE_TRY_ENV); + CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (id == CosNaming_Client::OBJ1_ID) ACE_DEBUG ((LM_DEBUG, "Resolved name OK\n")); } // Unbind the object from the Naming Context. - root_context->unbind (test_name, - ACE_TRY_ENV); + root_context->unbind (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Unbound name OK\n")); @@ -487,7 +487,7 @@ Simple_Test::execute (TAO_Naming_Client &root_context) int Tree_Test::execute (TAO_Naming_Client &root_context) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Create a tree of contexts: root->level1->level2. Bind object @@ -498,28 +498,28 @@ Tree_Test::execute (TAO_Naming_Client &root_context) level1.length (1); level1[0].id = CORBA::string_dup ("level1_context"); CosNaming::NamingContext_var level1_context; - level1_context = root_context->bind_new_context (level1, - ACE_TRY_ENV); + level1_context = root_context->bind_new_context (level1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a new context. CosNaming::NamingContext_var level2_context; - level2_context = root_context->new_context (ACE_TRY_ENV); + level2_context = root_context->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate a dummy object and bind it under the new context. My_Test_Object *impl1 = new My_Test_Object (CosNaming_Client::OBJ1_ID); - Test_Object_var obj1 = impl1->_this (ACE_TRY_ENV); + Test_Object_var obj1 = impl1->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl1->_remove_ref (ACE_TRY_ENV); + impl1->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name obj_name; obj_name.length (1); obj_name[0].id = CORBA::string_dup ("foo"); - level2_context->bind (obj_name, obj1.in (), - ACE_TRY_ENV); + level2_context->bind (obj_name, obj1.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Bind the context we just created under level1. @@ -527,8 +527,8 @@ Tree_Test::execute (TAO_Naming_Client &root_context) level2.length (2); level2[1].id = CORBA::string_dup ("level2_context"); root_context->bind_context (level2, - level2_context.in (), - ACE_TRY_ENV); + level2_context.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Resolve and unbind level1/level2/foo, and bind it back. @@ -536,12 +536,12 @@ Tree_Test::execute (TAO_Naming_Client &root_context) test_name.length (3); test_name[2].id = obj_name[0].id; CORBA::Object_var result_obj_ref = - root_context->resolve (test_name, - ACE_TRY_ENV); + root_context->resolve (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Object_var result_object = - Test_Object::_narrow (result_obj_ref.in (), - ACE_TRY_ENV); + Test_Object::_narrow (result_obj_ref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (result_object.in ())) @@ -549,7 +549,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context) "Problems with resolving foo in Tree Test - nil object ref.\n"), -1); - CORBA::Short id = result_object->id (ACE_TRY_ENV); + CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (id != CosNaming_Client::OBJ1_ID) @@ -559,37 +559,37 @@ Tree_Test::execute (TAO_Naming_Client &root_context) // Unbind the object from the Naming Context and bind it back // in. - root_context->unbind (test_name, - ACE_TRY_ENV); + root_context->unbind (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (test_name, - obj1.in (), - ACE_TRY_ENV); + obj1.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create new context and rebind under the name level1/level2. CosNaming::NamingContext_var new_level2_context; new_level2_context = - root_context->new_context (ACE_TRY_ENV); + root_context->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; root_context->rebind_context (level2, - new_level2_context.in (), - ACE_TRY_ENV); + new_level2_context.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Bind, resolve, rebind, and resolve foo under level1/level2. root_context->bind (test_name, - obj1.in (), - ACE_TRY_ENV); + obj1.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result_obj_ref = root_context->resolve (test_name, - ACE_TRY_ENV); + result_obj_ref = root_context->resolve (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result_object = Test_Object::_narrow (result_obj_ref.in (), - ACE_TRY_ENV); + result_object = Test_Object::_narrow (result_obj_ref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Short obj_id = result_object->id (ACE_TRY_ENV); + CORBA::Short obj_id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (result_object.in ()) @@ -600,24 +600,24 @@ Tree_Test::execute (TAO_Naming_Client &root_context) My_Test_Object *impl2 = new My_Test_Object (CosNaming_Client::OBJ2_ID); - Test_Object_var obj2 = impl2->_this (ACE_TRY_ENV); + Test_Object_var obj2 = impl2->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl2->_remove_ref (ACE_TRY_ENV); + impl2->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; root_context->rebind (test_name, - obj2.in (), - ACE_TRY_ENV); + obj2.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result_obj_ref = root_context->resolve (test_name, - ACE_TRY_ENV); + result_obj_ref = root_context->resolve (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - result_object = Test_Object::_narrow (result_obj_ref.in (), - ACE_TRY_ENV); + result_object = Test_Object::_narrow (result_obj_ref.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - obj_id = result_object->id (ACE_TRY_ENV); + obj_id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (result_object.in ()) @@ -644,7 +644,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context) int Exceptions_Test::execute (TAO_Naming_Client &root_context) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Set things up. @@ -654,56 +654,56 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context) context_name.length (1); context_name[0].id = CORBA::string_dup ("level1_context"); CosNaming::NamingContext_var level1_context; - level1_context = root_context->bind_new_context (context_name, - ACE_TRY_ENV); + level1_context = root_context->bind_new_context (context_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; context_name[0].id = CORBA::string_dup ("level2_context"); CosNaming::NamingContext_var level2_context; - level2_context = level1_context->bind_new_context (context_name, - ACE_TRY_ENV); + level2_context = level1_context->bind_new_context (context_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Bind a dummy object foo under each context. My_Test_Object *impl = new My_Test_Object; - Test_Object_var obj = impl->_this (ACE_TRY_ENV); + Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (ACE_TRY_ENV); + impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name object_name; object_name.length (1); object_name[0].id = CORBA::string_dup ("foo"); root_context->bind (object_name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; level1_context->bind (object_name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; level2_context->bind (object_name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run exceptions tests. - invalid_name_test (root_context, - ACE_TRY_ENV); + invalid_name_test (root_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - already_bound_test (root_context, - ACE_TRY_ENV); + already_bound_test (root_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - already_bound_test2 (root_context, - ACE_TRY_ENV); + already_bound_test2 (root_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - not_found_test (root_context, - ACE_TRY_ENV); + not_found_test (root_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - not_found_test2 (root_context, - ACE_TRY_ENV); + not_found_test2 (root_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - not_found_test3 (root_context, - ACE_TRY_ENV); + not_found_test3 (root_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -718,16 +718,16 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context) } void -Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV) +Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL) { ACE_TRY { CosNaming::Name test_name; test_name.length (0); - root_context->resolve (test_name, - ACE_TRY_ENV); + root_context->resolve (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n")); } @@ -746,8 +746,8 @@ Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context, } void -Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV) +Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -755,14 +755,14 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context, test_name.length (1); test_name[0].id = CORBA::string_dup ("foo"); My_Test_Object *impl = new My_Test_Object; - Test_Object_var obj = impl->_this (ACE_TRY_ENV); + Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (ACE_TRY_ENV); + impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (test_name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n")); } @@ -782,8 +782,8 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context, } void -Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV) +Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -792,14 +792,14 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context, test_name[0].id = CORBA::string_dup ("level1_context"); test_name[1].id = CORBA::string_dup ("foo"); My_Test_Object *impl = new My_Test_Object; - Test_Object_var obj = impl->_this (ACE_TRY_ENV); + Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (ACE_TRY_ENV); + impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (test_name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n")); } @@ -818,8 +818,8 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context, } void -Exceptions_Test::not_found_test (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV) +Exceptions_Test::not_found_test (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -829,8 +829,8 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context, test_name[1].id = CORBA::string_dup ("level2_context"); test_name[2].id = CORBA::string_dup ("bar"); - root_context->unbind (test_name, - ACE_TRY_ENV); + root_context->unbind (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Not found test failed\n")); } @@ -857,8 +857,8 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context, } void -Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV) +Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -868,8 +868,8 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context, test_name[1].id = CORBA::string_dup ("level3_context"); test_name[2].id = CORBA::string_dup ("foo"); - root_context->unbind (test_name, - ACE_TRY_ENV); + root_context->unbind (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n")); } @@ -899,8 +899,8 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context, } void -Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV) +Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -910,7 +910,7 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context, test_name[1].id = CORBA::string_dup ("foo"); test_name[2].id = CORBA::string_dup ("foo"); - root_context->unbind (test_name, ACE_TRY_ENV); + root_context->unbind (test_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed - no exception was thrown\n")); } @@ -941,14 +941,14 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context, int Iterator_Test::execute (TAO_Naming_Client &root_context) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Instantiate four dummy objects. My_Test_Object *impl = new My_Test_Object; - Test_Object_var obj = impl->_this (ACE_TRY_ENV); + Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (ACE_TRY_ENV); + impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Bind objects to the naming context. @@ -965,20 +965,20 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) name4.length (1); name4[0].id = CORBA::string_dup ("foo4"); root_context->bind (name1, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (name2, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (name3, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; root_context->bind (name4, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // List the content of the Naming Context. @@ -986,8 +986,8 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) CosNaming::BindingList_var bindings_list; root_context->list (1, bindings_list.out (), - iter.out (), - ACE_TRY_ENV); + iter.out () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (iter.in ()) || bindings_list->length () != 1 @@ -1001,8 +1001,8 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) // Invoke operations on the iterator. CosNaming::Binding_var binding; - iter->next_one (binding.out (), - ACE_TRY_ENV); + iter->next_one (binding.out () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (binding->binding_type != CosNaming::nobject) ACE_ERROR_RETURN ((LM_ERROR, @@ -1012,7 +1012,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) "Second binding: %s\n", binding->binding_name[0].id.in ())); - iter->next_n (2, bindings_list.out (), ACE_TRY_ENV); + iter->next_n (2, bindings_list.out () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (bindings_list->length () != 2 || bindings_list[0u].binding_type != CosNaming::nobject @@ -1028,14 +1028,14 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) // We already iterated over all the bindings, so the following // should return false. - CORBA::Boolean result = iter->next_one (binding.out (), - ACE_TRY_ENV); + CORBA::Boolean result = iter->next_one (binding.out () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result) ACE_ERROR_RETURN ((LM_ERROR, "CosNaming::BindingIterator does not function properly\n"), -1); - iter->destroy (ACE_TRY_ENV); + iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -1052,42 +1052,42 @@ Iterator_Test::execute (TAO_Naming_Client &root_context) int Destroy_Test::execute (TAO_Naming_Client &root_context) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Create a context and bind an object under it. CosNaming::NamingContext_var my_context; - my_context = root_context->new_context (ACE_TRY_ENV); + my_context = root_context->new_context (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Bind a dummy object foo under my_context. My_Test_Object *impl = new My_Test_Object; - Test_Object_var obj = impl->_this (ACE_TRY_ENV); + Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - impl->_remove_ref (ACE_TRY_ENV); + impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name object_name; object_name.length (1); object_name[0].id = CORBA::string_dup ("foo"); my_context->bind (object_name, - obj.in (), - ACE_TRY_ENV); + obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Do the testing. - not_empty_test (my_context, - ACE_TRY_ENV); + not_empty_test (my_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - my_context->unbind (object_name, ACE_TRY_ENV); + my_context->unbind (object_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - my_context->destroy (ACE_TRY_ENV); + my_context->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - not_exist_test (my_context, - ACE_TRY_ENV); + not_exist_test (my_context + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1103,12 +1103,12 @@ Destroy_Test::execute (TAO_Naming_Client &root_context) } void -Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref, - CORBA::Environment &ACE_TRY_ENV) +Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref + TAO_ENV_ARG_DECL) { ACE_TRY { - ref->destroy (ACE_TRY_ENV); + ref->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1122,12 +1122,12 @@ Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref, } void -Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref, - CORBA::Environment &ACE_TRY_ENV) +Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref + TAO_ENV_ARG_DECL) { ACE_TRY { - ref->destroy (ACE_TRY_ENV); + ref->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -1154,7 +1154,7 @@ Persistent_Test_Begin::~Persistent_Test_Begin (void) int Persistent_Test_Begin::execute (TAO_Naming_Client &root_context) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Create a name structure we will reuse. @@ -1164,20 +1164,20 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context) // Create and bind a naming context under the <root> context. CosNaming::NamingContext_var level1_context = - root_context->bind_new_context (test_name, - ACE_TRY_ENV); + root_context->bind_new_context (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create and bind a naming context under <level1> context. test_name[0].id = CORBA::string_dup ("level2"); CosNaming::NamingContext_var level2_context = - level1_context->bind_new_context (test_name, - ACE_TRY_ENV); + level1_context->bind_new_context (test_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Log the ior of <level1_context> for use by <Persistent_Test_End>. CORBA::String_var ior = - orb_->object_to_string (level1_context.in (), ACE_TRY_ENV); + orb_->object_to_string (level1_context.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::fprintf (this->file_, @@ -1213,7 +1213,7 @@ Persistent_Test_End::~Persistent_Test_End (void) int Persistent_Test_End::execute (TAO_Naming_Client &root_context) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Create a name structure we will reuse. @@ -1224,11 +1224,11 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) // Convert stringified ior we got from <Persistent_Test_Begin> // for <level1> Naming Context to Naming Context reference. CORBA::Object_var obj = - orb_->string_to_object (ior_, ACE_TRY_ENV); + orb_->string_to_object (ior_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::NamingContext_var level1_context = - CosNaming::NamingContext::_narrow (obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (level1_context.in ())) @@ -1238,7 +1238,7 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) // Resolve for <level2> context through the persistent ior we // got from part 1 of this test. - obj = level1_context->resolve (test_name, ACE_TRY_ENV); + obj = level1_context->resolve (test_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Now, resolve for <level2> context using the <root> context @@ -1247,7 +1247,7 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context) test_name[0].id = CORBA::string_dup ("level1"); test_name[1].id = CORBA::string_dup ("level2"); CORBA::Object_var obj2 = - root_context->resolve (test_name, ACE_TRY_ENV); + root_context->resolve (test_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Make sure we got the same answer through both methods. diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h index 90aef7d2625..e94a1f5f295 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.h +++ b/TAO/orbsvcs/tests/Simple_Naming/client.h @@ -171,18 +171,18 @@ private: // the following functions isolate specific tests due to the // limitation of only 1 TAO_TRY being allowed per function. - void invalid_name_test (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV); - void already_bound_test (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV); - void already_bound_test2 (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV); - void not_found_test (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV); - void not_found_test2 (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV); - void not_found_test3 (TAO_Naming_Client &root_context, - CORBA::Environment &ACE_TRY_ENV); + void invalid_name_test (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL); + void already_bound_test (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL); + void already_bound_test2 (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL); + void not_found_test (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL); + void not_found_test2 (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL); + void not_found_test3 (TAO_Naming_Client &root_context + TAO_ENV_ARG_DECL); }; class Destroy_Test : public Naming_Test @@ -205,10 +205,10 @@ public: private: // = The following functions isolate specific tests. - void not_empty_test (CosNaming::NamingContext_var &ref, - CORBA::Environment &ACE_TRY_ENV); - void not_exist_test (CosNaming::NamingContext_var &ref, - CORBA::Environment &ACE_TRY_ENV); + void not_empty_test (CosNaming::NamingContext_var &ref + TAO_ENV_ARG_DECL); + void not_exist_test (CosNaming::NamingContext_var &ref + TAO_ENV_ARG_DECL); }; class Persistent_Test_Begin : public Naming_Test diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp index 70f97cfb451..b1a5b774470 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.cpp +++ b/TAO/orbsvcs/tests/Time/Client_i.cpp @@ -30,11 +30,11 @@ Client_i::test_for_secure_universal_time (void) ACE_DEBUG ((LM_DEBUG, "[CLIENT] Process/Thread Id : (%P/%t) Testing secure_time()\n")); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CosTime::UTO_var UTO_server = - this->clerk_->secure_universal_time (ACE_TRY_ENV); + this->clerk_->secure_universal_time (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -55,11 +55,11 @@ Client_i::test_for_universal_time (void) { ACE_DEBUG ((LM_DEBUG, "[CLIENT] Process/Thread Id : (%P/%t) Testing universal_time()\n")); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CosTime::UTO_var UTO_server = - this->clerk_->universal_time (ACE_TRY_ENV); + this->clerk_->universal_time (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -108,21 +108,21 @@ Client_i::test_for_new_universal_time (void) ACE_DEBUG ((LM_DEBUG, "[CLIENT] Process/Thread Id : (%P/%t) Testing new_universal_time()\n")); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CosTime::UTO_var UTO_server = this->clerk_->new_universal_time (time, inaccuracy, - tdf, - ACE_TRY_ENV); + tdf + TAO_ENV_ARG_PARAMETER); - ACE_ASSERT (UTO_server->time (ACE_TRY_ENV) == 999999999); - ACE_ASSERT (UTO_server->inaccuracy (ACE_TRY_ENV) == 9999); - ACE_ASSERT (UTO_server->tdf (ACE_TRY_ENV) == 99); - ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).time == 999999999); - ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).inacchi == 0); - ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).inacclo == 9999); - ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).tdf == 99); + ACE_ASSERT (UTO_server->time (TAO_ENV_SINGLE_ARG_PARAMETER) == 999999999); + ACE_ASSERT (UTO_server->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER) == 9999); + ACE_ASSERT (UTO_server->tdf (TAO_ENV_SINGLE_ARG_PARAMETER) == 99); + ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).time == 999999999); + ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacchi == 0); + ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacclo == 9999); + ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).tdf == 99); ACE_TRY_CHECK; } @@ -148,23 +148,23 @@ Client_i::test_for_uto_from_utc (void) ACE_DEBUG ((LM_DEBUG, "[CLIENT] Process/Thread Id : (%P/%t) Testing uto_from_utc ()\n")); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - CosTime::UTO_var UTO_server = this->clerk_->uto_from_utc (utc_struct, - ACE_TRY_ENV); + CosTime::UTO_var UTO_server = this->clerk_->uto_from_utc (utc_struct + TAO_ENV_ARG_PARAMETER); TimeBase::InaccuracyT inaccuracy = utc_struct.inacchi; inaccuracy <<= 32; inaccuracy |= utc_struct.inacclo; - ACE_ASSERT (UTO_server->time (ACE_TRY_ENV) == 999999999); - ACE_ASSERT (UTO_server->inaccuracy (ACE_TRY_ENV) == inaccuracy); - ACE_ASSERT (UTO_server->tdf (ACE_TRY_ENV) == 99); - ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).time == 999999999); - ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).inacclo == 50); - ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).inacchi == 50); - ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).tdf == 99); + ACE_ASSERT (UTO_server->time (TAO_ENV_SINGLE_ARG_PARAMETER) == 999999999); + ACE_ASSERT (UTO_server->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER) == inaccuracy); + ACE_ASSERT (UTO_server->tdf (TAO_ENV_SINGLE_ARG_PARAMETER) == 99); + ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).time == 999999999); + ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacclo == 50); + ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacchi == 50); + ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).tdf == 99); ACE_TRY_CHECK; } @@ -186,15 +186,15 @@ Client_i::test_for_new_interval (void) ACE_DEBUG ((LM_DEBUG, "[CLIENT] Process/Thread Id : (%P/%t) Testing new_interval ()\n")); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CosTime::TIO_var TIO_server = this->clerk_->new_interval (lower, - upper, - ACE_TRY_ENV); + upper + TAO_ENV_ARG_PARAMETER); - ACE_ASSERT ((TIO_server->time_interval (ACE_TRY_ENV)).lower_bound == 666666666); - ACE_ASSERT ((TIO_server->time_interval (ACE_TRY_ENV)).upper_bound == 999999999); + ACE_ASSERT ((TIO_server->time_interval (TAO_ENV_SINGLE_ARG_PARAMETER)).lower_bound == 666666666); + ACE_ASSERT ((TIO_server->time_interval (TAO_ENV_SINGLE_ARG_PARAMETER)).upper_bound == 999999999); ACE_TRY_CHECK; } @@ -324,7 +324,7 @@ Client_i::~Client_i (void) int Client_i::obtain_initial_references (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -355,12 +355,12 @@ Client_i::obtain_initial_references (void) name)); CORBA::Object_var temp_object = - my_name_client_->resolve (clerk_name, - ACE_TRY_ENV); + my_name_client_->resolve (clerk_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - clerk_ = CosTime::TimeService::_narrow (temp_object.in (), - ACE_TRY_ENV); + clerk_ = CosTime::TimeService::_narrow (temp_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (clerk_.in ())) @@ -388,15 +388,15 @@ Client_i::init (int argc, char **argv) this->argc_ = argc; this->argv_ = argv; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // Retrieve the ORB. this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, - 0, - ACE_TRY_ENV); + 0 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -409,8 +409,8 @@ Client_i::init (int argc, char **argv) // option or a file. CORBA::Object_var server_object = - this->orb_->string_to_object (this->ior_, - ACE_TRY_ENV); + this->orb_->string_to_object (this->ior_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server_object.in ())) @@ -419,8 +419,8 @@ Client_i::init (int argc, char **argv) this->ior_), -1); this->clerk_ = - CosTime::TimeService::_narrow (server_object.in (), - ACE_TRY_ENV); + CosTime::TimeService::_narrow (server_object.in () + TAO_ENV_ARG_PARAMETER); ACE_DEBUG ((LM_DEBUG, "[CLIENT] Process/Thread Id : (%P/%t) Using the IOR provided\n")); diff --git a/TAO/orbsvcs/tests/Time/Client_i.h b/TAO/orbsvcs/tests/Time/Client_i.h index fd674f01548..03802c59511 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.h +++ b/TAO/orbsvcs/tests/Time/Client_i.h @@ -86,9 +86,6 @@ private: int shutdown_; // Flag for server shutdown. - CORBA::Environment env_; - // Environment variable. - CosTime::TimeService_var clerk_; // Time Service Server object ptr. diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp index 62ad3e349ce..6ac66fc4f7a 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp @@ -7,18 +7,18 @@ ACE_RCSID(Trading, Offer_Exporter, "$Id$") TAO_Offer_Exporter:: TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if, - CORBA::Boolean verbose, - CORBA::Environment& ACE_TRY_ENV) + CORBA::Boolean verbose + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) : verbose_ (verbose) { // Initialize the offer sequences and structures. - this->create_offers (ACE_TRY_ENV); + this->create_offers (TAO_ENV_SINGLE_ARG_PARAMETER); // Obtain the necessary trading service interfaces. - this->register_ = lookup_if->register_if (ACE_TRY_ENV); + this->register_ = lookup_if->register_if (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->admin_ = lookup_if->admin_if (ACE_TRY_ENV); + this->admin_ = lookup_if->admin_if (TAO_ENV_SINGLE_ARG_PARAMETER); // ACE_CHECK; } @@ -33,7 +33,7 @@ TAO_Offer_Exporter::~TAO_Offer_Exporter (void) } void -TAO_Offer_Exporter::export_offers (CORBA::Environment& ACE_TRY_ENV) +TAO_Offer_Exporter::export_offers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::InvalidObjectRef, CosTrading::IllegalServiceType, @@ -54,13 +54,13 @@ TAO_Offer_Exporter::export_offers (CORBA::Environment& ACE_TRY_ENV) this->props_fs_[i][4].value <<= "Default"; } - this->export_to (this->register_.in (), ACE_TRY_ENV); + this->export_to (this->register_.in () TAO_ENV_ARG_PARAMETER); // ACE_CHECK; } void -TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg, - CORBA::Environment& ACE_TRY_ENV) +TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::InvalidObjectRef, CosTrading::IllegalServiceType, @@ -76,14 +76,14 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg, { for (int i = 0; i < NUM_OFFERS; i++) { - CORBA::Object_ptr offer_obj= this->plotter_[i]._this (ACE_TRY_ENV); + CORBA::Object_ptr offer_obj= this->plotter_[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosTrading::OfferId_var offer_id = reg->_cxx_export (offer_obj, TT_Info::INTERFACE_NAMES[1], - this->props_plotters_[i], - ACE_TRY_ENV); + this->props_plotters_[i] + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->verbose_) @@ -91,13 +91,13 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg, ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ())); } - offer_obj = this->printer_[i]._this (ACE_TRY_ENV); + offer_obj = this->printer_[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; offer_id = reg->_cxx_export (offer_obj, TT_Info::INTERFACE_NAMES[2], - this->props_printers_[i], - ACE_TRY_ENV); + this->props_printers_[i] + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->verbose_) @@ -105,13 +105,13 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg, ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ())); } - offer_obj = this->fs_[i]._this (ACE_TRY_ENV); + offer_obj = this->fs_[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; offer_id = reg->_cxx_export (offer_obj, TT_Info::INTERFACE_NAMES[3], - this->props_fs_[i], - ACE_TRY_ENV); + this->props_fs_[i] + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK if (this->verbose_) @@ -130,7 +130,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg, } void -TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV) +TAO_Offer_Exporter::export_offers_to_all (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::InvalidObjectRef, CosTrading::IllegalServiceType, @@ -149,7 +149,7 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n")); } - CosTrading::Link_var link_if = this->register_->link_if (ACE_TRY_ENV); + CosTrading::Link_var link_if = this->register_->link_if (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose_) @@ -158,7 +158,7 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV) " linked to the root trader.\n")); } - CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_TRY_ENV); + CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose_) @@ -178,7 +178,7 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV) } CosTrading::Link::LinkInfo_var link_info = - link_if->describe_link (link_name_seq[i], ACE_TRY_ENV); + link_if->describe_link (link_name_seq[i] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (int j = 0; j < NUM_OFFERS; j++) @@ -194,7 +194,7 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV) ACE_static_cast (const char*, link_name_seq[i]))); } - this->export_to (link_info->target_reg.in (), ACE_TRY_ENV); + this->export_to (link_info->target_reg.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -207,7 +207,7 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV) void -TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& ACE_TRY_ENV) +TAO_Offer_Exporter::withdraw_offers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -219,7 +219,7 @@ TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& ACE_TRY_ENV) { CORBA::ULong length; - CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_TRY_ENV); + CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (offer_id_seq.ptr () != 0) @@ -227,7 +227,7 @@ TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& ACE_TRY_ENV) length = offer_id_seq->length (); for (CORBA::ULong i = 0; i < length; i++) { - this->register_->withdraw (offer_id_seq[i], ACE_TRY_ENV); + this->register_->withdraw (offer_id_seq[i] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -241,7 +241,7 @@ TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& ACE_TRY_ENV) } void -TAO_Offer_Exporter::describe_offers (CORBA::Environment& ACE_TRY_ENV) +TAO_Offer_Exporter::describe_offers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, @@ -252,7 +252,7 @@ TAO_Offer_Exporter::describe_offers (CORBA::Environment& ACE_TRY_ENV) ACE_TRY { CORBA::ULong length; - CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_TRY_ENV); + CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (offer_id_seq.ptr () != 0) @@ -265,14 +265,14 @@ TAO_Offer_Exporter::describe_offers (CORBA::Environment& ACE_TRY_ENV) for (CORBA::ULong i = 0; i < length; i++) { CosTrading::Register::OfferInfo_var offer_info = - this->register_->describe (offer_id_seq[i], ACE_TRY_ENV); + this->register_->describe (offer_id_seq[i] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->verbose_) { ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *) offer_id_seq[i])); ACE_DEBUG ((LM_DEBUG, "Service Type: %s\n", offer_info->type.in ())); - TT_Info::dump_properties (offer_info->properties, 0, ACE_TRY_ENV); + TT_Info::dump_properties (offer_info->properties, 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "------------------------------\n")); } @@ -288,7 +288,7 @@ TAO_Offer_Exporter::describe_offers (CORBA::Environment& ACE_TRY_ENV) } void -TAO_Offer_Exporter::modify_offers (CORBA::Environment& ACE_TRY_ENV) +TAO_Offer_Exporter::modify_offers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented, CosTrading::IllegalOfferId, @@ -306,7 +306,7 @@ TAO_Offer_Exporter::modify_offers (CORBA::Environment& ACE_TRY_ENV) ACE_TRY { - CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_TRY_ENV); + CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (offer_id_seq.ptr () != 0) @@ -327,8 +327,8 @@ TAO_Offer_Exporter::modify_offers (CORBA::Environment& ACE_TRY_ENV) { this->register_->modify (offer_id_seq[i], del_list, - modify_list, - ACE_TRY_ENV); + modify_list + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -343,7 +343,7 @@ TAO_Offer_Exporter::modify_offers (CORBA::Environment& ACE_TRY_ENV) void TAO_Offer_Exporter:: -withdraw_offers_using_constraints (CORBA::Environment& ACE_TRY_ENV) +withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -362,20 +362,20 @@ withdraw_offers_using_constraints (CORBA::Environment& ACE_TRY_ENV) { this->register_-> withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER], - constraint, - ACE_TRY_ENV); + constraint + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->register_-> withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PRINTER], - constraint, - ACE_TRY_ENV); + constraint + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->register_-> withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM], - constraint, - ACE_TRY_ENV); + constraint + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -388,7 +388,7 @@ withdraw_offers_using_constraints (CORBA::Environment& ACE_TRY_ENV) } CosTrading::OfferIdSeq* -TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV) +TAO_Offer_Exporter::grab_offerids (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)) { @@ -403,8 +403,8 @@ TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV) this->admin_->list_offers (NUM_OFFERS, CosTrading::OfferIdSeq_out (offer_id_seq), - CosTrading::OfferIdIterator_out (offer_id_iter), - ACE_TRY_ENV); + CosTrading::OfferIdIterator_out (offer_id_iter) + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if ((! CORBA::is_nil (offer_id_iter)) && offer_id_seq != 0) @@ -417,8 +417,8 @@ TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV) { any_left = offer_id_iter->next_n (length, - CosTrading::OfferIdSeq_out (id_seq), - ACE_TRY_ENV); + CosTrading::OfferIdSeq_out (id_seq) + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int offers = id_seq->length (); @@ -432,7 +432,7 @@ TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV) } while (any_left); - offer_id_iter->destroy (ACE_TRY_ENV); + offer_id_iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -457,7 +457,7 @@ TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV) } void -TAO_Offer_Exporter::create_offers (CORBA::Environment &) +TAO_Offer_Exporter::create_offers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { const int QUEUE_SIZE = 4; diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h index dfe4070df25..95e5b719f3d 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h @@ -24,13 +24,13 @@ class TAO_Offer_Exporter public: TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if, - CORBA::Boolean verbose, - CORBA::Environment& ACE_TRY_ENV) + CORBA::Boolean verbose + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); ~TAO_Offer_Exporter (void); - void export_offers (CORBA::Environment& ACE_TRY_ENV) + void export_offers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::InvalidObjectRef, CosTrading::IllegalServiceType, @@ -43,7 +43,7 @@ public: CosTrading::DuplicatePropertyName)); // Export a number of offers to the Trading Service. - void export_offers_to_all (CORBA::Environment& ACE_TRY_ENV) + void export_offers_to_all (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::InvalidObjectRef, CosTrading::IllegalServiceType, @@ -57,21 +57,21 @@ public: // Export a number of offers to all traders accessible by the // bootstrapped trader. - void withdraw_offers (CORBA::Environment& ACE_TRY_ENV) + void withdraw_offers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, CosTrading::Register::ProxyOfferId)); // Withdraw all exported offers. - void describe_offers (CORBA::Environment& ACE_TRY_ENV) + void describe_offers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalOfferId, CosTrading::UnknownOfferId, CosTrading::Register::ProxyOfferId)); // Describe all the offers registered with the bootstrapped trader. - void modify_offers (CORBA::Environment& ACE_TRY_ENV) + void modify_offers (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented, CosTrading::IllegalOfferId, @@ -86,7 +86,7 @@ public: CosTrading::DuplicatePropertyName)); // Remove some properties and change some properties in each offer. - void withdraw_offers_using_constraints (CORBA::Environment& ACE_TRY_ENV) + void withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -96,15 +96,15 @@ public: private: - CosTrading::OfferIdSeq* grab_offerids (CORBA::Environment& ACE_TRY_ENV) + CosTrading::OfferIdSeq* grab_offerids (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented)); - void create_offers (CORBA::Environment &ACE_TRY_ENV); + void create_offers (TAO_ENV_SINGLE_ARG_DECL); // Fill in each of the offer structures. - void export_to (CosTrading::Register_ptr reg, - CORBA::Environment& ACE_TRY_ENV) + void export_to (CosTrading::Register_ptr reg + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::Register::InvalidObjectRef, CosTrading::IllegalServiceType, diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp index 7debd543db3..440f470bda9 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp @@ -12,7 +12,7 @@ TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if, } void -TAO_Offer_Importer::perform_queries (CORBA::Environment& ACE_TRY_ENV) +TAO_Offer_Importer::perform_queries (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -34,12 +34,12 @@ TAO_Offer_Importer::perform_queries (CORBA::Environment& ACE_TRY_ENV) policies.return_card (16*NUM_OFFERS); policies.link_follow_rule (CosTrading::always); - this->perform_queries_with_policies (policies, ACE_TRY_ENV); + this->perform_queries_with_policies (policies TAO_ENV_ARG_PARAMETER); // ACE_CHECK; } void -TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV) +TAO_Offer_Importer::perform_directed_queries (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -63,7 +63,7 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV) if (this->verbose_) ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n")); - CosTrading::Link_var link_if = this->lookup_->link_if (ACE_TRY_ENV); + CosTrading::Link_var link_if = this->lookup_->link_if (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose_) @@ -71,7 +71,7 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, "Obtaining references to traders directly" " linked to the root trader.\n")); } - CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_TRY_ENV); + CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (link_name_seq->length () > 0) @@ -83,14 +83,14 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV) } CosTrading::Link::LinkInfo_var link_info = - link_if->describe_link (link_name_seq[0u], ACE_TRY_ENV); + link_if->describe_link (link_name_seq[0u] TAO_ENV_ARG_PARAMETER); ACE_CHECK; CosTrading::Lookup_ptr lookup_if = link_info->target.in (); - CosTrading::Link_var link_if2 = lookup_if->link_if (ACE_TRY_ENV); + CosTrading::Link_var link_if2 = lookup_if->link_if (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CosTrading::LinkNameSeq_var link_name_seq2 = link_if2->list_links (ACE_TRY_ENV); + CosTrading::LinkNameSeq_var link_name_seq2 = link_if2->list_links (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (link_name_seq2->length () > 0) @@ -117,7 +117,7 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV) policies.starting_trader (new CosTrading::TraderName (2, 2, trader_name, 1)); - this->perform_queries_with_policies (policies, ACE_TRY_ENV); + this->perform_queries_with_policies (policies TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -137,8 +137,8 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV) void TAO_Offer_Importer:: -perform_queries_with_policies (const TAO_Policy_Creator& policies, - CORBA::Environment& ACE_TRY_ENV) +perform_queries_with_policies (const TAO_Policy_Creator& policies + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -189,8 +189,8 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies, 8, offer_seq_out, offer_iterator_out, - limits_applied_out, - ACE_TRY_ENV); + limits_applied_out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosTrading::OfferSeq_var offer_seq (offer_seq_ptr); @@ -201,8 +201,8 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies, { ACE_DEBUG ((LM_DEBUG, "*** Results:\n\n")); this->display_results (*offer_seq_ptr, - offer_iterator_ptr, - ACE_TRY_ENV); + offer_iterator_ptr + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (limits_applied_out->length () > 0) @@ -227,8 +227,8 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies, void TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, - CosTrading::OfferIterator_ptr offer_iterator, - CORBA::Environment& ACE_TRY_ENV) const + CosTrading::OfferIterator_ptr offer_iterator + TAO_ENV_ARG_DECL) const ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -241,14 +241,14 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, { // Call back to the exported object. TAO_Trader_Test::Remote_Output_var remote_output = - TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in (), - ACE_TRY_ENV); + TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - remote_output->confirm (ACE_TRY_ENV); + remote_output->confirm (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - TT_Info::dump_properties (offer_seq[i].properties, 1, ACE_TRY_ENV); + TT_Info::dump_properties (offer_seq[i].properties, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "------------------------------\n")); } @@ -266,8 +266,8 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, CosTrading::OfferSeq_out iter_offers_out (iter_offers_ptr); any_left = offer_iterator->next_n (length, - iter_offers_out, - ACE_TRY_ENV); + iter_offers_out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosTrading::OfferSeq_var iter_offers (iter_offers_ptr); @@ -275,15 +275,15 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, { // Call back to the exported object. TAO_Trader_Test::Remote_Output_var remote_output = - TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in (), - ACE_TRY_ENV); + TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - remote_output->confirm (ACE_TRY_ENV); + remote_output->confirm (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosTrading::PropertySeq& props = iter_offers[i].properties; - TT_Info::dump_properties (props, 1, ACE_TRY_ENV); + TT_Info::dump_properties (props, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "------------------------------\n")); @@ -291,7 +291,7 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, } while (any_left); - offer_iterator->destroy (ACE_TRY_ENV); + offer_iterator->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h index a499a4b3f89..3f47723c4e6 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h @@ -32,7 +32,7 @@ public: TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose = 1); - void perform_queries (CORBA::Environment& ACE_TRY_ENV) + void perform_queries (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -46,7 +46,7 @@ public: CosTrading::DuplicatePolicyName)); // Barrage the bootstrapped-to trader with queries. - void perform_directed_queries (CORBA::Environment& ACE_TRY_ENV) + void perform_directed_queries (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -63,8 +63,8 @@ public: private: - void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager, - CORBA::Environment& ACE_TRY_ENV) + void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -80,8 +80,8 @@ private: // pass in <policy_manager>. void display_results (const CosTrading::OfferSeq& offer_seq, - CosTrading::OfferIterator_ptr offer_iterator, - CORBA::Environment& ACE_TRY_ENV) const + CosTrading::OfferIterator_ptr offer_iterator + TAO_ENV_ARG_DECL) const ACE_THROW_SPEC ((CORBA::SystemException)); // Display the results of the query to the screen. diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp index ba20cd0fc76..dedb5b91f77 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp @@ -6,19 +6,19 @@ ACE_RCSID(Trading, Service_Type_Exporter, "$Id$") TAO_Service_Type_Exporter:: TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, - CORBA::Boolean verbose, - CORBA::Environment& ACE_TRY_ENV) + CORBA::Boolean verbose + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) : verbose_ (verbose), lookup_ (lookup_if) { // Obtain the Service Type Repository. - CosTrading::TypeRepository_var obj = lookup_if->type_repos (ACE_TRY_ENV); + CosTrading::TypeRepository_var obj = lookup_if->type_repos (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Narrow the Service Type Repository. - this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in (), - ACE_TRY_ENV); + this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Build the service type descriptions. @@ -26,7 +26,7 @@ TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, } void -TAO_Service_Type_Exporter::remove_all_types (CORBA::Environment& ACE_TRY_ENV) +TAO_Service_Type_Exporter::remove_all_types (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -39,7 +39,7 @@ TAO_Service_Type_Exporter::remove_all_types (CORBA::Environment& ACE_TRY_ENV) { ACE_TRY { - this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i], ACE_TRY_ENV); + this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosTrading::UnknownServiceType, excp) @@ -62,7 +62,7 @@ TAO_Service_Type_Exporter::remove_all_types (CORBA::Environment& ACE_TRY_ENV) } void -TAO_Service_Type_Exporter::add_all_types (CORBA::Environment& ACE_TRY_ENV) +TAO_Service_Type_Exporter::add_all_types (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, @@ -76,12 +76,12 @@ TAO_Service_Type_Exporter::add_all_types (CORBA::Environment& ACE_TRY_ENV) { ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::" "adding all types to the Repository.\n")); - this->add_all_types_to (this->repos_.ptr (), ACE_TRY_ENV); + this->add_all_types_to (this->repos_.ptr () TAO_ENV_ARG_PARAMETER); // ACE_CHECK; } void -TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV) +TAO_Service_Type_Exporter::add_all_types_to_all (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, @@ -96,12 +96,12 @@ TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV "add all types to all repositories.\n")); ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n")); - CosTrading::Link_var link_if = this->lookup_->link_if (ACE_TRY_ENV); + CosTrading::Link_var link_if = this->lookup_->link_if (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "Obtaining references to traders directly" " linked to the root trader.\n")); - CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_TRY_ENV); + CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "Exporting service types with each of the linked" @@ -114,19 +114,19 @@ TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n", ACE_static_cast (const char*, link_name_seq[i]))); CosTrading::Link::LinkInfo_var link_info = - link_if->describe_link (link_name_seq[i], ACE_TRY_ENV); + link_if->describe_link (link_name_seq[i] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n", ACE_static_cast (const char*, link_name_seq[i]))); CosTrading::TypeRepository_var remote_repos = - link_info->target->type_repos (ACE_TRY_ENV); + link_info->target->type_repos (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; str = - CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in (), - ACE_TRY_ENV); + CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -138,15 +138,15 @@ TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV ACE_CHECK; // @@ Seth, But this one? - this->add_all_types_to (str, ACE_TRY_ENV); + this->add_all_types_to (str TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void TAO_Service_Type_Exporter:: -add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos, - CORBA::Environment& ACE_TRY_ENV) +add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, @@ -164,8 +164,8 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos, repos->add_type (TT_Info::INTERFACE_NAMES[i], this->type_structs_[i].if_name, this->type_structs_[i].props, - this->type_structs_[i].super_types, - ACE_TRY_ENV); + this->type_structs_[i].super_types + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, ste) @@ -203,7 +203,7 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos, } void -TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& ACE_TRY_ENV) +TAO_Service_Type_Exporter::list_all_types (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -214,7 +214,7 @@ TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& ACE_TRY_ENV) sst.all_ (1); CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq_var type_names = - this->repos_->list_types (sst, ACE_TRY_ENV); + this->repos_->list_types (sst TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong l = type_names->length (); @@ -240,7 +240,7 @@ TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& ACE_TRY_ENV) } void -TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& ACE_TRY_ENV) +TAO_Service_Type_Exporter::describe_all_types (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)) @@ -253,8 +253,8 @@ TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& ACE_TRY_ENV) for (int i = 0; i < NUM_TYPES; i++) { CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct = - this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i], - ACE_TRY_ENV); + this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i] + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->verbose_) @@ -274,7 +274,7 @@ TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& ACE_TRY_ENV) } void -TAO_Service_Type_Exporter::fully_describe_all_types (CORBA::Environment& ACE_TRY_ENV) +TAO_Service_Type_Exporter::fully_describe_all_types (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)) @@ -287,8 +287,8 @@ TAO_Service_Type_Exporter::fully_describe_all_types (CORBA::Environment& ACE_TRY for (int i = 0; i < NUM_TYPES; i++) { CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct = - this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i], - ACE_TRY_ENV); + this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i] + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->verbose_) @@ -320,7 +320,6 @@ dump_typestruct (const char* type_name, "Mandatory and Readonly" }; - CORBA::Environment env; ACE_DEBUG ((LM_DEBUG, "Type Name: %s\n", type_name)); ACE_DEBUG ((LM_DEBUG, "Interface Name: %s\n", type_struct.if_name.in ())); diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h index e5645cb087b..3ddbee392b9 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h @@ -23,18 +23,18 @@ class TAO_Service_Type_Exporter public: TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, - CORBA::Boolean verbose, - CORBA::Environment& ACE_TRY_ENV) + CORBA::Boolean verbose + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void remove_all_types (CORBA::Environment& ACE_TRY_ENV) + void remove_all_types (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, CosTradingRepos::ServiceTypeRepository::HasSubTypes)); // Remove all service types from the trading service instance. - void add_all_types (CORBA::Environment& ACE_TRY_ENV) + void add_all_types (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, @@ -46,7 +46,7 @@ public: CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName)); // Add all the generated service types to the trading service instance. - void add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV) + void add_all_types_to_all (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, @@ -59,19 +59,19 @@ public: // Add all the generated service types to all the trading service // instances linked to the trading service we bootstrapped to. - void list_all_types (CORBA::Environment& ACE_TRY_ENV) + void list_all_types (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // List all the service types registered with the trading service // instance. - void describe_all_types (CORBA::Environment& ACE_TRY_ENV) + void describe_all_types (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)); // Describe all the service types registered with the trading // service instance. - void fully_describe_all_types (CORBA::Environment& ACE_TRY_ENV) + void fully_describe_all_types (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType)); @@ -84,8 +84,8 @@ private: void create_types (void); // Generate the service type description structures. - void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos, - CORBA::Environment& ACE_TRY_ENV) + void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp index 4534fec6f2e..67a7e894c17 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp @@ -10,14 +10,14 @@ ACE_RCSID(Trading, Simple_Dynamic, "$Id$") template <class T> TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp) : dp_ (dp) -{ +{ } template <class T> CORBA::Any* TAO_Simple_Dynamic_Property<T>::evalDP (const char*, CORBA::TypeCode_ptr, - const CORBA::Any&, - CORBA::Environment&) + const CORBA::Any& + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)) { CORBA::Any* return_value = 0; diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h index fde0264654c..2b646a75c56 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h @@ -34,8 +34,8 @@ public: virtual CORBA::Any* evalDP (const char* /* name */, CORBA::TypeCode_ptr /* returned_type */, - const CORBA::Any& /* extra_info */, - CORBA::Environment &) + const CORBA::Any& /* extra_info */ + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure)); private: diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp index 06d39cb1576..8a4f464d1f4 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp +++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp @@ -139,8 +139,8 @@ const char* TT_Info::QUERIES[][3] = void TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq, - CORBA::Boolean print_dynamic, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean print_dynamic + TAO_ENV_ARG_DECL) { TAO_Property_Evaluator prop_eval (prop_seq); @@ -157,7 +157,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq, if (print_dynamic || ! is_dynamic) { - value = prop_eval.property_value(k, ACE_TRY_ENV); + value = prop_eval.property_value(k TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; tc = value->type (); @@ -177,7 +177,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq, if (tc == 0) continue; - int check = tc->equal (TAO_Trader_Test::_tc_StringSeq, ACE_TRY_ENV); + int check = tc->equal (TAO_Trader_Test::_tc_StringSeq TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (check) @@ -192,7 +192,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq, } else { - check = tc->equal (TAO_Trader_Test::_tc_ULongSeq, ACE_TRY_ENV); + check = tc->equal (TAO_Trader_Test::_tc_ULongSeq TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (check) diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h index 2e346d7e5df..9ad80c25ab7 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.h +++ b/TAO/orbsvcs/tests/Trading/TT_Info.h @@ -15,8 +15,8 @@ class TT_Info public: static void dump_properties (const CosTrading::PropertySeq& prop_seq, - CORBA::Boolean print_dynamic = 1, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::Boolean print_dynamic = 1 + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Dump the contents of this property sequence. enum INTERFACES @@ -37,7 +37,7 @@ public: Remote_Output (void) {} - virtual void confirm (CORBA::Environment &) + virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) {} // Method to test that the importer received a valid reference to // the exported object. @@ -50,7 +50,7 @@ public: Printer (void) {} - virtual void confirm (CORBA::Environment &) + virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) {} // Method to test that the importer received a valid reference to // the exported object. @@ -62,7 +62,7 @@ public: public: Plotter (void) {} - virtual void confirm (CORBA::Environment &) + virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) {} // Method to test that the importer received a valid reference to // the exported object. @@ -74,7 +74,7 @@ public: public: File_System (void) {} - virtual void confirm (CORBA::Environment &) + virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) {} // Method to test that the importer received a valid reference to // the exported object. @@ -86,7 +86,7 @@ public: public: PostScript_Printer (void) {} - virtual void confirm (CORBA::Environment &) + virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) {} // Method to test that the importer received a valid reference to // the exported object. @@ -178,20 +178,20 @@ public: class TT_Parse_Args // = TITLE - // Utility to parse the command-line arguments to the trading service tests. + // Utility to parse the command-line arguments to the trading service tests. { public: - + TT_Parse_Args (int& argc, char** argv); ~TT_Parse_Args (); - + int federated () const; // True if the test should test the federated features of the trading // service. int quiet () const; - // True if the tests should supress all but the most essential output. + // True if the tests should supress all but the most essential output. char* ior () const; // Not null if the test user supplied an explicit ior. @@ -199,7 +199,7 @@ class TT_Parse_Args private: int federated_, quiet_; - char* ior_; + char* ior_; }; #endif /* TAO_TRADER_TEST_UTILS_H */ diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index 8bc004979aa..cf065e56c5d 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -32,7 +32,7 @@ main (int argc, char** argv) ACE_TRY_NEW_ENV { TAO_ORB_Manager orb_manager; - orb_manager.init (argc, argv, ACE_TRY_ENV); + orb_manager.init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Command line argument interpretation. @@ -49,68 +49,68 @@ main (int argc, char** argv) TAO_Trading_Components_i& trd_comp = trader->trading_components (); // Set the service type repository - sup_attr.type_repos (type_repos._this (ACE_TRY_ENV)); + sup_attr.type_repos (type_repos._this (TAO_ENV_SINGLE_ARG_PARAMETER)); ACE_TRY_CHECK; // Run the Service Type Exporter tests ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n")); TAO_Service_Type_Exporter type_exporter (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), - verbose, - ACE_TRY_ENV); + verbose + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.remove_all_types (ACE_TRY_ENV); + type_exporter.remove_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.add_all_types (ACE_TRY_ENV); + type_exporter.add_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.list_all_types (ACE_TRY_ENV); + type_exporter.list_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.describe_all_types (ACE_TRY_ENV); + type_exporter.describe_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.fully_describe_all_types (ACE_TRY_ENV); + type_exporter.fully_describe_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the Offer Exporter tests ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n")); TAO_Offer_Exporter offer_exporter (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), - verbose, - ACE_TRY_ENV); + verbose + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.withdraw_offers (ACE_TRY_ENV); + offer_exporter.withdraw_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.export_offers (ACE_TRY_ENV); + offer_exporter.export_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.describe_offers (ACE_TRY_ENV); + offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.modify_offers (ACE_TRY_ENV); + offer_exporter.modify_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.describe_offers (ACE_TRY_ENV); + offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.withdraw_offers_using_constraints (ACE_TRY_ENV); + offer_exporter.withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.describe_offers (ACE_TRY_ENV); + offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.withdraw_offers (ACE_TRY_ENV); + offer_exporter.withdraw_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.export_offers (ACE_TRY_ENV); + offer_exporter.export_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.describe_offers (ACE_TRY_ENV); + offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the Offer Importer tests @@ -118,7 +118,7 @@ main (int argc, char** argv) TAO_Offer_Importer offer_importer (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), verbose); - offer_importer.perform_queries (ACE_TRY_ENV); + offer_importer.perform_queries (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index ff031a1c450..34801bf7be1 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -16,7 +16,7 @@ main (int argc, char** argv) ACE_TRY_NEW_ENV { TAO_ORB_Manager orb_manager; - orb_manager.init (argc, argv, ACE_TRY_ENV); + orb_manager.init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Command line argument interpretation. @@ -29,7 +29,7 @@ main (int argc, char** argv) char* ior = parse_args.ior (); CORBA::Object_var trading_obj = (ior == 0) ? orb->resolve_initial_references ("TradingService") : - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (trading_obj.in ())) @@ -40,86 +40,86 @@ main (int argc, char** argv) // Narrow the lookup interface. ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n")); CosTrading::Lookup_var lookup_if = - CosTrading::Lookup::_narrow (trading_obj.in (), ACE_TRY_ENV); + CosTrading::Lookup::_narrow (trading_obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run the Service Type Exporter tests ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n")); TAO_Service_Type_Exporter type_exporter (lookup_if.in (), - ! parse_args.quiet (), - ACE_TRY_ENV); + ! parse_args.quiet () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.remove_all_types (ACE_TRY_ENV); + type_exporter.remove_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.add_all_types (ACE_TRY_ENV); + type_exporter.add_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.remove_all_types (ACE_TRY_ENV); + type_exporter.remove_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.add_all_types (ACE_TRY_ENV); + type_exporter.add_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args.federated ()) { - type_exporter.add_all_types_to_all (ACE_TRY_ENV); + type_exporter.add_all_types_to_all (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - type_exporter.list_all_types (ACE_TRY_ENV); + type_exporter.list_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.describe_all_types (ACE_TRY_ENV); + type_exporter.describe_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.fully_describe_all_types (ACE_TRY_ENV); + type_exporter.fully_describe_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "*** Service Type Exporter tests complete.\n")); // Run the Offer Exporter tests ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n")); - TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet (), ACE_TRY_ENV); + TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // = Test series. - offer_exporter.withdraw_offers (ACE_TRY_ENV); + offer_exporter.withdraw_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.export_offers (ACE_TRY_ENV); + offer_exporter.export_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.describe_offers (ACE_TRY_ENV); + offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.modify_offers (ACE_TRY_ENV); + offer_exporter.modify_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.describe_offers (ACE_TRY_ENV); + offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.withdraw_offers_using_constraints (ACE_TRY_ENV); + offer_exporter.withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.describe_offers (ACE_TRY_ENV); + offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.withdraw_offers (ACE_TRY_ENV); + offer_exporter.withdraw_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.export_offers (ACE_TRY_ENV); + offer_exporter.export_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args.federated ()) { - offer_exporter.export_offers_to_all (ACE_TRY_ENV); + offer_exporter.export_offers_to_all (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - offer_exporter.describe_offers (ACE_TRY_ENV); + offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "*** Offer Exporter tests complete.\n")); @@ -143,7 +143,7 @@ main (int argc, char** argv) ACE_DEBUG ((LM_WARNING, "Unable to open %s for output.\n", file)); } - orb_manager.run (ACE_TRY_ENV); + orb_manager.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp index 7f95d30dcfb..58c14450669 100644 --- a/TAO/orbsvcs/tests/Trading/import_test.cpp +++ b/TAO/orbsvcs/tests/Trading/import_test.cpp @@ -11,7 +11,7 @@ main (int argc, char** argv) ACE_TRY_NEW_ENV { TAO_ORB_Manager orb_manager; - orb_manager.init (argc, argv, ACE_TRY_ENV); + orb_manager.init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Command line argument interpretation. @@ -23,7 +23,7 @@ main (int argc, char** argv) char* ior = parse_args.ior (); CORBA::Object_var trading_obj = (ior == 0) ? orb->resolve_initial_references ("TradingService") : - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (trading_obj.in ())) @@ -34,19 +34,19 @@ main (int argc, char** argv) // Narrow the lookup interface. ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n")); CosTrading::Lookup_var lookup_if = - CosTrading::Lookup::_narrow (trading_obj.in (), ACE_TRY_ENV); + CosTrading::Lookup::_narrow (trading_obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run the Offer Importer tests ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n")); TAO_Offer_Importer offer_importer (lookup_if.in (), ! parse_args.quiet ()); - offer_importer.perform_queries (ACE_TRY_ENV); + offer_importer.perform_queries (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args.federated ()) { - offer_importer.perform_directed_queries (ACE_TRY_ENV); + offer_importer.perform_directed_queries (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp index 74a390490d7..75f1fbe0608 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp @@ -33,7 +33,7 @@ int main (int argc, char *argv []) return 1; else { - return client.run (ACE_TRY_ENV); + return client.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp index 584c4243460..7ff9800e620 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp @@ -34,7 +34,7 @@ IOR_corbaname_Client_i::~IOR_corbaname_Client_i (void) } int -IOR_corbaname_Client_i::run (CORBA::Environment &ACE_TRY_ENV) +IOR_corbaname_Client_i::run (TAO_ENV_SINGLE_ARG_DECL) { ACE_TRY @@ -46,7 +46,7 @@ IOR_corbaname_Client_i::run (CORBA::Environment &ACE_TRY_ENV) // The corbaname URL contains the host at which an NamingContext // Object can be found and also the stringified form of an entry - // in the Naming Service seperated by '#'. For simplicity, + // in the Naming Service seperated by '#'. For simplicity, // in this example, we are specifying the stringified form of // the binding directly without using <to_string> method on // <name>. "#" refers to the seperator between the host and the @@ -56,19 +56,19 @@ IOR_corbaname_Client_i::run (CORBA::Environment &ACE_TRY_ENV) // Append the seperator '#' to the host. corbaname_url += "#"; - + // Append the stringified name to the resultant. corbaname_url += "STATUS"; // Resolve the stringified name. CORBA::Object_var factory_object = - this->orb_->string_to_object (corbaname_url.c_str (), - ACE_TRY_ENV); + this->orb_->string_to_object (corbaname_url.c_str () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow corbaname::Status_var factory = - corbaname::Status::_narrow (factory_object.in (), ACE_TRY_ENV); + corbaname::Status::_narrow (factory_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory.in ())) @@ -80,8 +80,8 @@ IOR_corbaname_Client_i::run (CORBA::Environment &ACE_TRY_ENV) } // Invoke a request on the server - CORBA::Boolean ret_value = - factory->print_status (ACE_TRY_ENV); + CORBA::Boolean ret_value = + factory->print_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ret_value == 0) @@ -117,7 +117,7 @@ IOR_corbaname_Client_i::init (int argc, char **argv) this->argc_ = argc; this->argv_ = argv; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -125,8 +125,8 @@ IOR_corbaname_Client_i::init (int argc, char **argv) this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, - "" /* the ORB name, it can be anything! */, - ACE_TRY_ENV); + "" /* the ORB name, it can be anything! */ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // There must be at least one argument, the file that has to be @@ -136,7 +136,7 @@ IOR_corbaname_Client_i::init (int argc, char **argv) "Address of naming context not specified\n", this->argv_[0]), -1); - + } ACE_CATCHANY { diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h index 223dcb307ba..aad6df15978 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h @@ -39,7 +39,7 @@ class IOR_corbaname_Client_i IOR_corbaname_Client_i (void); ~IOR_corbaname_Client_i (void); - int run (CORBA::Environment &ACE_TRY_ENV); + int run (TAO_ENV_SINGLE_ARG_DECL); // Execute the client example code. int init (int argc, char **argv); diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp index 46bbdf3ee08..5c54587bf12 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp @@ -5,34 +5,34 @@ int main (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "" /* the ORB name, it can be anything! */, - ACE_TRY_ENV); + "" /* the ORB name, it can be anything! */ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get a reference to the RootPOA CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow down to the correct reference PortableServer::POA_var poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Set a POA Manager PortableServer::POAManager_var poa_manager = - poa->the_POAManager (ACE_TRY_ENV); + poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA Manager - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the servant @@ -44,13 +44,13 @@ int main (int argc, char* argv[]) // Get a reference to Naming Context CORBA::Object_var naming_context_object = - orb->resolve_initial_references ("NameService", ACE_TRY_ENV); + orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow down the reference CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_context_object.in(), - ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_context_object.in() + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Bind Status to the Naming Context @@ -59,12 +59,12 @@ int main (int argc, char* argv[]) name[0].id = CORBA::string_dup ("STATUS"); naming_context->bind (name, - status.in (), - ACE_TRY_ENV); + status.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run the orb - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the POA, waiting until the destruction terminates diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp index 46de9181071..4712b42c9fe 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp @@ -4,13 +4,13 @@ #include "status_i.h" -corbaname_Status_i::corbaname_Status_i (CORBA::Environment &) +corbaname_Status_i::corbaname_Status_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { // Constructor } CORBA::Boolean -corbaname_Status_i::print_status (CORBA::Environment &) +corbaname_Status_i::print_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // If the client makes a succesful request, return a true value diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h index a2b172ca2de..07c1c1ce442 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h +++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h @@ -9,10 +9,9 @@ class corbaname_Status_i : public POA_corbaname::Status { public: - corbaname_Status_i (CORBA::Environment & = - TAO_default_environment()); + corbaname_Status_i (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - CORBA::Boolean print_status (CORBA::Environment & = TAO_default_environment()) + CORBA::Boolean print_status (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp index 9f585d1c5db..2d5f59b38ae 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp +++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp @@ -32,12 +32,12 @@ ACE_RCSID(tests_svc_loader, tests_svc_loader, "$Id$") int main (int argc, char *argv []) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // There must be at least one argument, the file that has to be @@ -53,12 +53,12 @@ int main (int argc, char *argv []) // Use the first argument to create the object reference. CORBA::Object_var object = - orb->string_to_object (argv[1], ACE_TRY_ENV); + orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check if this object reference is a valid one.. CORBA::Boolean not_exists = - object->_non_existent (ACE_TRY_ENV); + object->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (not_exists) |