diff options
Diffstat (limited to 'TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp')
-rw-r--r-- | TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp index 5c05c2eb776..e40e3a66417 100644 --- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp +++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp @@ -18,17 +18,17 @@ ACE_RCSID (Dump_Schedule, int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { - ACE_TRY_NEW_ENV + try { // Copy command line parameter. ACE_Argv_Type_Converter command_line(argc, argv); // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), "internet" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (command_line.get_argc(), command_line.get_ASCII_argv(), "internet"); CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("NameService"); if (CORBA::is_nil(naming_obj.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -36,7 +36,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in ()); const char *name = "ScheduleService"; if (command_line.get_argc() > 1) @@ -55,8 +55,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos.out (), deps.out (), configs.out (), anomalies.out () - ACE_ENV_ARG_PARAMETER); + infos.out (), deps.out (), configs.out (), anomalies.out ()); ACE_Scheduler_Factory::dump_schedule (infos.in (), deps.in (), @@ -64,11 +63,10 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) anomalies.in (), "Scheduler_Runtime.cpp"); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Dump_Schedule"); + ex._tao_print_exception ("Dump_Schedule"); } - ACE_ENDTRY; return 0; } |