diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams')
58 files changed, 660 insertions, 660 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 2e4d40d71d6..e726d106cd4 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp @@ -25,7 +25,7 @@ Connection_Manager::init (CORBA::ORB_ptr orb) void Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, AVStreams::MMDevice_ptr sender - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->sender_name_ = sender_name; @@ -44,7 +44,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, this->sender_context_ = this->naming_client_->bind_new_context (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ -59,7 +59,7 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex) @@ -75,7 +75,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, CORBA::Object_var object = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->sender_context_ = @@ -87,13 +87,13 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, object = this->sender_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->receiver_context_ = CosNaming::NamingContext::_narrow (object.in ()); - this->find_receivers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->find_receivers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } ACE_ENDTRY; @@ -105,12 +105,12 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, // Register the sender object with the sender context. this->sender_context_->rebind (name, sender - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL) +Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::BindingIterator_var iterator; CosNaming::BindingList_var binding_list; @@ -120,12 +120,12 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL) this->receiver_context_->list (chunk, binding_list, iterator - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Add the receivers found in the bindinglist to the <receivers>. this->add_to_receivers (binding_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (iterator.in ())) @@ -137,11 +137,11 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL) { more = iterator->next_n (chunk, binding_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->add_to_receivers (binding_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -149,7 +149,7 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL) void Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (CORBA::ULong i = 0; i < binding_list.length (); @@ -168,7 +168,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list // context. CORBA::Object_var obj = this->receiver_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Connection_Manager::connect_to_receivers (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) // Register streamctrl. AVStreams::StreamCtrl_var streamctrl_object = - streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Bind the flowname and the corresponding stream controller to @@ -236,7 +236,7 @@ Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL) (*iterator).int_id_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -245,7 +245,7 @@ void Connection_Manager::bind_to_sender (const ACE_CString &sender_name, const ACE_CString &receiver_name, AVStreams::MMDevice_ptr receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->sender_name_ = sender_name; @@ -269,7 +269,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, CORBA::Object_var object = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ -287,7 +287,7 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->receiver_context_ = @@ -301,7 +301,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Create the sender context this->sender_context_ = this->naming_client_->bind_new_context (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; name [0].id = @@ -310,7 +310,7 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_ENDTRY; @@ -326,7 +326,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Register this receiver object under the receiver context. this->receiver_context_->rebind (name, receiver - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // @@ -343,11 +343,11 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, CORBA::Object_var object = this->sender_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS); this->sender_ = - AVStreams::MMDevice::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + AVStreams::MMDevice::_narrow (object.in () ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->sender_.in ())) return; @@ -396,7 +396,7 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL) // Register streamctrl. AVStreams::StreamCtrl_var streamctrl_object = - streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // @@ -415,7 +415,7 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL) this->receiver_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (result == 0) @@ -425,19 +425,19 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL) // Start the data sending. AVStreams::flowSpec start_spec; streamctrl->start (start_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Connection_Manager::add_streamctrl (const ACE_CString &flowname, TAO_StreamEndPoint *endpoint - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Get the stream controller for this endpoint. CORBA::Any_ptr streamctrl_any = endpoint->get_property_value ("Related_StreamCtrl" - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Connection_Manager::destroy (ACE_ENV_SINGLE_ARG_DECL) { AVStreams::flowSpec stop_spec; @@ -459,14 +459,14 @@ Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL) ++iterator) { (*iterator).int_id_->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void Connection_Manager::destroy (const ACE_CString &flowname - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->protocol_objects_.unbind (flowname); this->receivers_.unbind (flowname); @@ -477,7 +477,7 @@ Connection_Manager::destroy (const ACE_CString &flowname AVStreams::flowSpec stop_spec; streamctrl->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_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 6db0ebd24bb..8c2e07dbf51 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h @@ -45,32 +45,32 @@ public: void bind_to_receivers (const ACE_CString &sender_name, AVStreams::MMDevice_ptr sender - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void connect_to_receivers (ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Bind receiver to the sender. - void connect_to_sender (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void connect_to_sender (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Connect to the sender that we found. - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Destroy all streams. void destroy (const ACE_CString &flowname - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Destroy streams associated with <flowname>. void add_streamctrl (const ACE_CString &flowname, TAO_StreamEndPoint *endpoint - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Add new streamctrl. // Map of receivers. @@ -98,10 +98,10 @@ public: protected: - void find_receivers (TAO_ENV_SINGLE_ARG_DECL); + void find_receivers (ACE_ENV_SINGLE_ARG_DECL); void add_to_receivers (CosNaming::BindingList &binding_list - TAO_ENV_ARG_DECL); + ACE_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 40185c17c92..f3b06b31f7e 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + DISTRIBUTER::instance ()->connection_manager ().destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // We can close down now. @@ -154,7 +154,7 @@ Distributer::parse_args (int argc, int Distributer::init (int argc, char ** argv - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->distributer_sender_mmdevice_->_this (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Bind to receivers. this->connection_manager_.bind_to_receivers (this->distributer_name_, distributer_sender_mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Connect to receivers - this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connection_manager_.connect_to_receivers (ACE_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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Connect to sender. - this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -246,7 +246,7 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. @@ -254,38 +254,38 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Distributer int result = DISTRIBUTER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -293,7 +293,7 @@ main (int argc, while (!DISTRIBUTER::instance ()->done ()) { - orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->perform_work (ACE_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 83e7ec81eea..a135e2ffe4e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h @@ -116,7 +116,7 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 77a17d31078..977fa10467c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp @@ -96,7 +96,7 @@ Receiver::~Receiver (void) int Receiver::init (int, char ** - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -121,18 +121,18 @@ Receiver::init (int, this->mmdevice_; AVStreams::MMDevice_var mmdevice = - this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mmdevice_->_this (ACE_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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Connect to the sender. - this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -181,7 +181,7 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. @@ -189,31 +189,31 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Receiver receiver; @@ -240,7 +240,7 @@ main (int argc, result = receiver.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -249,14 +249,14 @@ main (int argc, ACE_Time_Value tv(0, 10000); while(!done) { - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } // Hack for now.... ACE_OS::sleep (1); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_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 c38cb18815a..acdf204041f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h @@ -84,7 +84,7 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 e26ac09e57f..39e4c75da8f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp @@ -82,7 +82,7 @@ Sender::parse_args (int argc, int Sender::init (int argc, char **argv - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sender_mmdevice_->_this (ACE_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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Connect to the receivers - this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connection_manager_.connect_to_receivers (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -225,7 +225,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // Run the orb for the wait time so the sender can // continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -280,54 +280,54 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; //Get the POA_var object from Object_var PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Client. int result = 0; result = SENDER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, "client::init failed\n"), -1); - SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); + SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - SENDER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + SENDER::instance ()->connection_manager ().destroy (ACE_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 58468c578b6..782049f82fe 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h @@ -63,10 +63,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Method to initialize the various data components. - int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int pace_data (ACE_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 1856b71f12c..6ade36d8ef6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp @@ -119,7 +119,7 @@ Receiver_Callback::handle_destroy (void) ACE_TRY_NEW_ENV { TAO_AV_CORE::instance ()->orb ()->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -190,7 +190,7 @@ Receiver::parse_args (int argc, int Receiver::init (int argc, char ** argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -230,7 +230,7 @@ Receiver::init (int argc, this->mmdevice_; CORBA::Object_var mmdevice = - this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the mmdevice with the naming service. @@ -249,7 +249,7 @@ Receiver::init (int argc, // Register the receiver object with the naming server. this->naming_client_->rebind (name, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -279,29 +279,29 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. - TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () TAO_ENV_ARG_PARAMETER); + TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Make sure we have a valid <output_file> @@ -320,23 +320,23 @@ main (int argc, int result = RECEIVER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // // Start sending data. - // result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); + // result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER); // ACE_TRY_CHECK; if (result != 0) return result; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Hack for now.... ACE_OS::sleep (1); - //orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + //orb->destroy (ACE_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 8050232c5b7..9d9316756e3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h @@ -94,7 +94,7 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Initialize data components. void protocol_object (TAO_AV_Protocol_Object *protocol_object); diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp index c09aa152355..cc61b8b07e2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp @@ -109,12 +109,12 @@ Sender::shutdown (void) // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; this->streamctrl_->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Shut the orb down. TAO_AV_CORE::instance ()->orb ()->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -153,7 +153,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) +Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -163,12 +163,12 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) // Resolve the receiver object reference from the Naming Service CORBA::Object_var receiver_mmdevice_obj = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->receiver_mmdevice_ = AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->receiver_mmdevice_.in ())) @@ -182,7 +182,7 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) int Sender::init (int argc, char **argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -219,7 +219,7 @@ Sender::init (int argc, "File opened successfully\n")); // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result != 0) @@ -263,7 +263,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->streamctrl_, @@ -279,7 +279,7 @@ Sender::init (int argc, this->receiver_mmdevice_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -370,7 +370,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // Run the orb for the wait time so the sender can // continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -400,12 +400,12 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; this->streamctrl_->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Shut the orb down. //TAO_AV_CORE::instance ()->orb ()->shutdown (1, - // TAO_ENV_SINGLE_ARG_PARAMETER); + // ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -429,41 +429,41 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. /* TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); */ + ACE_ENV_ARG_PARAMETER); */ ACE_TRY_CHECK; // Initialize the AVStreams components. - TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () TAO_ENV_ARG_PARAMETER); + TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) @@ -485,7 +485,7 @@ main (int argc, "File Opened Successfull\n")); // Start sending data. - result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); + result = SENDER::instance ()->pace_data (ACE_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 fbe82c9e994..af864915393 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h @@ -90,10 +90,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Method to initialize the various data components. - int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Method to pace and send data from a file. void protocol_object (TAO_AV_Protocol_Object *protocol_object); @@ -107,7 +107,7 @@ private: int parse_args (int argc, char **argv); // Method to parse the command line arguments. - int bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL); + int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL); // Method that binds the sender to the receiver. SENDER_ENDPOINT_STRATEGY endpoint_strategy_; diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp index b6a3c85341c..8e835439b85 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp @@ -26,7 +26,7 @@ Connection_Manager::init (CORBA::ORB_ptr orb) void Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, AVStreams::MMDevice_ptr sender - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->sender_name_ = sender_name; @@ -45,7 +45,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, this->sender_context_ = this->naming_client_->bind_new_context (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ -60,7 +60,7 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex) @@ -76,7 +76,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, CORBA::Object_var object = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->sender_context_ = @@ -88,13 +88,13 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, object = this->sender_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->receiver_context_ = CosNaming::NamingContext::_narrow (object.in ()); - this->find_receivers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->find_receivers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } ACE_ENDTRY; @@ -106,12 +106,12 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, // Register the sender object with the sender context. this->sender_context_->rebind (name, sender - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL) +Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::BindingIterator_var iterator; CosNaming::BindingList_var binding_list; @@ -121,12 +121,12 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL) this->receiver_context_->list (chunk, binding_list, iterator - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Add the receivers found in the bindinglist to the <receivers>. this->add_to_receivers (binding_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!CORBA::is_nil (iterator.in ())) @@ -138,11 +138,11 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL) { more = iterator->next_n (chunk, binding_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->add_to_receivers (binding_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -150,7 +150,7 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL) void Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (CORBA::ULong i = 0; i < binding_list.length (); @@ -169,7 +169,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list // context. CORBA::Object_var obj = this->receiver_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Connection_Manager::connect_to_receivers (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) // Register streamctrl. AVStreams::StreamCtrl_var streamctrl_object = - streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Bind the flowname and the corresponding stream controller to @@ -237,7 +237,7 @@ Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL) (*iterator).int_id_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -246,7 +246,7 @@ void Connection_Manager::bind_to_sender (const ACE_CString &sender_name, const ACE_CString &receiver_name, AVStreams::MMDevice_ptr receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->sender_name_ = sender_name; @@ -272,7 +272,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, CORBA::Object_var object = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ -290,7 +290,7 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->receiver_context_ = @@ -304,7 +304,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Create the sender context this->sender_context_ = this->naming_client_->bind_new_context (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; name [0].id = @@ -313,7 +313,7 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_ENDTRY; @@ -329,7 +329,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, // Register this receiver object under the receiver context. this->receiver_context_->rebind (name, receiver - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // @@ -346,11 +346,11 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, CORBA::Object_var object = this->sender_context_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS); this->sender_ = - AVStreams::MMDevice::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + AVStreams::MMDevice::_narrow (object.in () ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->sender_.in ())) return; @@ -399,7 +399,7 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL) // Register streamctrl. AVStreams::StreamCtrl_var streamctrl_object = - streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // @@ -418,7 +418,7 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL) this->receiver_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (result == 0) @@ -428,19 +428,19 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL) // Start the data sending. AVStreams::flowSpec start_spec; streamctrl->start (start_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Connection_Manager::add_streamctrl (const ACE_CString &flowname, TAO_StreamEndPoint *endpoint - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Get the stream controller for this endpoint. CORBA::Any_ptr streamctrl_any = endpoint->get_property_value ("Related_StreamCtrl" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; AVStreams::StreamCtrl_ptr streamctrl; @@ -452,7 +452,7 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname, } void -Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL) +Connection_Manager::destroy (ACE_ENV_SINGLE_ARG_DECL) { AVStreams::flowSpec stop_spec; @@ -466,7 +466,7 @@ Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL) for (int i = 0 ; i < size; i++) { (*iterator).int_id_->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; iterator.advance (); } @@ -478,7 +478,7 @@ Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL) void Connection_Manager::destroy (const ACE_CString &flowname - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->protocol_objects_.unbind (flowname); this->receivers_.unbind (flowname); @@ -489,14 +489,14 @@ Connection_Manager::destroy (const ACE_CString &flowname AVStreams::flowSpec stop_spec; streamctrl->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Connection_Manager::unbind_sender (const ACE_CString &sender_name, AVStreams::MMDevice_ptr sender_mmdevice_obj - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -513,7 +513,7 @@ Connection_Manager::unbind_sender (const ACE_CString &sender_name, { CORBA::Object_var object = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::NamingContext_var sender_context = @@ -527,7 +527,7 @@ Connection_Manager::unbind_sender (const ACE_CString &sender_name, { object = sender_context->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (Resolve_Sender); AVStreams::MMDevice_var mmdevice = @@ -536,7 +536,7 @@ Connection_Manager::unbind_sender (const ACE_CString &sender_name, if (mmdevice->_is_equivalent (sender_mmdevice_obj)) { sender_context->unbind (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (Resolve_Sender); if (TAO_debug_level > 0) @@ -583,7 +583,7 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name, { CORBA::Object_var object = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::NamingContext_var sender_context = @@ -600,7 +600,7 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name, object = sender_context->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (Resolve_Receiver); if (TAO_debug_level > 0) @@ -615,7 +615,7 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name, object = receivers_context->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (Resolve_Receiver); AVStreams::MMDevice_var mmdevice = @@ -624,7 +624,7 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name, if (mmdevice->_is_equivalent (receiver_mmdevice)) { receivers_context->unbind (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (Resolve_Receiver); if (TAO_debug_level > 0) diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h index f7f44716a56..120760b3f93 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h @@ -48,32 +48,32 @@ public: void bind_to_receivers (const ACE_CString &sender_name, AVStreams::MMDevice_ptr sender - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void connect_to_receivers (ACE_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 - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Bind receiver to the sender. - void connect_to_sender (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void connect_to_sender (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Connect to the sender that we found. - void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Destroy all streams. void destroy (const ACE_CString &flowname - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Destroy streams associated with <flowname>. void unbind_sender (const ACE_CString &sender_name, AVStreams::MMDevice_ptr sender_mmdevice - TAO_ENV_ARG_DECL_WITH_DEFAULTS) ; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ; // Unbind the sender from the Naming Service void unbind_receiver (const ACE_CString &sender_name, @@ -83,7 +83,7 @@ public: void add_streamctrl (const ACE_CString &flowname, TAO_StreamEndPoint *endpoint - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // Add new streamctrl. // Map of receivers. @@ -111,10 +111,10 @@ public: protected: - void find_receivers (TAO_ENV_SINGLE_ARG_DECL); + void find_receivers (ACE_ENV_SINGLE_ARG_DECL); void add_to_receivers (CosNaming::BindingList &binding_list - TAO_ENV_ARG_DECL); + ACE_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 0c14f07d0f3..a1f70c78b7a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -89,7 +89,7 @@ Distributer_Receiver_StreamEndPoint::set_protocol_object (const char *, CORBA::Boolean Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { //if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -296,7 +296,7 @@ Distributer::parse_args (int argc, int Distributer::init (int argc, char ** argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { /// Initialize the connection class. int result = @@ -343,7 +343,7 @@ Distributer::init (int argc, this->distributer_sender_mmdevice_; AVStreams::MMDevice_var distributer_sender_mmdevice = - this->distributer_sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->distributer_sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->distributer_receiver_mmdevice_, @@ -355,7 +355,7 @@ Distributer::init (int argc, this->distributer_receiver_mmdevice_; AVStreams::MMDevice_var distributer_receiver_mmdevice = - this->distributer_receiver_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -363,21 +363,21 @@ Distributer::init (int argc, this->connection_manager_.bind_to_sender (this->sender_name_, this->distributer_name_, distributer_receiver_mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); /// Connect to sender. - this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); /// Bind to receivers. this->connection_manager_.bind_to_receivers (this->distributer_name_, distributer_sender_mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); /// Connect to receivers - this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connection_manager_.connect_to_receivers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -390,25 +390,25 @@ Distributer::done (void) const } void -Distributer::shut_down (TAO_ENV_SINGLE_ARG_DECL) +Distributer::shut_down (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { AVStreams::MMDevice_var receiver_mmdevice = - this->distributer_receiver_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->distributer_receiver_mmdevice_->_this (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->distributer_sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; DISTRIBUTER::instance ()->connection_manager ().unbind_sender (this->distributer_name_, sender_mmdevice.in ()); - DISTRIBUTER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + DISTRIBUTER::instance ()->connection_manager ().destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -429,7 +429,7 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { /// Initialize the ORB first. @@ -437,38 +437,38 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; /// Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Initialize the Distributer int result = DISTRIBUTER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -476,11 +476,11 @@ main (int argc, while (!DISTRIBUTER::instance ()->done ()) { - orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - DISTRIBUTER::instance ()->shut_down (TAO_ENV_SINGLE_ARG_PARAMETER); + DISTRIBUTER::instance ()->shut_down (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h index b410f8a662e..ab6f4753a14 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h @@ -117,7 +117,7 @@ public: /// to the transport virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Called when a sender makes a connection request. private: @@ -174,7 +174,7 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Initialize data components. int parse_args (int argc, @@ -194,7 +194,7 @@ public: void stream_destroyed (void); /// Called when stream destroyed - void shut_down (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void shut_down (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); ///Unbind the sender and receiver from the Naming Service protected: diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp index eaf26a7c5b5..df75a6a5a07 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp @@ -49,7 +49,7 @@ Receiver_StreamEndPoint::get_callback (const char *flow_name, CORBA::Boolean Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -181,7 +181,7 @@ Receiver::receiver_name (void) int Receiver::init (int, char ** - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { /// Initialize the endpoint strategy with the orb and poa. int result = @@ -218,18 +218,18 @@ Receiver::init (int, this->mmdevice_; AVStreams::MMDevice_var mmdevice = - this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mmdevice_->_this (ACE_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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); /// Connect to the sender. - this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -275,12 +275,12 @@ Receiver::output_file_name (void) } void -Receiver::shut_down (TAO_ENV_SINGLE_ARG_DECL) +Receiver::shut_down (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { AVStreams::MMDevice_var mmdevice_obj = - this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -288,7 +288,7 @@ Receiver::shut_down (TAO_ENV_SINGLE_ARG_DECL) this->receiver_name_, mmdevice_obj.in ()); - this->connection_manager_.destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connection_manager_.destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -304,7 +304,7 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { /// Initialize the ORB first. @@ -312,31 +312,31 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; /// Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Receiver receiver; @@ -363,7 +363,7 @@ main (int argc, result = receiver.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -371,11 +371,11 @@ main (int argc, while (!done) { - orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - receiver.shut_down (TAO_ENV_SINGLE_ARG_PARAMETER); + receiver.shut_down (ACE_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 fe302b57523..19a9c673b8c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h @@ -83,7 +83,7 @@ public: TAO_AV_Callback *&callback); virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Called when a distributor tries to connect to the receiver private: @@ -108,7 +108,7 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Initialize data components. int parse_args (int argc, @@ -121,7 +121,7 @@ public: ACE_CString sender_name (void); ACE_CString receiver_name (void); - void shut_down (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void shut_down (ACE_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 266729c4943..73229a04857 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp @@ -146,20 +146,20 @@ Sender::~Sender (void) } void -Sender::shut_down (TAO_ENV_SINGLE_ARG_DECL) +Sender::shut_down (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; SENDER::instance ()->connection_manager ().unbind_sender (this->sender_name_, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - SENDER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + SENDER::instance ()->connection_manager ().destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -205,7 +205,7 @@ Sender::parse_args (int argc, int Sender::init (int argc, char **argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { /// Initialize the endpoint strategy with the orb and poa. int result = @@ -261,18 +261,18 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sender_mmdevice_->_this (ACE_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 () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); /// Connect to the receivers - this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connection_manager_.connect_to_receivers (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) { /// The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -309,7 +309,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "Shut Down called\n")); - this->shut_down (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shut_down (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -332,7 +332,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n")); - this->shut_down (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shut_down (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -375,7 +375,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) /// Run the orb for the wait time so the sender can /// continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -450,51 +450,51 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ///Get the POA_var object from Object_var PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; /// Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /// Initialize the Client. int result = 0; result = SENDER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, "client::init failed\n"), -1); - SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); + SENDER::instance ()->pace_data (ACE_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 a28a58fc69f..74a858c59cf 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h @@ -109,14 +109,14 @@ public: ~Sender (void); /// Destructor - void shut_down (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void shut_down (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Method to initialize the various data components. - int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int pace_data (ACE_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/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp index 61b48a9c005..bb0af7be4ba 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 TAO_ENV_ARG_PARAMETER); + CLIENT::instance ()->streamctrl ()->stop (stop_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - //CLIENT::instance ()->streamctrl ()->destroy (stop_spec TAO_ENV_ARG_PARAMETER); + //CLIENT::instance ()->streamctrl ()->destroy (stop_spec ACE_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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -208,12 +208,12 @@ Client::bind_to_server (void) server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice"); CORBA::Object_var server_mmdevice_obj = my_naming_client_->resolve (server_mmdevice_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->server_mmdevice_ = AVStreams::MMDevice::_narrow (server_mmdevice_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_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; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::FDev_var fdev = this->fdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; mmdevice->add_fdev (fdev.in () - TAO_ENV_ARG_PARAMETER); + ACE_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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { char flow_protocol_str [BUFSIZ]; @@ -324,7 +324,7 @@ Client::run (void) timer.start (); AVStreams::MMDevice_var client_mmdevice - = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + = this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Bind the client and server mmdevices. @@ -333,7 +333,7 @@ Client::run (void) this->server_mmdevice_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_PARAMETER); + this->streamctrl_.start (start_spec ACE_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 TAO_ENV_ARG_PARAMETER); + this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); @@ -366,13 +366,13 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa @@ -380,7 +380,7 @@ main (int argc, TAO_AV_CORE::instance ()->init (orb.in (), poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_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 9670783dc64..22f43ecfdb1 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"); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->set_protocol_restriction (protocols - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -103,7 +103,7 @@ int Server::init (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::FDev_var fdev = this->fdev_->_this (ACE_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 () TAO_ENV_ARG_PARAMETER); + mmdevice->add_fdev (fdev.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register the mmdevice with the naming service. @@ -156,7 +156,7 @@ Server::init (int argc, // Register the video control object with the naming server. this->my_naming_client_->rebind (server_mmdevice_name, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -172,10 +172,10 @@ Server::init (int argc, int Server::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -226,14 +226,14 @@ main (int argc, char **argv) { int result = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa @@ -241,7 +241,7 @@ main (int argc, TAO_AV_CORE::instance ()->init (orb.in (), poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 a95b90e6a84..b993be2173e 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" TAO_ENV_ARG_PARAMETER); + = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa @@ -98,7 +98,7 @@ int main (int argc, char *argv[]) TAO_AV_CORE::instance ()->init (orb.in (), poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + stream_control_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - obj = orb->string_to_object (ping_ior TAO_ENV_ARG_PARAMETER); + obj = orb->string_to_object (ping_ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::MMDevice_var ping_sender = - AVStreams::MMDevice::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + AVStreams::MMDevice::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - obj = orb->string_to_object (pong_ior TAO_ENV_ARG_PARAMETER); + obj = orb->string_to_object (pong_ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::MMDevice_var pong_sender = - AVStreams::MMDevice::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + AVStreams::MMDevice::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::streamQoS_var the_qos = @@ -150,21 +150,21 @@ int main (int argc, char *argv[]) ping_sender.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; flow_spec.length (0); - stream_control->start (flow_spec TAO_ENV_ARG_PARAMETER); + stream_control->start (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (100, 0); - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); // flow_spec.length (0); - // stream_control->stop (flow_spec TAO_ENV_ARG_PARAMETER); + // stream_control->stop (flow_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp index 125b1d10ba7..81a7bfd315e 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" TAO_ENV_ARG_PARAMETER); + = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa @@ -114,7 +114,7 @@ int main (int argc, char *argv[]) TAO_AV_CORE::instance ()->init (orb.in (), poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + mmdevice_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (mmdevice.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (mmdevice.in () ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + ping_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::FDev_var pong_fdev = - pong_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + pong_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mmdevice->add_fdev (ping_fdev.in () TAO_ENV_ARG_PARAMETER); + mmdevice->add_fdev (ping_fdev.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (respond == 1) { - mmdevice->add_fdev (pong_fdev.in () TAO_ENV_ARG_PARAMETER); + mmdevice->add_fdev (pong_fdev.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index 8cd24dbb20c..afe9369fdff 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" TAO_ENV_ARG_PARAMETER); + = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa @@ -131,7 +131,7 @@ int main (int argc, char *argv[]) TAO_AV_CORE::instance ()->init (orb.in (), poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + mmdevice_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (mmdevice.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (mmdevice.in () ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + ping_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::FDev_var pong_fdev = - pong_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + pong_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mmdevice->add_fdev (ping_fdev.in () TAO_ENV_ARG_PARAMETER); + mmdevice->add_fdev (ping_fdev.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (respond == 1) { - mmdevice->add_fdev (pong_fdev.in () TAO_ENV_ARG_PARAMETER); + mmdevice->add_fdev (pong_fdev.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp index 2df60ade3e3..c133ea05fe8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp @@ -26,7 +26,7 @@ Receiver_StreamEndPoint::get_callback (const char *, { CORBA::Any_ptr streamctrl_any = this->get_property_value ("Related_StreamCtrl" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::StreamCtrl_ptr streamctrl; @@ -106,7 +106,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, ACE_DECLARE_NEW_CORBA_ENV; // Initiate the modifying of the qos for the flows. - this->streamctrl_->modify_QoS (qos, flow_spec TAO_ENV_ARG_PARAMETER); + this->streamctrl_->modify_QoS (qos, flow_spec ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, @@ -146,7 +146,7 @@ Receiver_Callback::handle_destroy (void) ACE_TRY_NEW_ENV { TAO_AV_CORE::instance ()->orb ()->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -175,7 +175,7 @@ Receiver::~Receiver (void) int Receiver::init (int, char ** - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the mmdevice with the naming service. @@ -213,7 +213,7 @@ Receiver::init (int, // Register the receiver object with the naming server. this->naming_client_->rebind (name, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -250,7 +250,7 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. @@ -258,31 +258,31 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -309,19 +309,19 @@ main (int argc, result = receiver.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Hack for now.... ACE_OS::sleep (1); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_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 11e76614d32..9528a063a2a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h @@ -72,7 +72,7 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Initialize data components. diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index 36ee0a3a896..cbc8c86e533 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -34,7 +34,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *, CORBA::Boolean Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &/* the_flows */ - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed )) @@ -119,7 +119,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) +Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -129,12 +129,12 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) // Resolve the receiver object reference from the Naming Service CORBA::Object_var receiver_mmdevice_obj = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->receiver_mmdevice_ = AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->receiver_mmdevice_.in ())) @@ -148,7 +148,7 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) int Sender::init (int argc, char **argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -185,7 +185,7 @@ Sender::init (int argc, "File opened successfully\n")); // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result != 0) @@ -219,7 +219,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->streamctrl_, @@ -235,7 +235,7 @@ Sender::init (int argc, this->receiver_mmdevice_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) { @@ -325,7 +325,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // Run the orb for the wait time so the sender can // continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -354,11 +354,11 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; - this->streamctrl_->destroy (stop_spec TAO_ENV_ARG_PARAMETER); + this->streamctrl_->destroy (stop_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Shut the orb down. - TAO_AV_CORE::instance ()->orb ()->shutdown (1 TAO_ENV_ARG_PARAMETER); + TAO_AV_CORE::instance ()->orb ()->shutdown (1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -375,44 +375,44 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) @@ -421,7 +421,7 @@ main (int argc, -1); // Start sending data. - result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); + result = SENDER::instance ()->pace_data (ACE_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 21ea6e49778..4a199dd1922 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h @@ -31,7 +31,7 @@ class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &flow_spec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed )); @@ -65,10 +65,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Method to initialize the various data components. - int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int pace_data (ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + int bind_to_receiver (ACE_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 0fad378c503..3aadac1d90d 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); - //TAO_ENV_DECLARE_NEW_ENV; - CLIENT::instance ()->streamctrl ()->stop (stop_spec TAO_ENV_ARG_PARAMETER); + //ACE_DECLARE_NEW_CORBA_ENV; + CLIENT::instance ()->streamctrl ()->stop (stop_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; -// CLIENT::instance ()->streamctrl ()->destroy (stop_spec TAO_ENV_ARG_PARAMETER); +// CLIENT::instance ()->streamctrl ()->destroy (stop_spec ACE_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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -196,12 +196,12 @@ Client::bind_to_server (const char *name) server_mmdevice_name [0].id = name; CORBA::Object_var server_mmdevice_obj = my_naming_client_->resolve (server_mmdevice_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->server_mmdevice_ = AVStreams::MMDevice::_narrow (server_mmdevice_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { char flow_protocol_str [BUFSIZ]; @@ -281,7 +281,7 @@ Client::run (void) flow_spec.length (1); AVStreams::MMDevice_var client_mmdevice - = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + = this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean result = @@ -289,7 +289,7 @@ Client::run (void) AVStreams::MMDevice::_nil (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->bind_to_server ("Server_MMDevice1") == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -299,7 +299,7 @@ Client::run (void) this->server_mmdevice_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->bind_to_server ("Server_MMDevice2") == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -309,7 +309,7 @@ Client::run (void) this->server_mmdevice_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_PARAMETER); + this->streamctrl_.start (start_spec ACE_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 TAO_ENV_ARG_PARAMETER); + TAO_AV_CORE::instance ()->orb ()->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); @@ -344,13 +344,13 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa @@ -358,7 +358,7 @@ main (int argc, TAO_AV_CORE::instance ()->init (orb.in (), poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 c86c2b628ed..d2c577e01c9 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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -94,7 +94,7 @@ 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_TRY_EX (bind) @@ -102,7 +102,7 @@ Server::init (int argc, // Register the video control object with the naming server. this->my_naming_client_->bind (server_mmdevice_name, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (bind); } ACE_CATCH (CosNaming::NamingContext::AlreadyBound,al_ex) @@ -110,7 +110,7 @@ Server::init (int argc, server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice2"); this->my_naming_client_->bind (server_mmdevice_name, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -129,10 +129,10 @@ Server::init (int argc, int Server::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - TAO_AV_CORE::instance ()->orb ()->run (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_AV_CORE::instance ()->orb ()->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -186,12 +186,12 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa @@ -199,7 +199,7 @@ main (int argc, TAO_AV_CORE::instance ()->init (orb.in (), poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 ce0c4f59231..34e36546e21 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); - //TAO_ENV_DECLARE_NEW_ENV; - CLIENT::instance ()->streamctrl ()->stop (stop_spec TAO_ENV_ARG_PARAMETER); + //ACE_DECLARE_NEW_CORBA_ENV; + CLIENT::instance ()->streamctrl ()->stop (stop_spec ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - // CLIENT::instance ()->streamctrl ()->destroy (stop_spec TAO_ENV_ARG_PARAMETER); + // CLIENT::instance ()->streamctrl ()->destroy (stop_spec ACE_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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -212,12 +212,12 @@ Client::bind_to_server (const char *name) server_mmdevice_name [0].id = name; CORBA::Object_var server_mmdevice_obj = my_naming_client_->resolve (server_mmdevice_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->server_mmdevice_ = AVStreams::MMDevice::_narrow (server_mmdevice_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_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; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::FDev_var fdev = this->fdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; mmdevice->add_fdev (fdev.in () - TAO_ENV_ARG_PARAMETER); + ACE_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) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { char flow_protocol_str [BUFSIZ]; @@ -318,7 +318,7 @@ Client::run (void) flow_spec.length (1); AVStreams::MMDevice_var client_mmdevice = - this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean result = @@ -326,7 +326,7 @@ Client::run (void) AVStreams::MMDevice::_nil (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Suuceessful ONE\n")); if (result == 0) @@ -339,7 +339,7 @@ Client::run (void) this->server_mmdevice_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Suuceessful TWO\n")); @@ -355,7 +355,7 @@ Client::run (void) this->server_mmdevice_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_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 TAO_ENV_ARG_PARAMETER); + this->streamctrl_.start (start_spec ACE_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 TAO_ENV_ARG_PARAMETER); + TAO_AV_CORE::instance ()->orb ()->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); @@ -394,12 +394,12 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa @@ -407,7 +407,7 @@ main (int argc, TAO_AV_CORE::instance ()->init (orb.in (), poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 7cc5081694f..edd7fc4eaae 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"); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->set_protocol_restriction (protocols - TAO_ENV_ARG_PARAMETER); + ACE_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, -// TAO_ENV_SINGLE_ARG_DECL) +// ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); +// return endpoint->_this (ACE_ENV_SINGLE_ARG_PARAMETER); // ACE_CHECK_RETURN (0); // } @@ -119,7 +119,7 @@ int Server::init (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + AVStreams::FDev_var fdev = this->fdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; mmdevice->add_fdev (fdev.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register the mmdevice with the naming service. @@ -165,7 +165,7 @@ Server::init (int argc, // Register the video control object with the naming server. this->my_naming_client_->bind (server_mmdevice_name, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (bind); } ACE_CATCH (CosNaming::NamingContext::AlreadyBound,al_ex) @@ -173,7 +173,7 @@ Server::init (int argc, server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice2"); this->my_naming_client_->bind (server_mmdevice_name, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_ENDTRY; @@ -192,10 +192,10 @@ Server::init (int argc, int Server::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - TAO_AV_CORE::instance ()->orb ()->run (TAO_ENV_SINGLE_ARG_PARAMETER); + TAO_AV_CORE::instance ()->orb ()->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -249,12 +249,12 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa @@ -262,7 +262,7 @@ main (int argc, TAO_AV_CORE::instance ()->init (orb.in (), poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 7faf6c5e555..87a4c22639b 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, -// TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); +// ACE_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 305b7bb377e..c1c3d09e16d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp @@ -165,7 +165,7 @@ Receiver::parse_args (int argc, int Receiver::init (int argc, char ** argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -192,7 +192,7 @@ Receiver::init (int argc, this->mmdevice_; CORBA::Object_var mmdevice = - this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the mmdevice with the naming service. @@ -211,7 +211,7 @@ Receiver::init (int argc, // Register the receiver object with the naming server. this->naming_client_->rebind (name, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -235,37 +235,37 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = RECEIVER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -273,14 +273,14 @@ main (int argc, while (endstream != 2) { - orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // Hack for now.... ACE_OS::sleep (1); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_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 b15d676d68f..048b89b88be 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h @@ -97,7 +97,7 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Initialize data components. void protocol_object (TAO_AV_Protocol_Object *protocol_object); diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp index 8b6934f72c0..3612d845c7d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp @@ -56,12 +56,12 @@ Sender::shutdown (void) // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; this->streamctrl_->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Shut the orb down. TAO_AV_CORE::instance ()->orb ()->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -100,7 +100,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) +Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -110,12 +110,12 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) // Resolve the receiver object reference from the Naming Service CORBA::Object_var receiver_mmdevice_obj = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->receiver_mmdevice_ = AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->receiver_mmdevice_.in ())) @@ -129,7 +129,7 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) int Sender::init (int argc, char **argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -166,7 +166,7 @@ Sender::init (int argc, "File opened successfully\n")); // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result != 0) @@ -210,7 +210,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->streamctrl_, @@ -226,7 +226,7 @@ Sender::init (int argc, this->receiver_mmdevice_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -317,7 +317,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // Run the orb for the wait time so the sender can // continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -332,22 +332,22 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // 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 (); @@ -373,37 +373,37 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + result = SENDER::instance ()->pace_data (ACE_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 50e1c1fb481..172efc60bd4 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h @@ -66,10 +66,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Method to initialize the various data components. - int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int pace_data (ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL); // Method that binds the sender to the receiver. SENDER_ENDPOINT_STRATEGY endpoint_strategy_; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp index 32cebfb96f1..21404cc8e9c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp @@ -124,7 +124,7 @@ Client::frame_rate (void) // Method to get the object reference of the server int -Client::bind_to_server (TAO_ENV_SINGLE_ARG_DECL) +Client::bind_to_server (ACE_ENV_SINGLE_ARG_DECL) { // Initialize the naming services if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0) @@ -140,12 +140,12 @@ Client::bind_to_server (TAO_ENV_SINGLE_ARG_DECL) // Resolve the server object reference from the Naming Service CORBA::Object_var server_mmdevice_obj = my_naming_client_->resolve (server_mmdevice_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->server_mmdevice_ = AVStreams::MMDevice::_narrow (server_mmdevice_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->server_mmdevice_.in ())) @@ -159,7 +159,7 @@ Client::bind_to_server (TAO_ENV_SINGLE_ARG_DECL) int Client::init (int argc, char **argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->argc_ = argc; this->argv_ = argv; @@ -187,7 +187,7 @@ Client::init (int argc, -1); result - = this->bind_to_server (TAO_ENV_SINGLE_ARG_PARAMETER); + = this->bind_to_server (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Resolve the object reference of the server from the Naming Service. @@ -233,7 +233,7 @@ Client::init (int argc, flow_spec.length (1); AVStreams::MMDevice_var client_mmdevice = - this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Bind/Connect the client and server MMDevices. @@ -242,7 +242,7 @@ Client::init (int argc, this->server_mmdevice_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Client::pace_data (ACE_ENV_SINGLE_ARG_DECL) { // Rate at which frames of data need to be sent. @@ -341,7 +341,7 @@ Client::pace_data (TAO_ENV_SINGLE_ARG_DECL) // run the orb for the wait time so the client can continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -365,7 +365,7 @@ Client::pace_data (TAO_ENV_SINGLE_ARG_DECL) // Since the file is read stop the stream. AVStreams::flowSpec stop_spec (1); CLIENT::instance ()->streamctrl ()->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Shut the orb down. @@ -387,52 +387,52 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; //Get the POA_var object from Object_var PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV STream components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // INitialize the Client. int result = 0; result = CLIENT::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (result < 0) ACE_ERROR_RETURN ((LM_ERROR, "client::init failed\n"),1); // Start sending data. - result = CLIENT::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); + result = CLIENT::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_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 386dd169b7f..a7c7b0fcab3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h @@ -89,13 +89,13 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Method to pace and send data from a file. FILE *file (void); @@ -114,7 +114,7 @@ private: int parse_args (int argc, char **argv); // Method to parse the command line arguments. - int bind_to_server (TAO_ENV_SINGLE_ARG_DECL); + int bind_to_server (ACE_ENV_SINGLE_ARG_DECL); // Method that binds the ftp client to the server ENDPOINT_STRATEGY endpoint_strategy_; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp index 75a6cb9dfcf..cb8eebf5200 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp @@ -72,7 +72,7 @@ Server::~Server (void) int Server::init (int, char ** - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int result = this->reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (), @@ -91,7 +91,7 @@ Server::init (int, server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice"); CORBA::Object_var mmdevice = - this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(-1); // Initialize the naming services @@ -104,7 +104,7 @@ Server::init (int, // Register the server object with the naming server. this->my_naming_client_->rebind (server_mmdevice_name, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -140,14 +140,14 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -171,39 +171,39 @@ main (int argc, CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Server server; result = server.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_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 107e468f4d9..23eb5b60957 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h @@ -78,7 +78,7 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Initialize data components. protected: diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp index 263fe9fa9e6..1ce69680e75 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp @@ -93,7 +93,7 @@ Receiver::~Receiver (void) int Receiver::init (int, char ** - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the mmdevice with the naming service. @@ -131,7 +131,7 @@ Receiver::init (int, // Register the receiver object with the naming server. this->naming_client_->rebind (name, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -178,31 +178,31 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -229,7 +229,7 @@ main (int argc, result = receiver.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -237,14 +237,14 @@ main (int argc, while (!endstream) { - orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // Hack for now.... ACE_OS::sleep (1); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp index 8cb7ae5514b..ad7efd60bf6 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 (TAO_ENV_SINGLE_ARG_DECL) +Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -92,12 +92,12 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) // Resolve the receiver object reference from the Naming Service CORBA::Object_var receiver_mmdevice_obj = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->receiver_mmdevice_ = AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->receiver_mmdevice_.in ())) @@ -111,7 +111,7 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) int Sender::init (int argc, char **argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -148,7 +148,7 @@ Sender::init (int argc, "File opened successfully\n")); // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result != 0) @@ -182,7 +182,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->streamctrl_, @@ -198,7 +198,7 @@ Sender::init (int argc, this->receiver_mmdevice_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -289,7 +289,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // Run the orb for the wait time so the sender can // continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -319,12 +319,12 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; this->streamctrl_->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Shut the orb down. TAO_AV_CORE::instance ()->orb ()->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -351,37 +351,37 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + result = SENDER::instance ()->pace_data (ACE_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 e681eed4fc9..2ad409534ab 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp @@ -78,7 +78,7 @@ Distributer_Receiver_Callback::handle_destroy (void) // Destroy the receiver stream AVStreams::flowSpec stop_spec; DISTRIBUTER::instance ()->receiver_streamctrl ()->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We can close down now. @@ -127,7 +127,7 @@ Distributer::~Distributer (void) void Distributer::bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice, const ACE_CString &mmdevice_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -137,19 +137,19 @@ 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 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; mmdevice = AVStreams::MMDevice::_narrow (mmdevice_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } int Distributer::init (int /*argc*/, char *[] /*argv*/ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the naming services int result = @@ -174,14 +174,14 @@ Distributer::init (int /*argc*/, ACE_CString mmdevice_name ("Receiver"); this->bind_to_mmdevice (this->receiver_mmdevice_.out (), mmdevice_name - TAO_ENV_ARG_PARAMETER); + ACE_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 - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->distributer_sender_mmdevice_->_this (ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->receiver_streamctrl_, @@ -239,7 +239,7 @@ Distributer::init (int /*argc*/, this->receiver_mmdevice_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Create the forward flow specification to describe the flow. @@ -270,7 +270,7 @@ Distributer::init (int /*argc*/, distributer_receiver_mmdevice.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (res == 0) @@ -301,7 +301,7 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. @@ -309,38 +309,38 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Distributer int result = DISTRIBUTER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -348,7 +348,7 @@ main (int argc, while (!DISTRIBUTER::instance ()->done ()) { - orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->perform_work (ACE_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 8f003e75fd5..0f56e2e2e85 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h @@ -116,12 +116,12 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Initialize data components. void bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice, const ACE_CString &mmdevice_name - TAO_ENV_ARG_DECL); + ACE_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 ddd291d989c..619cf20c48d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp @@ -67,7 +67,7 @@ Receiver_Callback::handle_destroy (void) ACE_TRY_NEW_ENV { TAO_AV_CORE::instance ()->orb ()->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -94,7 +94,7 @@ Receiver::~Receiver (void) int Receiver::init (int, char ** - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the mmdevice with the naming service. @@ -132,7 +132,7 @@ Receiver::init (int, // Register the receiver object with the naming server. this->naming_client_->rebind (name, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -169,7 +169,7 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. @@ -177,31 +177,31 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -228,19 +228,19 @@ main (int argc, result = receiver.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Hack for now.... ACE_OS::sleep (1); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_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 1a5fa37d3a8..55d31695179 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h @@ -84,7 +84,7 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 72cc84048a5..7e1571f8970 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp @@ -21,7 +21,7 @@ Sender_StreamEndPoint::get_callback (const char *, { CORBA::Any_ptr streamctrl_any = this->get_property_value ("Related_StreamCtrl" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; AVStreams::StreamCtrl_ptr streamctrl; @@ -112,7 +112,7 @@ Sender::parse_args (int argc, int Sender::init (int argc, char **argv - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(-1); CosNaming::Name name (1); @@ -169,7 +169,7 @@ Sender::init (int argc, // Register the sender object with the naming server. this->naming_client_->rebind (name, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -255,7 +255,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // Run the orb for the wait time so the sender can // continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -292,7 +292,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; this->streamctrl_->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -310,44 +310,44 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + SENDER::instance ()->pace_data (ACE_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 6619775927b..bda039011eb 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h @@ -63,10 +63,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Method to initialize the various data components. - int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int pace_data (ACE_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 ddd291d989c..619cf20c48d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp @@ -67,7 +67,7 @@ Receiver_Callback::handle_destroy (void) ACE_TRY_NEW_ENV { TAO_AV_CORE::instance ()->orb ()->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -94,7 +94,7 @@ Receiver::~Receiver (void) int Receiver::init (int, char ** - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the mmdevice with the naming service. @@ -132,7 +132,7 @@ Receiver::init (int, // Register the receiver object with the naming server. this->naming_client_->rebind (name, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -169,7 +169,7 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. @@ -177,31 +177,31 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -228,19 +228,19 @@ main (int argc, result = receiver.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Hack for now.... ACE_OS::sleep (1); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_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 507f6ec9ca7..0ef6bc0defd 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h @@ -84,7 +84,7 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 8ab02026164..c70ab17518e 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 (TAO_ENV_SINGLE_ARG_DECL) +Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -92,12 +92,12 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) // Resolve the receiver object reference from the Naming Service CORBA::Object_var receiver_mmdevice_obj = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->receiver_mmdevice_ = AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->receiver_mmdevice_.in ())) @@ -111,7 +111,7 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) int Sender::init (int argc, char **argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -148,7 +148,7 @@ Sender::init (int argc, "File opened successfully\n")); // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result != 0) @@ -182,7 +182,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->streamctrl_, @@ -198,7 +198,7 @@ Sender::init (int argc, this->receiver_mmdevice_.in (), the_qos.inout (), flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -289,7 +289,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // Run the orb for the wait time so the sender can // continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -319,12 +319,12 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; this->streamctrl_->destroy (stop_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Shut the orb down. TAO_AV_CORE::instance ()->orb ()->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -341,44 +341,44 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + result = SENDER::instance ()->pace_data (ACE_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 aa74b4b3319..06e6de6b045 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h @@ -63,10 +63,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Method to initialize the various data components. - int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int pace_data (ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + int bind_to_receiver (ACE_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 fe8204c6cd2..f11be02f3a5 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 @@ -75,7 +75,7 @@ Receiver::~Receiver (void) int Receiver::init (int, char ** - TAO_ENV_ARG_DECL) + ACE_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 (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Register the mmdevice with the naming service. @@ -113,7 +113,7 @@ Receiver::init (int, // Register the receiver object with the naming server. this->naming_client_->rebind (name, mmdevice.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -150,7 +150,7 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. @@ -158,31 +158,31 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = @@ -209,19 +209,19 @@ main (int argc, result = receiver.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return result; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Hack for now.... ACE_OS::sleep (1); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_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 0b617c4d7bc..067c1c7f45b 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 @@ -81,7 +81,7 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_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 119c9edbb3b..27f1de4c22a 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 @@ -16,7 +16,7 @@ ACE_Time_Value inter_frame_time; CORBA::Boolean Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &the_flows - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed )) @@ -24,7 +24,7 @@ Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, ACE_DEBUG ((LM_DEBUG, "Sender_StreamEndPoint::modify_QoS\n")); - int result = this->change_qos (new_qos, the_flows TAO_ENV_ARG_PARAMETER); + int result = this->change_qos (new_qos, the_flows ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (result != 0) @@ -37,7 +37,7 @@ int Sender_StreamEndPoint::get_callback (const char *, TAO_AV_Callback *&callback) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // Create and return the sender application callback to AVStreams // for further upcalls. callback = &this->callback_; @@ -47,7 +47,7 @@ Sender_StreamEndPoint::get_callback (const char *, TAO_Negotiator, -1); AVStreams::Negotiator_var negotiator_obj = - negotiator->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + negotiator->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->set_negotiator (negotiator_obj.in ()); @@ -170,7 +170,7 @@ Sender::fill_qos (AVStreams::streamQoS &qos) // Method to get the object reference of the receiver int -Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) +Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::Name name (1); name.length (1); @@ -180,12 +180,12 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) // Resolve the receiver object reference from the Naming Service CORBA::Object_var receiver_mmdevice_obj = this->naming_client_->resolve (name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->receiver_mmdevice_ = AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (this->receiver_mmdevice_.in ())) @@ -199,7 +199,7 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL) int Sender::init (int argc, char **argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -236,7 +236,7 @@ Sender::init (int argc, "File opened successfully\n")); // Resolve the object reference of the receiver from the Naming Service. - result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result != 0) @@ -269,7 +269,7 @@ Sender::init (int argc, this->sender_mmdevice_; AVStreams::MMDevice_var mmdevice = - this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (this->streamctrl_, @@ -289,7 +289,7 @@ Sender::init (int argc, this->receiver_mmdevice_.in (), qos, flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_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 (TAO_ENV_SINGLE_ARG_DECL) +Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL) { @@ -379,7 +379,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) // Run the orb for the wait time so the sender can // continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -420,7 +420,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL) this->fill_qos (qos); this->streamctrl_->modify_QoS (qos, flow_spec - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -441,44 +441,44 @@ int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var mgr - = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the AV Stream components. TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize the Sender. int result = 0; result = SENDER::instance ()->init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result < 0) @@ -487,7 +487,7 @@ main (int argc, -1); // Start sending data. - result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER); + result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; orb->run (); 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 c3875d517a2..41fa4f8325e 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 @@ -40,7 +40,7 @@ public: CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, const AVStreams::flowSpec &/* the_flows */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC(( CORBA::SystemException, AVStreams::noSuchFlow, AVStreams::QoSRequestFailed )); @@ -69,10 +69,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Method to initialize the various data components. - int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int pace_data (ACE_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 (TAO_ENV_SINGLE_ARG_DECL); + int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL); // Method that binds the sender to the receiver. SENDER_ENDPOINT_STRATEGY endpoint_strategy_; |