diff options
Diffstat (limited to 'TAO/tests/Faults/middle.cpp')
| -rw-r--r-- | TAO/tests/Faults/middle.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp index 8791dfa0c45..6244e071191 100644 --- a/TAO/tests/Faults/middle.cpp +++ b/TAO/tests/Faults/middle.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Failure, middle, "$Id$") @@ -13,7 +14,7 @@ int niterations = 10; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:k:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:k:i:"); int c; while ((c = get_opts ()) != -1) @@ -47,12 +48,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, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = @@ -75,7 +78,7 @@ main (int argc, char *argv[]) poa_manager->activate (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; CORBA::Object_var object = @@ -115,7 +118,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) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", |