summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Bug_2248_Regression
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/Bug_2248_Regression')
-rwxr-xr-xTAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc3
-rwxr-xr-xTAO/orbsvcs/tests/Bug_2248_Regression/client.cpp28
-rwxr-xr-xTAO/orbsvcs/tests/Bug_2248_Regression/server.cpp13
3 files changed, 24 insertions, 20 deletions
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
index b3ba87fb27c..7f5ddb09532 100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
@@ -3,6 +3,7 @@
project(*idl): taoidldefaults {
idlflags += -Sc
+ avoids += uses_wchar
IDL_Files {
test.idl
@@ -14,6 +15,7 @@ project(*idl): taoidldefaults {
project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging, minimum_corba {
after += *idl
+ avoids += uses_wchar
Source_Files {
test_i.cpp
@@ -32,6 +34,7 @@ project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging,
project(*Client): taoclient, orbsvcsexe, iormanip, pi_server, ftorb, minimum_corba {
after += *idl
+ avoids += uses_wchar
Source_Files {
testC.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 0d6a828940b..629830580d0 100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -3,6 +3,7 @@
#include "Client_i.h"
#include "testC.h"
#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
#include "ace/Read_Buffer.h"
#include "tao/IORManipulation/IORManip_Loader.h"
#include "tao/PortableServer/PortableServer.h"
@@ -27,7 +28,7 @@ CORBA::Object_var object_secondary = 0;
int
parse_args (int argc, char* argv[])
{
- ACE_Get_Opt get_opts (argc, argv, "a:k:b:l:g:h:");
+ ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:k:b:l:g:h:");
int c;
while ((c = get_opts ()) != -1)
@@ -69,9 +70,11 @@ parse_args (int argc, char* argv[])
int
-main (int argc,
- char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
+// This test cannot be run on a wide character build
+// ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_DECLARE_NEW_CORBA_ENV;
Manager manager;
@@ -79,8 +82,7 @@ main (int argc,
ACE_TRY
{
// Initilaize the ORB, POA etc.
- manager.init (argc,
- argv
+ manager.init (argc, argv
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -123,8 +125,7 @@ Manager::init (int& argc,
char**& argv
ACE_ENV_ARG_DECL)
{
- this->orb_ = CORBA::ORB_init (argc,
- argv,
+ this->orb_ = CORBA::ORB_init (argc, argv,
0
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
@@ -320,7 +321,7 @@ Manager::write_to_file (CORBA::Object_ptr ior, const char* ior_output_file)
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",
@@ -389,8 +390,8 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key ACE_ENV_A
if (ACE_OS::strcmp (expected, received))
{
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("... FAIL\n"
- "CLIENT> received: '%s'\n"),
+ ACE_TEXT ("... FAIL\n")
+ ACE_TEXT ("CLIENT> received: '%s'\n"),
received));
return -1;
}
@@ -445,8 +446,8 @@ int run_abort_test (Simple_Server_ptr server,
if (ACE_OS::strcmp (expected, received))
{
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("... FAIL\n"
- "CLIENT> received: '%s'\n"),
+ ACE_TEXT ("... FAIL\n")
+ ACE_TEXT ("CLIENT> received: '%s'\n"),
received));
return -1;
}
@@ -487,8 +488,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
int argc = 0;
char **argv = 0;
- this->orb_ = CORBA::ORB_init (argc,
- argv,
+ this->orb_ = CORBA::ORB_init (argc, argv,
0
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (-1);
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",
View Lorry Controller Status