diff options
Diffstat (limited to 'TAO/tests/NestedUpcall/Simple/server.cpp')
| -rw-r--r-- | TAO/tests/NestedUpcall/Simple/server.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp index f9f3763ca91..95db8076d74 100644 --- a/TAO/tests/NestedUpcall/Simple/server.cpp +++ b/TAO/tests/NestedUpcall/Simple/server.cpp @@ -3,6 +3,7 @@ #include "server_i.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Simple, server, "$Id$") @@ -50,7 +51,7 @@ Server_Task::svc (void) static int write_ior_to_file (const char *ior) { - FILE *output_file = ACE_OS::fopen (ior_file, "w"); + FILE *output_file = ACE_OS::fopen (ior_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IOR: %s\n", @@ -79,7 +80,7 @@ static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "q:f:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "q:f:t:"); int c; while ((c = get_opts ()) != -1) @@ -113,19 +114,20 @@ parse_args (int argc, } 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(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - int result = parse_args (argc, - argv); + int result = parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; |