diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp')
-rw-r--r-- | TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp index 1aaceae2c8c..e2bb8dc1d6a 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp @@ -9,6 +9,7 @@ #include "ace/Argv_Type_Converter.h" #include "ace/SString.h" #include "ace/Manual_Event.h" +#include "ace/Argv_Type_Converter.h" const char *output = "test.ior"; const char *input = "file://test.ior"; @@ -17,7 +18,7 @@ ACE_CString client_orb; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:o"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o"); int c; while ((c = get_opts ()) != -1) @@ -39,10 +40,11 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (parse_args (argc, - argv) == -1) + ACE_Argv_Type_Converter convert (argc, argv); + + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1) return -1; server_orb.set ("server_orb"); @@ -64,10 +66,9 @@ main (int argc, char *argv[]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = - CORBA::ORB_init (satc.get_argc (), - satc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), server_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -88,10 +89,9 @@ main (int argc, char *argv[]) // Wait for the server thread to do some processing me.wait (); - ACE_Argv_Type_Converter catc (argc, argv); CORBA::ORB_var corb = - CORBA::ORB_init (catc.get_argc (), - catc.get_TCHAR_argv (), + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), client_orb.c_str () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; |