diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile')
3 files changed, 36 insertions, 36 deletions
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. |