diff options
Diffstat (limited to 'TAO/tests/DSI_Gateway/gateway.cpp')
-rw-r--r-- | TAO/tests/DSI_Gateway/gateway.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp index 4aade2c1f03..6cc2ae79484 100644 --- a/TAO/tests/DSI_Gateway/gateway.cpp +++ b/TAO/tests/DSI_Gateway/gateway.cpp @@ -3,6 +3,7 @@ #include "test_dsi.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(DSI_Gateway, server, "$Id$") @@ -14,7 +15,7 @@ const char *ior_output_file = "gateway.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:o:"); int c; while ((c = get_opts ()) != -1) @@ -54,12 +55,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 = @@ -84,7 +87,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; } @@ -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) { |