Tue Sep 30 14:47:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

42 files changed, 68 insertions, 86 deletions

diff --git a/TAO/tests/COIOP/Client_Task.h b/TAO/tests/COIOP/Client_Task.h
index 9816974c4df..74dce8b3bc3 100644
--- a/TAO/tests/COIOP/Client_Task.h
+++ b/TAO/tests/COIOP/Client_Task.h
@@ -19,7 +19,7 @@ class Client_Task : public ACE_Task_Base
 public:
 
   /// Constructor
-  Client_Task (const char *input,
+  Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr,
                CORBA::Boolean result);
@@ -28,7 +28,7 @@ public:
   int svc (void);
 
 private:
-  const char *input_;
+  const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
 
diff --git a/TAO/tests/COIOP/Server_Task.cpp b/TAO/tests/COIOP/Server_Task.cpp
index e1ff038addc..f2f09819674 100644
--- a/TAO/tests/COIOP/Server_Task.cpp
+++ b/TAO/tests/COIOP/Server_Task.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(Collocated_Test,
           "$Id$")
 
 
-Server_Task::Server_Task (const char *output,
+Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/TAO/tests/COIOP/Server_Task.h b/TAO/tests/COIOP/Server_Task.h
index 60006aae0ba..e42043c0711 100644
--- a/TAO/tests/COIOP/Server_Task.h
+++ b/TAO/tests/COIOP/Server_Task.h
@@ -24,7 +24,7 @@ class Server_Task : public ACE_Task_Base
 {
 public:
   /// Constructor
-  Server_Task (const char *output,
+  Server_Task (const ACE_TCHAR *output,
                CORBA::ORB_ptr sorb,
                ACE_Manual_Event &me,
                ACE_Thread_Manager *thr_mgr);
@@ -34,7 +34,7 @@ public:
 
 private:
   /// Output file for IOR
-  const char *output_;
+  const ACE_TCHAR *output_;
 
   /// Manual event to wake up the main thread to create a client
   /// thread.
diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.h b/TAO/tests/Collocation_Exception_Test/Client_Task.h
index 33eb64be258..7cd0fd1eb01 100644
--- a/TAO/tests/Collocation_Exception_Test/Client_Task.h
+++ b/TAO/tests/Collocation_Exception_Test/Client_Task.h
@@ -20,7 +20,7 @@ class Client_Task : public ACE_Task_Base
 public:
 
   /// Constructor
-  Client_Task (const char *input,
+  Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
@@ -32,7 +32,7 @@ private:
   void test_user_exception_expected (Test::Hello_ptr hello_ptr);
   void test_user_exception_not_expected (Test::Hello_ptr hello_ptr);
 
-  const char *input_;
+  const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
 };
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
index ed01435ce1d..ea5496296a4 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(Collocation_Oneway_Tests,
           "$Id$")
 
 
-Server_Task::Server_Task (const char *output,
+Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.h b/TAO/tests/Collocation_Exception_Test/Server_Task.h
index 60006aae0ba..e42043c0711 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.h
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.h
@@ -24,7 +24,7 @@ class Server_Task : public ACE_Task_Base
 {
 public:
   /// Constructor
-  Server_Task (const char *output,
+  Server_Task (const ACE_TCHAR *output,
                CORBA::ORB_ptr sorb,
                ACE_Manual_Event &me,
                ACE_Thread_Manager *thr_mgr);
@@ -34,7 +34,7 @@ public:
 
 private:
   /// Output file for IOR
-  const char *output_;
+  const ACE_TCHAR *output_;
 
   /// Manual event to wake up the main thread to create a client
   /// thread.
diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.h b/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
index 459a44e96ce..1e8a39a26cf 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.h
@@ -26,7 +26,7 @@ enum ClientSyncModeEnum {
 };
 
   /// Constructor
-  Client_Task (const char *input,
+  Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ClientSyncModeEnum syncMode,
                ACE_Thread_Manager *thr_mgr);
@@ -35,7 +35,7 @@ enum ClientSyncModeEnum {
   int svc (void);
 
 private:
-  const char *input_;
+  const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
 
diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
index fbbedfd2aa8..94c63039df9 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(Collocation_Oneway_Tests,
           "$Id$")
 
 
-Server_Task::Server_Task (const char *output,
+Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
index 60006aae0ba..e42043c0711 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
@@ -24,7 +24,7 @@ class Server_Task : public ACE_Task_Base
 {
 public:
   /// Constructor
-  Server_Task (const char *output,
+  Server_Task (const ACE_TCHAR *output,
                CORBA::ORB_ptr sorb,
                ACE_Manual_Event &me,
                ACE_Thread_Manager *thr_mgr);
@@ -34,7 +34,7 @@ public:
 
 private:
   /// Output file for IOR
-  const char *output_;
+  const ACE_TCHAR *output_;
 
   /// Manual event to wake up the main thread to create a client
   /// thread.
diff --git a/TAO/tests/Collocation_Tests/Client_Task.h b/TAO/tests/Collocation_Tests/Client_Task.h
index 98ea06eca46..8f6557cdec8 100644
--- a/TAO/tests/Collocation_Tests/Client_Task.h
+++ b/TAO/tests/Collocation_Tests/Client_Task.h
@@ -19,7 +19,7 @@ class Client_Task : public ACE_Task_Base
 public:
 
   /// Constructor
-  Client_Task (const char *input,
+  Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
@@ -27,7 +27,7 @@ public:
   int svc (void);
 
 private:
-  const char *input_;
+  const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
 
diff --git a/TAO/tests/Collocation_Tests/Server_Task.cpp b/TAO/tests/Collocation_Tests/Server_Task.cpp
index 577e4bcc897..03f568c7472 100644
--- a/TAO/tests/Collocation_Tests/Server_Task.cpp
+++ b/TAO/tests/Collocation_Tests/Server_Task.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(Collocated_Test,
           "$Id$")
 
 
-Server_Task::Server_Task (const char *output,
+Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/TAO/tests/Collocation_Tests/Server_Task.h b/TAO/tests/Collocation_Tests/Server_Task.h
index 60006aae0ba..e42043c0711 100644
--- a/TAO/tests/Collocation_Tests/Server_Task.h
+++ b/TAO/tests/Collocation_Tests/Server_Task.h
@@ -24,7 +24,7 @@ class Server_Task : public ACE_Task_Base
 {
 public:
   /// Constructor
-  Server_Task (const char *output,
+  Server_Task (const ACE_TCHAR *output,
                CORBA::ORB_ptr sorb,
                ACE_Manual_Event &me,
                ACE_Thread_Manager *thr_mgr);
@@ -34,7 +34,7 @@ public:
 
 private:
   /// Output file for IOR
-  const char *output_;
+  const ACE_TCHAR *output_;
 
   /// Manual event to wake up the main thread to create a client
   /// thread.
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h
index 2659536d7ad..80ecdcbb79e 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h
@@ -19,18 +19,18 @@ class Client_Task : public ACE_Task_Base
 public:
 
   /// Constructor
-  Client_Task (const char *input,
+  Client_Task (const ACE_TCHAR *input,
                const char *simple_test_ior,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
   int svc (void);
- 
+
   CORBA::ULong error_count () const;
-  
+
 private:
-  const char *input_;
+  const ACE_TCHAR *input_;
   const char *simple_test_input_;
 
   CORBA::ORB_var corb_;
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
index f7bc2ceb483..91ad412b555 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(DII_Collocation_Tests,
           "$Id$")
 
 
-Server_Task::Server_Task (const char *output,
+Server_Task::Server_Task (const ACE_TCHAR *output,
                           const char *simple_test_output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
index ca7b9090ea5..076f5843b82 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h
@@ -24,7 +24,7 @@ class Server_Task : public ACE_Task_Base
 {
 public:
   /// Constructor
-  Server_Task (const char *output,
+  Server_Task (const ACE_TCHAR *output,
                const char *simple_test_output,
                CORBA::ORB_ptr sorb,
                ACE_Manual_Event &me,
@@ -37,7 +37,7 @@ public:
 
 private:
   /// Output file for server IOR
-  const char *output_;
+  const ACE_TCHAR *output_;
 
   /// Output file for Simple_Test IOR
   const char *simple_test_output_;
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h
index 2659536d7ad..80ecdcbb79e 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h
@@ -19,18 +19,18 @@ class Client_Task : public ACE_Task_Base
 public:
 
   /// Constructor
-  Client_Task (const char *input,
+  Client_Task (const ACE_TCHAR *input,
                const char *simple_test_ior,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
   /// Thread entry point
   int svc (void);
- 
+
   CORBA::ULong error_count () const;
-  
+
 private:
-  const char *input_;
+  const ACE_TCHAR *input_;
   const char *simple_test_input_;
 
   CORBA::ORB_var corb_;
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
index f2f6b63c906..cac9fada034 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp
@@ -10,7 +10,7 @@ ACE_RCSID(DII_Collocation_Tests,
           "$Id$")
 
 
-Server_Task::Server_Task (const char *output,
+Server_Task::Server_Task (const ACE_TCHAR *output,
                           const char *simple_test_output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
index 5d29037aadf..e2852cbecc4 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h
@@ -21,7 +21,7 @@ class Server_Task : public ACE_Task_Base
 {
 public:
   /// Constructor
-  Server_Task (const char *output,
+  Server_Task (const ACE_TCHAR *output,
                const char *simple_test_output,
                CORBA::ORB_ptr sorb,
                ACE_Manual_Event &me,
@@ -34,7 +34,7 @@ public:
 
 private:
   /// Output file for server IOR
-  const char *output_;
+  const ACE_TCHAR *output_;
 
   /// Output file for Simple_Test IOR
   const char *simple_test_output_;
diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp
index 8c8d8f329f5..97ba502a727 100644
--- a/TAO/tests/MProfile/client.cpp
+++ b/TAO/tests/MProfile/client.cpp
@@ -11,7 +11,7 @@ ACE_RCSID(MT_Server, client, "$Id$")
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int do_shutdown = 0;
 
-const char *name = "file://amba.ior";
+const ACE_TCHAR *name = "file://amba.ior";
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp
index e82270c71cf..ef8b0171491 100644
--- a/TAO/tests/MProfile_Connection_Timeout/client.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp
@@ -15,7 +15,7 @@ ACE_RCSID(MProfile_Connection_Timeout,
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int do_shutdown = 0;
 
-const char *name = "file://amba.ior";
+const ACE_TCHAR *name = "file://amba.ior";
 TimeBase::TimeT timeout_period = 1000000;
 
 int
diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp
index a6f29c8c55e..706dab2171e 100644
--- a/TAO/tests/MProfile_Forwarding/client.cpp
+++ b/TAO/tests/MProfile_Forwarding/client.cpp
@@ -7,7 +7,7 @@
 
 ACE_RCSID(MT_Server, client, "$Id$")
 
-const char *ior_input_file = 0;
+const ACE_TCHAR *ior_input_file = 0;
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index 4db190e3581..9fa33e34d95 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -24,8 +24,8 @@
 
 ACE_RCSID(Multiple_Inheritance, client, "$Id$")
 
-static char *ior = 0;
-static char *ior_input_file = 0;
+static ACE_TCHAR *ior = 0;
+static ACE_TCHAR *ior_input_file = 0;
 
 static int
 parse_args (int argc, ACE_TCHAR **argv)
diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp
index 5b0055a6c5a..0d276522e8d 100644
--- a/TAO/tests/Muxed_GIOP_Versions/client.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp
@@ -8,7 +8,7 @@
 ACE_RCSID(MT_Client, client, "client.cpp,v 1.16 2002/01/29 20:21:08 okellogg Exp")
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
-const char *corbaloc_arg = "corbaloc:iiop:1.0@localhost:12000/ObjectName";
+const ACE_TCHAR *corbaloc_arg = ACE_TEXT("corbaloc:iiop:1.0@localhost:12000/ObjectName");
 int nthreads = 5;
 int niterations = 5;
 int server_shutdown = 0;
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index 4c957f12569..e9b85f55fb9 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -8,7 +8,7 @@
 ACE_RCSID(MT_Server, server, "server.cpp,v 1.7 2002/01/29 20:21:08 okellogg Exp")
 
 const ACE_TCHAR *ior_output_file = 0;
-const char *corbaloc_arg = "corbaloc:iiop:1.0@localhost:12000/ObjectName";
+const ACE_TCHAR *corbaloc_arg = ACE_TEXT("corbaloc:iiop:1.0@localhost:12000/ObjectName");
 int niterations = 5;
 
 int nthreads = 4;
diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
index d5e20fc1203..2487abff11c 100644
--- a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
@@ -4,7 +4,7 @@
 
 #include "Client_Task.h"
 
-Client_Task::Client_Task (const char *ior,
+Client_Task::Client_Task (const ACE_TCHAR *ior,
                           CORBA::ORB_ptr corb,
                           ACE_Thread_Manager *thr_mgr)
   : ACE_Task_Base (thr_mgr)
diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.h b/TAO/tests/OBV/Collocated/Forward/Client_Task.h
index 3bce85e5d0d..d41c7ae468a 100644
--- a/TAO/tests/OBV/Collocated/Forward/Client_Task.h
+++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.h
@@ -22,7 +22,7 @@ class Client_Task : public ACE_Task_Base
 public:
 
   /// Constructor
-  Client_Task (const char *input,
+  Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
@@ -38,7 +38,7 @@ public:
   int is_equal_node (BaseNode * node1, BaseNode * node2);
 
 private:
-  const char *input_;
+  const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
 
diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
index 35b9b4b64bb..5304ab5471c 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
@@ -9,7 +9,7 @@
 
 #include "ace/Manual_Event.h"
 
-Server_Task::Server_Task (const char *output,
+Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.h b/TAO/tests/OBV/Collocated/Forward/Server_Task.h
index 60006aae0ba..e42043c0711 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.h
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.h
@@ -24,7 +24,7 @@ class Server_Task : public ACE_Task_Base
 {
 public:
   /// Constructor
-  Server_Task (const char *output,
+  Server_Task (const ACE_TCHAR *output,
                CORBA::ORB_ptr sorb,
                ACE_Manual_Event &me,
                ACE_Thread_Manager *thr_mgr);
@@ -34,7 +34,7 @@ public:
 
 private:
   /// Output file for IOR
-  const char *output_;
+  const ACE_TCHAR *output_;
 
   /// Manual event to wake up the main thread to create a client
   /// thread.
diff --git a/TAO/tests/OBV/Simple/Client_i.h b/TAO/tests/OBV/Simple/Client_i.h
index 5c705839530..7406b10edcb 100644
--- a/TAO/tests/OBV/Simple/Client_i.h
+++ b/TAO/tests/OBV/Simple/Client_i.h
@@ -44,7 +44,7 @@ public:
   virtual  ~Checkpoint_Client_i (void);
   // Destructor
 
-  virtual int run (const char *,int, char** );
+  virtual int run (const char *,int, ACE_TCHAR** );
   // Execute the methods
 
 private:
diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
index c77a0fb292b..d54400d55ef 100644
--- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -46,7 +46,7 @@ ServantManager_i::obtain_servant (const char *str,
   this->parse_string (str);
 
   // Create the DLL object.
-  ACE_DLL *dll;
+  ACE_DLL *dll = 0;
 
   ACE_NEW_RETURN (dll,
                   ACE_DLL,
diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
index 6dae845d679..21e8a733bf2 100644
--- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
+++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h
@@ -71,7 +71,7 @@ private:
                           const char *second_ior);
   // The IORs are written to a file for future use.
 
-  char *ior_output_file_;
+  ACE_TCHAR *ior_output_file_;
   // Default ior file.
 
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/POA/TIE/client.cpp b/TAO/tests/POA/TIE/client.cpp
index 884f53e12bc..24fd72e1d52 100644
--- a/TAO/tests/POA/TIE/client.cpp
+++ b/TAO/tests/POA/TIE/client.cpp
@@ -110,28 +110,16 @@ class Test
 {
 public:
   static void run (CORBA::ORB_ptr orb,
-                   char *IOR)
+                   ACE_TCHAR *IOR)
   {
     if (IOR != 0)
       {
         // Get an object reference from the argument string.
         CORBA::Object_var object = orb->string_to_object (IOR);
 
-        /*if (.exception () != 0)
-          {
-.print_exception ("CORBA::ORB::string_to_object");
-            return;
-          }
-        */
         // Try to narrow the object reference to a reference.
         T_var test = T::_narrow (object.in ());
 
-        /*if (.exception () != 0)
-          {
-.print_exception ("_narrow");
-            return;
-          }
-        */
         ACE_Profile_Timer timer;
         ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
 
@@ -153,12 +141,6 @@ public:
         // compute average time.
         print_stats (elapsed_time, i);
 
-        /*if (.exception () != 0)
-          {
-.print_exception ("doit");
-            return;
-          }
-        */
         // Print the result of doit () method on the reference.
         ACE_DEBUG ((LM_DEBUG,
                     "%d\n",
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
index c986c8b63db..d93fbb3fc93 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h
@@ -20,7 +20,7 @@ class Client_Task : public ACE_Task_Base
 public:
 
   /// Constructor
-  Client_Task (const char *input,
+  Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
@@ -30,7 +30,7 @@ public:
   void run_test (Test_Interceptors::Visual_ptr server);
 
 private:
-  const char *input_;
+  const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
index 1d1ef6bcbc8..3a33e14abb0 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(Collocated_Test,
           "$Id$")
 
 
-Server_Task::Server_Task (const char *output,
+Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
index 2101f9a9a15..a22ea274557 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
@@ -24,7 +24,7 @@ class Server_Task : public ACE_Task_Base
 {
 public:
   /// Constructor
-  Server_Task (const char *output,
+  Server_Task (const ACE_TCHAR *output,
                CORBA::ORB_ptr sorb,
                ACE_Manual_Event &me,
                ACE_Thread_Manager *thr_mgr);
@@ -34,7 +34,7 @@ public:
 
 private:
   /// Output file for IOR
-  const char *output_;
+  const ACE_TCHAR *output_;
 
   /// Manual event to wake up the main thread to create a client
   /// thread.
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
index 9448c093314..cf8e7e6a23f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h
@@ -20,7 +20,7 @@ class Client_Task : public ACE_Task_Base
 public:
 
   /// Constructor
-  Client_Task (const char *input,
+  Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
@@ -30,7 +30,7 @@ public:
   void run_test (Test_Interceptors::Visual_ptr server);
 
 private:
-  const char *input_;
+  const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
index 948f11293bd..a118c3e3c1f 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
@@ -6,7 +6,7 @@
 #include "ace/OS_NS_time.h"
 #include "ace/Manual_Event.h"
 
-Server_Task::Server_Task (const char *output,
+Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
index e048b0f737d..0f0b6b5cbb1 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h
@@ -22,7 +22,7 @@ class Server_Task : public ACE_Task_Base
 {
 public:
   /// Constructor
-  Server_Task (const char *output,
+  Server_Task (const ACE_TCHAR *output,
                CORBA::ORB_ptr sorb,
                ACE_Manual_Event &me,
                ACE_Thread_Manager *thr_mgr);
@@ -32,7 +32,7 @@ public:
 
 private:
   /// Output file for IOR
-  const char *output_;
+  const ACE_TCHAR *output_;
 
   /// Manual event to wake up the main thread to create a client
   /// thread.
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
index b0a73533925..4a95a72c07e 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
@@ -20,7 +20,7 @@ class Client_Task : public ACE_Task_Base
 public:
 
   /// Constructor
-  Client_Task (const char *input,
+  Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
@@ -33,7 +33,7 @@ public:
   int status (void) const;
 
 private:
-  const char *input_;
+  const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;
 
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
index 1d1ef6bcbc8..3a33e14abb0 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(Collocated_Test,
           "$Id$")
 
 
-Server_Task::Server_Task (const char *output,
+Server_Task::Server_Task (const ACE_TCHAR *output,
                           CORBA::ORB_ptr sorb,
                           ACE_Manual_Event &me,
                           ACE_Thread_Manager *thr_mgr)
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
index 2f63a0724de..cbc56e7ae60 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
@@ -24,7 +24,7 @@ class Server_Task : public ACE_Task_Base
 {
 public:
   /// Constructor
-  Server_Task (const char *output,
+  Server_Task (const ACE_TCHAR *output,
                CORBA::ORB_ptr sorb,
                ACE_Manual_Event &me,
                ACE_Thread_Manager *thr_mgr);
@@ -37,7 +37,7 @@ public:
 
 private:
   /// Output file for IOR
-  const char *output_;
+  const ACE_TCHAR *output_;
 
   /// Manual event to wake up the main thread to create a client
   /// thread.
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
index 3ea2451e0bc..4ed6e54b12a 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
@@ -20,7 +20,7 @@ class Client_Task : public ACE_Task_Base
 public:
 
   /// Constructor
-  Client_Task (const char *input,
+  Client_Task (const ACE_TCHAR *input,
                CORBA::ORB_ptr corb,
                ACE_Thread_Manager *thr_mgr);
 
@@ -33,7 +33,7 @@ public:
   int status (void) const;
 
 private:
-  const char *input_;
+  const ACE_TCHAR *input_;
 
   CORBA::ORB_var corb_;