diff options
Diffstat (limited to 'TAO/tests/RTScheduling/Scheduling_Interceptor')
| -rw-r--r-- | TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp | 17 | ||||
| -rw-r--r-- | TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp | 18 |
2 files changed, 21 insertions, 14 deletions
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp index 14c947939fb..a1d655029af 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")); @@ -36,8 +37,10 @@ parse_args (int argc, #endif /* THREAD_CANCELLED */ 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; @@ -45,13 +48,13 @@ main (int argc, char* argv []) 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" diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp index 73e333552ca..3cb3f08da75 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp @@ -4,7 +4,9 @@ #include "tao/RTScheduling/RTScheduler_Manager.h" #include "testS.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" const char* filename = "test.ior"; @@ -60,10 +62,10 @@ private: 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) @@ -82,18 +84,20 @@ parse_args (int argc, } int -main (int argc, char* argv[]) +ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" @@ -169,7 +173,7 @@ main (int argc, char* argv[]) // Print ior to the file. if (filename != 0) { - FILE* output_file = ACE_OS::fopen (filename, "w"); + FILE* output_file = ACE_OS::fopen (filename, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", |