Mon Sep 29 07:33:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

26 files changed, 73 insertions, 44 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3f0b79560b3..81447c2a7cf 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,32 @@
+Mon Sep 29 07:33:45 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/AMH_Exceptions/server.cpp
+        * tests/AMH_Oneway/server.cpp
+        * tests/BiDirectional_MultipleORB/destroy.cpp
+        * tests/DII_AMI_Forward/DII_ReplyHandler.cpp
+        * tests/Hang_Shutdown/server.cpp
+        * tests/InterOp-Naming/Server_i.h
+        * tests/NestedUpcall/MT_Client_Test/client.cpp
+        * tests/NestedUpcall/MT_Client_Test/client.h
+        * tests/NestedUpcall/MT_Client_Test/local_server.cpp
+        * tests/NestedUpcall/MT_Client_Test/local_server.h
+        * tests/NestedUpcall/MT_Client_Test/server.h
+        * tests/NestedUpcall/Triangle_Test/initiator.h
+        * tests/NestedUpcall/Triangle_Test/server_A.h
+        * tests/NestedUpcall/Triangle_Test/server_B.h
+        * tests/OBV/Simple/Simple_util.cpp
+        * tests/OBV/Simple/Simple_util.h
+        * tests/ORB_destroy/ORB_destroy.cpp
+        * tests/Param_Test/driver.cpp
+        * tests/Param_Test/driver.h
+        * tests/POA/Forwarding/client.cpp
+        * tests/POA/Forwarding/server.cpp
+        * tests/POA/Loader/Server_Manager.cpp
+        * tests/POA/Loader/Server_Manager.h
+        * tests/POA/On_Demand_Loading/Server_Manager.cpp
+        * tests/POA/On_Demand_Loading/Server_Manager.h
+          ACE_TCHAR changes
+
 Sun Sep 28 18:52:45 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 56e746057de..106322843d0 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -71,7 +71,7 @@ ST_AMH_Servant::shutdown (Test::AMH_RoundtripResponseHandler_ptr /*_tao_rh*/)
 class ST_AMH_Server
 {
 public:
-  ST_AMH_Server (int *argc, char **argv);
+  ST_AMH_Server (int *argc, ACE_TCHAR **argv);
   virtual ~ST_AMH_Server ();
 
   /// ORB inititalisation stuff
@@ -89,7 +89,7 @@ public:
 
 protected:
   int *argc_;
-  char **argv_;
+  ACE_TCHAR **argv_;
   char *ior_output_file_;
   CORBA::ORB_var orb_;
   PortableServer::POA_var root_poa_;
@@ -103,7 +103,7 @@ private:
 
 /*** Server Declaration ***/
 
-ST_AMH_Server::ST_AMH_Server (int* argc, char **argv)
+ST_AMH_Server::ST_AMH_Server (int* argc, ACE_TCHAR **argv)
   : argc_ (argc)
   , argv_ (argv)
 {
diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp
index 6dd3be2c7b5..c14e68b0da5 100644
--- a/TAO/tests/AMH_Oneway/server.cpp
+++ b/TAO/tests/AMH_Oneway/server.cpp
@@ -78,7 +78,7 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr,
 class ST_AMH_Server
 {
 public:
-  ST_AMH_Server (int *argc, char **argv);
+  ST_AMH_Server (int *argc, ACE_TCHAR **argv);
   virtual ~ST_AMH_Server ();
 
   /// ORB inititalisation stuff
@@ -105,7 +105,7 @@ public:
 
 protected:
   int *argc_;
-  char **argv_;
+  ACE_TCHAR **argv_;
   char *ior_output_file_;
   CORBA::ORB_var orb_;
   PortableServer::POA_var root_poa_;
@@ -119,7 +119,7 @@ private:
 
 /*** Server Declaration ***/
 
-ST_AMH_Server::ST_AMH_Server (int* argc, char **argv)
+ST_AMH_Server::ST_AMH_Server (int* argc, ACE_TCHAR **argv)
   : argc_ (argc)
   , argv_ (argv)
 {
diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
index 520a5e2f19b..ed26ffa83ff 100644
--- a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
+++ b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
@@ -26,7 +26,7 @@ ACE_RCSID(BiDir_Multiple_ORB, destroy, "$Id$")
 
 int
 test_with_bidir_poa (int argc,
-                     char **argv,
+                     ACE_TCHAR **argv,
                      const char *orb_name,
                      int destroy_orb)
 {
diff --git a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
index 4071f759535..b7ae9af783e 100644
--- a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
+++ b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
@@ -105,7 +105,7 @@ DII_ReplyHandler::handle_location_forward (TAO_InputCDR &incoming,
     }
 
   int argc = 0;
-  char **argv = 0;
+  ACE_TCHAR **argv = 0;
   CORBA::ORB_var  orb = CORBA::ORB_init(argc,argv);
 
   CORBA::String_var iorstr = orb->object_to_string(fwd.in ());
diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp
index 07bd8d4c300..d4bc9d0acfb 100644
--- a/TAO/tests/Hang_Shutdown/server.cpp
+++ b/TAO/tests/Hang_Shutdown/server.cpp
@@ -54,7 +54,7 @@ namespace Test
         if (output_file == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Cannot open output file for writing IOR: %s",
-                             ACE_TEXT_CHAR_TO_TCHAR (ior_output_file)),
+                             ior_output_file),
                             1);
         ACE_OS::fprintf (output_file, "%s", ior.in ());
         ACE_OS::fclose (output_file);
diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h
index 389456aa47a..8826f19f0db 100644
--- a/TAO/tests/InterOp-Naming/Server_i.h
+++ b/TAO/tests/InterOp-Naming/Server_i.h
@@ -67,7 +67,7 @@ protected:
   int argc_;
   // Number of command line arguments.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // The command line arguments.
 };
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index 74bc8bb2b34..d6e6eb958f6 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -28,7 +28,7 @@
 
 ACE_RCSID(MT_Client_Test, client, "$Id$")
 
-MT_Client_Task::MT_Client_Task (int argc, char **argv,
+MT_Client_Task::MT_Client_Task (int argc, ACE_TCHAR **argv,
                                 int client_number)
   : argc_ (argc),
     argv_ (argv),
@@ -185,7 +185,7 @@ MT_Client::~MT_Client (void)
 
 
 int
-MT_Client::init (int argc, char **argv,
+MT_Client::init (int argc, ACE_TCHAR **argv,
                  int client_number)
 {
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
index 0422ed8d7aa..00ba0e48ab0 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
@@ -49,7 +49,7 @@ public:
   // Execute client example code.
 
   int init (int argc,
-            char **argv,
+            ACE_TCHAR **argv,
             int client_number);
   // Initialize the client communication endpoint with server.
 
@@ -63,7 +63,7 @@ private:
   int argc_;
   // # of arguments on the command line.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // arguments from command line.
 
   char *object_key_;
@@ -94,14 +94,14 @@ class MT_Client_Task : public ACE_Task<ACE_SYNCH>
   // = DESCRIPTION
   //    No big purpose, just wrapping
 public:
-  MT_Client_Task (int argc, char **argv, int client_number);
+  MT_Client_Task (int argc, ACE_TCHAR **argv, int client_number);
 
   virtual int svc (void);
 
 private:
   MT_Client mT_Client_;
   int argc_;
-  char **argv_;
+  ACE_TCHAR **argv_;
 
   int client_number_;
   // To determine if we use the first or the second server.
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index 9b6c8139a88..417852da351 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -28,7 +28,7 @@ ACE_RCSID(MT_Client_Test, local_server, "$Id$")
 
 MT_Server_Task::MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr,
                                 int argc,
-                                char **argv,
+                                ACE_TCHAR **argv,
                                 TAO_ORB_Manager* orb_manager_ptr)
    :ACE_Task<ACE_SYNCH> (thr_mgr_ptr),
     argc_ (argc),
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
index 01c4d33b760..e653a49d3a8 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
@@ -52,7 +52,7 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv,
+            ACE_TCHAR **argv,
             TAO_ORB_Manager* orb_manager_ptr);
   // Initialize the MT_Server state - parsing arguments and ...
 
@@ -87,7 +87,7 @@ private:
   int argc_;
   // Number of commandline arguments.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // commandline arguments.
 
   unsigned int iterations_;
@@ -108,7 +108,7 @@ class MT_Server_Task : public ACE_Task<ACE_SYNCH>
 public:
   MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr,
                   int argc,
-                  char **argv,
+                  ACE_TCHAR **argv,
                   TAO_ORB_Manager* orb_manager_ptr);
 
   virtual int svc (void);
@@ -116,7 +116,7 @@ public:
 private:
   MT_Server mT_Server_;
   int argc_;
-  char **argv_;
+  ACE_TCHAR **argv_;
   TAO_ORB_Manager* orb_manager_ptr_;
 };
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
index e4fc7ef94bf..8d0e237514e 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
@@ -48,7 +48,7 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv);
+            ACE_TCHAR **argv);
   // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
   int run (void);
@@ -70,7 +70,7 @@ private:
   int argc_;
   // Number of commandline arguments.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // commandline arguments.
 
   u_char use_mt_object_;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
index 17487f4027f..318ee6ca75e 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
@@ -51,7 +51,7 @@ public:
   // read in the IOR's for the two objects A and B
 
   int init (int argc,
-            char **argv);
+            ACE_TCHAR **argv);
   // Initialize the Initiator_Server state - parsing arguments and ...
 
   int run (void);
@@ -82,7 +82,7 @@ private:
   int argc_;
   // Number of commandline arguments.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // commandline arguments.
 
   CORBA::String_var str_;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
index 6df7d8d7bb2..095d1122d51 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
@@ -48,7 +48,7 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv);
+            ACE_TCHAR **argv);
   // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
   int run (void);
@@ -70,7 +70,7 @@ private:
   int argc_;
   // Number of commandline arguments.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // commandline arguments.
 };
 
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
index e4634ff7547..ec252a201a0 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
@@ -48,7 +48,7 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv);
+            ACE_TCHAR **argv);
   // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
   int run (void);
@@ -70,7 +70,7 @@ private:
   int argc_;
   // Number of commandline arguments.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // commandline arguments.
 };
 
diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp
index 1d48315983f..f693ac5d220 100644
--- a/TAO/tests/OBV/Simple/Simple_util.cpp
+++ b/TAO/tests/OBV/Simple/Simple_util.cpp
@@ -228,7 +228,7 @@ Client<InterfaceObj, Var>::~Client (void)
 template <class InterfaceObj, class Var> int
 Client<InterfaceObj, Var>::init (const char *name,
                                  int argc,
-                                 char **argv)
+                                 ACE_TCHAR **argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h
index abe49613309..3484fc28955 100644
--- a/TAO/tests/OBV/Simple/Simple_util.h
+++ b/TAO/tests/OBV/Simple/Simple_util.h
@@ -85,7 +85,7 @@ protected:
   int argc_;
   // Number of command line arguments.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // The command line arguments.
 };
 
@@ -136,7 +136,7 @@ protected:
   int argc_;
   // # of arguments on the command line.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // arguments from command line.
 
   char *ior_;
diff --git a/TAO/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp
index ab05175bf31..f77379f0d4a 100644
--- a/TAO/tests/ORB_destroy/ORB_destroy.cpp
+++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp
@@ -25,7 +25,7 @@ ACE_RCSID(ORB_destroy, ORB_destroy, "$Id$")
 
 int
 test_with_regular_poa_manager (int argc,
-                               char **argv,
+                               ACE_TCHAR **argv,
                                const char *orb_name,
                                int destroy_orb,
                                int destroy_poa)
@@ -67,7 +67,7 @@ test_with_regular_poa_manager (int argc,
 
 int
 test_with_funky_poa_manager (int argc,
-                             char **argv,
+                             ACE_TCHAR **argv,
                              const char *orb_name,
                              int destroy_orb,
                              int destroy_poa,
diff --git a/TAO/tests/POA/Forwarding/client.cpp b/TAO/tests/POA/Forwarding/client.cpp
index 3e110619a1d..4b94365937e 100644
--- a/TAO/tests/POA/Forwarding/client.cpp
+++ b/TAO/tests/POA/Forwarding/client.cpp
@@ -23,7 +23,7 @@
 
 ACE_RCSID(Forwarding, client, "$Id$")
 
-static char *IOR = 0;
+static ACE_TCHAR *IOR = 0;
 static int servers = 2;
 static int iterations = 3;
 
diff --git a/TAO/tests/POA/Forwarding/server.cpp b/TAO/tests/POA/Forwarding/server.cpp
index f951be80081..40228b2e77d 100644
--- a/TAO/tests/POA/Forwarding/server.cpp
+++ b/TAO/tests/POA/Forwarding/server.cpp
@@ -25,7 +25,7 @@
 ACE_RCSID(Forwarding, server, "$Id$")
 
 static const ACE_TCHAR *ior_output_file = 0;
-static const char *forward_to_ior = 0;
+static const ACE_TCHAR *forward_to_ior = 0;
 
 static int
 parse_args (int argc, ACE_TCHAR **argv)
diff --git a/TAO/tests/POA/Loader/Server_Manager.cpp b/TAO/tests/POA/Loader/Server_Manager.cpp
index efc524930e2..dced7188784 100644
--- a/TAO/tests/POA/Loader/Server_Manager.cpp
+++ b/TAO/tests/POA/Loader/Server_Manager.cpp
@@ -109,7 +109,7 @@ Server_i::write_iors_to_file (const char *first_ior,
 // Initialisation of the ORB and POA.
 
 int
-Server_i::init (int argc, char **argv)
+Server_i::init (int argc, ACE_TCHAR **argv)
 {
   try
     {
diff --git a/TAO/tests/POA/Loader/Server_Manager.h b/TAO/tests/POA/Loader/Server_Manager.h
index 2e01786f055..84d347dc2b4 100644
--- a/TAO/tests/POA/Loader/Server_Manager.h
+++ b/TAO/tests/POA/Loader/Server_Manager.h
@@ -64,7 +64,7 @@ public:
   // The server is executed.
 
 private:
-  int parse_args (int argc, char **argv);
+  int parse_args (int argc, ACE_TCHAR **argv);
   // Parses the input arguments.
 
   int write_iors_to_file (const char *first_ior,
diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
index cf24a1a93f2..6767a7b33cd 100644
--- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
@@ -24,7 +24,7 @@ Server_i::~Server_i(void)
 
 int
 Server_i::parse_args (int argc,
-                      char **argv)
+                      ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("f:"));
   int c;
@@ -111,7 +111,7 @@ Server_i::write_iors_to_file (const char *first_ior,
 // Initialisation of the ORB and POA.
 
 int
-Server_i::init (int argc, char **argv)
+Server_i::init (int argc, ACE_TCHAR **argv)
 {
 
   try
diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
index 1e56eeddcad..6dae845d679 100644
--- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
+++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
@@ -43,7 +43,7 @@ public:
   ~Server_i (void);
   // Destruction.
 
-  int init (int argc, char **argv);
+  int init (int argc, ACE_TCHAR **argv);
   // Initialisation of the ORB and poa.
 
   PortableServer::POA_ptr create_poa (const char* name,
@@ -64,7 +64,7 @@ public:
   // The server is executed.
 
 private:
-  int parse_args (int argc, char **argv);
+  int parse_args (int argc, ACE_TCHAR **argv);
   // Parses the input arguments.
 
   int write_iors_to_file (const char *first_ior,
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
index b0ffb8f750f..228e6f61316 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -60,7 +60,7 @@ Driver::~Driver (void)
 
 // initialize the driver
 int
-Driver::init (int argc, char **argv)
+Driver::init (int argc, ACE_TCHAR **argv)
 {
   // environment to track exceptions
 
diff --git a/TAO/tests/Param_Test/driver.h b/TAO/tests/Param_Test/driver.h
index 820a62c43b3..73f054c6765 100644
--- a/TAO/tests/Param_Test/driver.h
+++ b/TAO/tests/Param_Test/driver.h
@@ -35,7 +35,7 @@ public:
   Driver (void);
   ~Driver (void);
 
-  int init (int argc, char **argv);
+  int init (int argc, ACE_TCHAR **argv);
   // Initialize the driver object
 
   int run (void);