diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp')
| -rwxr-xr-x | TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp index 60f306ac782..7505a81493f 100755 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp @@ -4,6 +4,7 @@ #include "Server_Request_Interceptor.h" #include "test_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_stdio.h" #include "orbsvcs/FaultTolerance/FT_Service_Activate.h" #include "tao/ORBInitializer_Registry.h" @@ -15,7 +16,7 @@ const char *key = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:k:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:k:f:"); int c; while ((c = get_opts ()) != -1) @@ -47,9 +48,9 @@ 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_DECLARE_NEW_CORBA_ENV; ACE_TRY @@ -66,11 +67,11 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; 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; // We do the command line parsing first - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); @@ -132,7 +133,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", |