diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp index 50247d880d6..d624906a378 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp @@ -48,10 +48,10 @@ FTP_Client_Callback::handle_timeout (void *) { ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n")); AVStreams::flowSpec stop_spec (1); - //ACE_DECLARE_NEW_CORBA_ENV; - CLIENT::instance ()->streamctrl ()->stop (stop_spec,ACE_TRY_ENV); + //TAO_ENV_DECLARE_NEW_ENV; + CLIENT::instance ()->streamctrl ()->stop (stop_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - // CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV); + // CLIENT::instance ()->streamctrl ()->destroy (stop_spec TAO_ENV_ARG_PARAMETER); //ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Just before Orb Shutdown\n")); TAO_AV_CORE::instance ()->orb ()->shutdown (0); @@ -196,7 +196,7 @@ Client::Client (void) int Client::bind_to_server (const char *name) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { @@ -211,13 +211,13 @@ Client::bind_to_server (const char *name) server_mmdevice_name.length (1); server_mmdevice_name [0].id = name; CORBA::Object_var server_mmdevice_obj = - my_naming_client_->resolve (server_mmdevice_name, - ACE_TRY_ENV); + my_naming_client_->resolve (server_mmdevice_name + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->server_mmdevice_ = - AVStreams::MMDevice::_narrow (server_mmdevice_obj.in (), - ACE_TRY_ENV); + AVStreams::MMDevice::_narrow (server_mmdevice_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->server_mmdevice_.in ())) @@ -241,7 +241,7 @@ Client::init (int argc,char **argv) this->argc_ = argc; this->argv_ = argv; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { PortableServer::POAManager_var mgr @@ -263,12 +263,12 @@ Client::init (int argc,char **argv) ACE_OS::sprintf (this->flowname_, "Data"); this->fdev_->flowname (this->flowname ()); - AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (ACE_TRY_ENV); + AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - AVStreams::FDev_var fdev = this->fdev_->_this (ACE_TRY_ENV); + AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - mmdevice->add_fdev (fdev.in (), - ACE_TRY_ENV); + mmdevice->add_fdev (fdev.in () + TAO_ENV_ARG_PARAMETER); if (this->my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -295,7 +295,7 @@ Client::init (int argc,char **argv) int Client::run (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { char flow_protocol_str [BUFSIZ]; @@ -316,17 +316,17 @@ Client::run (void) &addr); flow_spec [0] = CORBA::string_dup (entry.entry_to_string ()); flow_spec.length (1); - + AVStreams::MMDevice_var client_mmdevice = - this->client_mmdevice_._this (ACE_TRY_ENV); + this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean result = this->streamctrl_.bind_devs (client_mmdevice.in (), AVStreams::MMDevice::_nil (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Suuceessful ONE\n")); if (result == 0) @@ -338,8 +338,8 @@ Client::run (void) result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (), this->server_mmdevice_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Suuceessful TWO\n")); @@ -354,8 +354,8 @@ Client::run (void) result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (), this->server_mmdevice_.in (), the_qos.inout (), - flow_spec, - ACE_TRY_ENV); + flow_spec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Suuceessful THREE\n")); if (result == 0) @@ -363,13 +363,13 @@ Client::run (void) AVStreams::flowSpec start_spec (1); start_spec.length (1); start_spec [0] = CORBA::string_dup (this->flowname_); - this->streamctrl_.start (start_spec,ACE_TRY_ENV); + this->streamctrl_.start (start_spec TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Schedule a timer for the for the flow handler. //TAO_AV_CORE::instance ()->run (); ACE_Time_Value tv (10000,0); - TAO_AV_CORE::instance ()->orb ()->run (tv, ACE_TRY_ENV); + TAO_AV_CORE::instance ()->orb ()->run (tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); @@ -394,20 +394,20 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ()); TAO_AV_CORE::instance ()->init (orb.in (), - poa.in (), - ACE_TRY_ENV); + poa.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |