diff options
Diffstat (limited to 'TAO/tests/Bug_1551_Regression/server.cpp')
| -rw-r--r-- | TAO/tests/Bug_1551_Regression/server.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp index 5adc91117fd..7c287a4e7e7 100644 --- a/TAO/tests/Bug_1551_Regression/server.cpp +++ b/TAO/tests/Bug_1551_Regression/server.cpp @@ -4,6 +4,7 @@ #include "Server_Task.h" #include "tao/Utils/Servant_Var.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (Bug_1XXX_Regression, server, "$Id$") @@ -16,7 +17,7 @@ int nthreads = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xn:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xn:o:"); int c; while ((c = get_opts ()) != -1) @@ -50,12 +51,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[]) 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; TAO::Utils::Servant_Var<Hello> hello_impl( @@ -90,7 +93,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> - 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", |