diff options
Diffstat (limited to 'TAO/tests/Multiple_Inheritance/server.cpp')
| -rw-r--r-- | TAO/tests/Multiple_Inheritance/server.cpp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp index c328a07e42d..05135156b37 100644 --- a/TAO/tests/Multiple_Inheritance/server.cpp +++ b/TAO/tests/Multiple_Inheritance/server.cpp @@ -8,13 +8,6 @@ ACE_RCSID(Multiple_Inheritance, server, "$Id$") static char *ior_output_file = 0; -Multiple_Inheritance_i::Multiple_Inheritance_i (void) -{ - // Sun/CC 5.0 crashes if there is no explicit default - // constructor - // Default constructor, do nothin.. -} - int parse_args (int argc, char **argv) { @@ -48,14 +41,13 @@ 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 + TAO_TRY { orb_manager.init_child_poa (argc, argv, "child_poa", - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV; if (parse_args (argc, argv) != 0) return -1; @@ -63,8 +55,8 @@ main (int argc, char **argv) CORBA::String_var ior = orb_manager.activate_under_child_poa ("my_object", &servant, - ACE_TRY_ENV); - ACE_TRY_CHECK; + TAO_TRY_ENV); + TAO_CHECK_ENV; ACE_DEBUG ((LM_DEBUG, "%s\n", ior.in ())); @@ -82,15 +74,16 @@ main (int argc, char **argv) ACE_OS::fclose (output_file); } - orb_manager.run (ACE_TRY_ENV); - ACE_TRY_CHECK; + orb_manager.run (TAO_TRY_ENV); + TAO_CHECK_ENV; } - ACE_CATCH (CORBA::SystemException, sysex) + TAO_CATCH (CORBA::SystemException, sysex) { - ACE_PRINT_EXCEPTION (sysex, "System Exception"); + ACE_UNUSED_ARG (sysex); + TAO_TRY_ENV.print_exception ("System Exception"); return -1; } - ACE_ENDTRY; + TAO_ENDTRY; return 0; } |