diff options
Diffstat (limited to 'TAO/tests/Multiple_Inheritance/server.cpp')
| -rw-r--r-- | TAO/tests/Multiple_Inheritance/server.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp index d29978c9163..bce1669808c 100644 --- a/TAO/tests/Multiple_Inheritance/server.cpp +++ b/TAO/tests/Multiple_Inheritance/server.cpp @@ -50,23 +50,18 @@ main (int argc, char **argv) TAO_ORB_Manager orb_manager; ACE_DEBUG ((LM_DEBUG, "\n\tMultiple Inheritance Server\n\n")); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { orb_manager.init_child_poa (argc, argv, - "child_poa" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + "child_poa"); if (parse_args (argc, argv) != 0) return -1; CORBA::String_var ior = orb_manager.activate_under_child_poa ("my_object", - &servant - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + &servant); ACE_DEBUG ((LM_DEBUG, "%s\n", ior.in ())); @@ -84,15 +79,13 @@ main (int argc, char **argv) ACE_OS::fclose (output_file); } - orb_manager.run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb_manager.run (); } - ACE_CATCH (CORBA::SystemException, sysex) + catch (const CORBA::SystemException& sysex) { - ACE_PRINT_EXCEPTION (sysex, "System Exception"); + sysex._tao_print_exception ("System Exception"); return -1; } - ACE_ENDTRY; return 0; } |