summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/HTIOP
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/HTIOP')
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp4
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/client.cpp11
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/server.cpp13
-rw-r--r--TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp11
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp4
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp11
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp13
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp4
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/client.cpp11
-rw-r--r--TAO/orbsvcs/tests/HTIOP/Hello/server.cpp13
-rw-r--r--TAO/orbsvcs/tests/HTIOP/test_config.h4
11 files changed, 60 insertions, 39 deletions
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
index 8ab1d029463..ad74dd300fc 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/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/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
index efc9e973701..c4a9c06f609 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -20,6 +20,7 @@
#include "tests/test_config.h"
#include "ace/OS_NS_sys_socket.h"
#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
#include "ace/Task.h"
#include "ami_testC.h"
#include "ami_testS.h"
@@ -35,7 +36,7 @@ int number_of_replies = 0;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "dk:n:i:");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:n:i:");
int c;
while ((c = get_opts ()) != -1)
@@ -175,17 +176,19 @@ public:
Handler handler;
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 ("HTIOP_AMI_client"));
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
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;
ACE_OS::socket_init ();
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
index ee6a7282b5f..2e841274430 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
@@ -23,6 +23,7 @@
#include "tao/debug.h"
#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
#include "ace/OS_NS_sys_socket.h"
ACE_RCSID(AMI, server, "$Id$")
@@ -32,7 +33,7 @@ const char *ior_output_file = 0;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:d");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d");
int c;
while ((c = get_opts ()) != -1)
@@ -58,14 +59,16 @@ 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 ("HTIOP_AMI_server"));
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
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 =
@@ -85,7 +88,7 @@ main (int argc, char *argv[])
root_poa->the_POAManager (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;
ACE_OS::socket_init ();
@@ -105,7 +108,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",
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index 442d7a9356f..e44e2b4a128 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -21,6 +21,7 @@
#include "ace/OS_NS_sys_socket.h"
#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
#include "ace/Task.h"
#include "ami_testC.h"
@@ -36,7 +37,7 @@ int debug = 0;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "dk:i:x");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:i:x");
int c;
while ((c = get_opts ()) != -1)
@@ -155,8 +156,10 @@ public:
};
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 ("HTIOP_AMI_simple_client"));
ACE_DECLARE_NEW_CORBA_ENV;
@@ -164,7 +167,7 @@ main (int argc, char *argv[])
ACE_TRY
{
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 object_var =
@@ -182,7 +185,7 @@ main (int argc, char *argv[])
poa_manager_var->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;
// We reuse the object_var smart pointer!
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
index 8ab1d029463..ad74dd300fc 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/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/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index a9a6dac7d63..48603e5a34f 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -1,6 +1,7 @@
// $Id$
#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
#include "tao/AnyTypeCode/Any.h"
@@ -16,7 +17,7 @@ void do_nothing (void)
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)
@@ -40,15 +41,17 @@ 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);
+
CORBA::ORB_var orb = CORBA::ORB::_nil();
PortableServer::POA_var root_poa = PortableServer::POA::_nil();
Callback_i *servant = 0;
ACE_TRY_NEW_ENV
{
- orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+ orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Object_var poa_object =
@@ -102,7 +105,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;
CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index acd21da590e..6f03849ab56 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -2,6 +2,7 @@
#include "ace/OS_NS_stdio.h"
#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
#include "test_i.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
#include "tao/AnyTypeCode/Any.h"
@@ -14,7 +15,7 @@ int no_iterations = 10;
int
parse_args (int argc, char *argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "o:i:");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:");
int c;
while ((c = get_opts ()) != -1)
@@ -41,12 +42,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 =
@@ -100,7 +103,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;
Simple_Server_i *server_impl = new Simple_Server_i (orb.in (),
@@ -131,7 +134,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",
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",
diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h
index c87f7c6ecb4..960ceea80d7 100644
--- a/TAO/orbsvcs/tests/HTIOP/test_config.h
+++ b/TAO/orbsvcs/tests/HTIOP/test_config.h
@@ -43,7 +43,7 @@
#undef ACE_NDEBUG
#undef ACE_TEXT
-#define ACE_TEXT ACE_LIB_TEXT
+#define ACE_TEXT ACE_TEXT
#if defined (ACE_HAS_WINCE)
// Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'.
@@ -251,7 +251,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;
View Lorry Controller Status