diff options
Diffstat (limited to 'TAO/orbsvcs/tests/HTIOP/Hello')
| -rw-r--r-- | TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/HTIOP/Hello/client.cpp | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/HTIOP/Hello/server.cpp | 13 |
3 files changed, 17 insertions, 11 deletions
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp index 8ab1d029463..ad74dd300fc 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp @@ -89,7 +89,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) test_dir = 0; else { - ACE_OS::strcpy (tempenv, ACE_TEXT_CHAR_TO_TCHAR (test_dir_n)); + ACE_OS::strcpy (tempenv, ACE_TEXT_TO_TCHAR_IN (test_dir_n)); test_dir = tempenv; } # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ @@ -133,7 +133,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp), + this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp), ios::out | (append ? ios::app : ios::trunc)); if (this->output_file_->bad ()) return -1; diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp index e8d3ff65f68..95ed75b3959 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp @@ -4,6 +4,7 @@ #include "tests/test_config.h" #include <ace/Get_Opt.h> +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Hello, client, "$Id$") @@ -13,7 +14,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -37,18 +38,20 @@ 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_START_TEST (ACE_TEXT ("Hello_client")); 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; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; CORBA::Object_var tmp = diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp index e3ba7544ee9..aba9078d949 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp @@ -5,6 +5,7 @@ #include "tests/test_config.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/IORTable/IORTable.h" #include "orbsvcs/CosNamingC.h" @@ -17,7 +18,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -41,8 +42,10 @@ 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_START_TEST (ACE_TEXT ("Hello_server")); ACE_TRY_NEW_ENV @@ -50,7 +53,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Begin of Hello_Server test\n")); 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; //------ Get Root POA & POA Manager references @@ -91,7 +94,7 @@ main (int argc, char *argv[]) //-------- Prepare Servant - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Hello *hello_impl; @@ -124,7 +127,7 @@ main (int argc, char *argv[]) ior_table->bind("HelloObj", ior.in() ACE_ENV_ARG_PARAMETER); // 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", |