diff options
Diffstat (limited to 'TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp index 72cb2e61691..7edf3b20760 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp @@ -15,21 +15,20 @@ ior_mcast_Client_i::~ior_mcast_Client_i (void) int ior_mcast_Client_i::init (int& argc, - char *argv[] - ACE_ENV_ARG_DECL) + char *argv[]) { - ACE_TRY + try { // First initialize the ORB, that will remove some arguments... CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" /* the ORB name, it can be anything! */ - ACE_ENV_ARG_PARAMETER); + ); CORBA::Object_var mcast_server_object = - orb->resolve_initial_references ("MCASTServer" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("MCASTServer"); if (CORBA::is_nil (mcast_server_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -37,7 +36,7 @@ ior_mcast_Client_i::init (int& argc, -1); MCast::Server_var mcast_srvr = - MCast::Server::_narrow (mcast_server_object.in () ACE_ENV_ARG_PARAMETER); + MCast::Server::_narrow (mcast_server_object.in ()); if (CORBA::is_nil (mcast_srvr.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -60,16 +59,15 @@ ior_mcast_Client_i::init (int& argc, "The server has been successfully contacted!\n")); } } - ACE_CATCH (CORBA::SystemException, ex) + catch (const CORBA::SystemException& ex) { - ACE_PRINT_EXCEPTION (ex, "client"); + ex._tao_print_exception ("client"); return -1; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client"); + ex._tao_print_exception ("client"); } - ACE_ENDTRY; return 0; } |