diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp index b059768db7f..d0d61feb0f5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp @@ -169,8 +169,7 @@ Receiver::parse_args (int argc, int Receiver::init (int argc, - char ** argv - ACE_ENV_ARG_DECL) + char ** argv) { // Initialize the endpoint strategy with the orb and poa. int result = @@ -214,8 +213,7 @@ Receiver::init (int argc, // Register the receiver object with the naming server. this->naming_client_->rebind (name, - mmdevice.in () - ACE_ENV_ARG_PARAMETER); + mmdevice.in ()); return 0; } @@ -230,24 +228,20 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the ORB first. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 - ACE_ENV_ARG_PARAMETER); + 0); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); + = orb->resolve_initial_references ("RootPOA"); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); PortableServer::POAManager_var mgr = root_poa->the_POAManager (); @@ -256,13 +250,11 @@ main (int argc, // Initialize the AVStreams components. TAO_AV_CORE::instance ()->init (orb.in (), - root_poa.in () - ACE_ENV_ARG_PARAMETER); + root_poa.in ()); int result = RECEIVER::instance ()->init (argc, - argv - ACE_ENV_ARG_PARAMETER); + argv); if (result != 0) return result; @@ -277,12 +269,11 @@ main (int argc, orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"receiver::init"); + ex._tao_print_exception ("receiver::init"); return -1; } - ACE_ENDTRY; RECEIVER::close (); // Explicitly finalize the Unmanaged_Singleton. |