diff options
Diffstat (limited to 'TAO/tests/OBV/TC_Alignment')
| -rw-r--r-- | TAO/tests/OBV/TC_Alignment/client.cpp | 13 | ||||
| -rw-r--r-- | TAO/tests/OBV/TC_Alignment/server.cpp | 11 |
2 files changed, 15 insertions, 9 deletions
diff --git a/TAO/tests/OBV/TC_Alignment/client.cpp b/TAO/tests/OBV/TC_Alignment/client.cpp index 25da5405c51..6dddb8bb67d 100644 --- a/TAO/tests/OBV/TC_Alignment/client.cpp +++ b/TAO/tests/OBV/TC_Alignment/client.cpp @@ -2,6 +2,7 @@ #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (TC_Alignment, client, @@ -126,7 +127,7 @@ run_test (test_ptr objref, int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "dk:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:x"); int c; while ((c = get_opts ()) != -1) @@ -160,17 +161,19 @@ 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, + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) { return 1; } diff --git a/TAO/tests/OBV/TC_Alignment/server.cpp b/TAO/tests/OBV/TC_Alignment/server.cpp index ba59b23fa58..7f1cc43354d 100644 --- a/TAO/tests/OBV/TC_Alignment/server.cpp +++ b/TAO/tests/OBV/TC_Alignment/server.cpp @@ -2,6 +2,7 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (TC_Alignment, server, @@ -10,13 +11,15 @@ ACE_RCSID (TC_Alignment, const char *ior_output_file = "test.ior"; 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_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -60,7 +63,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) { |