diff options
Diffstat (limited to 'TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp')
| -rw-r--r-- | TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp index 14c947939fb..81c167219a1 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp @@ -3,16 +3,17 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/SString.h" ACE_CString ior = "file://test.ior"; int parse_args (int argc, - ACE_TCHAR* argv []) + char* argv []) { // Parse command line arguments - ACE_Get_Opt opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "f:"); int c; while ((c= opts ()) != -1) @@ -21,7 +22,7 @@ parse_args (int argc, { case 'f': ior = "file://"; - ior += opts.opt_arg (); + ior += ACE_TEXT_TO_CHAR_IN(opts.opt_arg ()); break; default: ACE_DEBUG ((LM_DEBUG, "Unknown Option\n")); @@ -31,44 +32,40 @@ parse_args (int argc, return 0; } -#if defined (THREAD_CANCELLED) +#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO) #undef THREAD_CANCELLED -#endif /* THREAD_CANCELLED */ +#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */ int -main (int argc, char* argv []) +ACE_TMAIN (int argc, ACE_TCHAR* argv []) { + ACE_Argv_Type_Converter convert (argc, argv); + CORBA::ORB_var orb; test_var server; - RTScheduling::Scheduler_var safe_scheduler; - ACE_TRY_NEW_ENV { - orb = CORBA::ORB_init (argc, - argv, + orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) == -1) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return (-1); - CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager" + CORBA::Object_ptr manager_obj = orb->resolve_initial_references ("RTSchedulerManager" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj.in () + TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - TAO_Scheduler* scheduler; - ACE_NEW_RETURN (scheduler, - TAO_Scheduler (orb.in ()), - -1); - safe_scheduler = scheduler; + TAO_Scheduler scheduler (orb.in ()); - manager->rtscheduler (scheduler); + manager->rtscheduler (&scheduler); CORBA::Object_var object = @@ -88,11 +85,11 @@ main (int argc, char* argv []) 1); } - CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current" + CORBA::Object_ptr current_obj = orb->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in () + RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; |