diff options
Diffstat (limited to 'TAO/tests/Abstract_Interface/server.cpp')
-rw-r--r-- | TAO/tests/Abstract_Interface/server.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp index 6a3c9034587..b8087ab8195 100644 --- a/TAO/tests/Abstract_Interface/server.cpp +++ b/TAO/tests/Abstract_Interface/server.cpp @@ -3,6 +3,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Abstract_Interface, server, @@ -13,7 +14,8 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Argv_Type_Converter convert (argc, argv); + ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,12 +39,14 @@ parse_args (int argc, char *argv[]) } 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_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -104,7 +108,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { return 1; } @@ -126,7 +130,7 @@ main (int argc, char *argv[]) // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) { - FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) { |