ChangeLogTag: Thu Jun 19 13:47:00 UTC 2008 Simon Massey <sma at prismtech dot com>

15 files changed, 108 insertions, 110 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index be1c28f736f..1105cbe673a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Thu Jun 19 13:47:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
+
+        * tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp:
+        * tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp:
+        * tests/RTCORBA/Linear_Priority/client.cpp:
+        * tests/RTCORBA/Linear_Priority/server.cpp:
+        * tests/RTCORBA/Persistent_IOR/client.cpp:
+        * tests/RTCORBA/Persistent_IOR/server.cpp:
+        * tests/RTCORBA/Policies/Policies.cpp:
+        * tests/RTCORBA/Policies_Combinations/client.cpp:
+        * tests/RTCORBA/Policies_Combinations/server.cpp:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp:
+        * tests/Server_Connection_Purging/client2.cpp:
+        * tests/Single_Read/client.cpp:
+        * tests/Timed_Buffered_Oneways/client.cpp:
+
+          Correct Fuzz errors concerning Wide character build compatabily
+          with ORB_init().
+
 Thu Jun 19 13:07:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
 
         * performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp:
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
index 7d20dc97510..3a23d0d6b9e 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
@@ -50,8 +50,9 @@ Client_Request_Interceptor::send_request (
       if (CORBA::is_nil (this->orb_.in ()))
         {
           int argc = 0;
+          ACE_TCHAR **argv = 0;
           this->orb_ = CORBA::ORB_init (argc,
-                                        0,
+                                        argv,
                                         this->orb_id_.in ());
         }
 
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
index 1f18a6c90ac..f088670f29b 100644
--- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp
@@ -55,8 +55,9 @@ Client_Request_Interceptor::receive_exception (
   if (CORBA::is_nil (this->orb_.in ()))
   {
     int argc = 0;
+    ACE_TCHAR **argv = 0;
     this->orb_ = CORBA::ORB_init (argc,
-                                  0,
+                                  argv,
                                   this->orb_id_.in ());
   }
 
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
index e0beaa7d860..d567d1a1791 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
@@ -13,13 +13,13 @@ static int iterations = 5;
 static int shutdown_server = 0;
 static int debug = 1;
 
-static const char *ior = "file://ior";
+static const ACE_TCHAR *ior = ACE_TEXT ("file://ior");
 
-static const char *invocation_priorities_file = "invocation_priorities";
-static const char *bands_file = "empty_file";
+static const ACE_TCHAR *invocation_priorities_file = ACE_TEXT ("invocation_priorities");
+static const ACE_TCHAR *bands_file = ACE_TEXT ("empty_file");
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "b:d:p:k:i:x");
   int c;
@@ -199,7 +199,7 @@ Task::svc (void)
         CORBA::PolicyManager::_narrow (object.in ());
 
       object =
-        this->orb_->string_to_object (ior);
+        this->orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
 
       test_var test =
         test::_narrow (object.in ());
@@ -207,7 +207,7 @@ Task::svc (void)
       ULong_Array priorities;
       int result =
         get_values ("client",
-                    invocation_priorities_file,
+                    ACE_TEXT_ALWAYS_CHAR (invocation_priorities_file),
                     "invocation priorities",
                     priorities,
                     debug);
@@ -218,7 +218,7 @@ Task::svc (void)
 
       result =
         get_priority_bands ("client",
-                            bands_file,
+                            ACE_TEXT_ALWAYS_CHAR (bands_file),
                             rt_orb.in (),
                             policies,
                             debug);
@@ -287,14 +287,12 @@ Task::svc (void)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       int result =
         parse_args (argc, argv);
@@ -330,7 +328,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                                  "Cannot create thread with scheduling policy %s\n"
                                  "because the user does not have the appropriate privileges, terminating program....\n"
                                  "Check svc.conf options and/or run as root\n",
-                                 sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())),
+                                 ACE_TEXT_CHAR_TO_TCHAR (sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ()))),
                                 2);
             }
           else
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index 0af6656e8f0..0806ac91887 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -69,11 +69,11 @@ static CORBA::Boolean allow_borrowing = 0;
 static const char *ior = "ior";
 static int debug = 1;
 
-static const char *bands_file = "bands";
-static const char *lanes_file = "lanes";
+static const ACE_TCHAR *bands_file = ACE_TEXT ("bands");
+static const ACE_TCHAR *lanes_file = ACE_TEXT ("lanes");
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "b:d:l:");
   int c;
@@ -176,7 +176,7 @@ Task::svc (void)
 
       int result =
         get_priority_bands ("server",
-                            bands_file,
+                            ACE_TEXT_ALWAYS_CHAR (bands_file),
                             rt_orb.in (),
                             policies,
                             debug);
@@ -185,7 +185,7 @@ Task::svc (void)
 
       result =
         get_priority_lanes ("server",
-                            lanes_file,
+                            ACE_TEXT_ALWAYS_CHAR (lanes_file),
                             rt_orb.in (),
                             stacksize,
                             static_threads,
@@ -256,14 +256,12 @@ Task::svc (void)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       int result =
         parse_args (argc, argv);
@@ -299,7 +297,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                                  "Cannot create thread with scheduling policy %s\n"
                                  "because the user does not have the appropriate privileges, terminating program....\n"
                                  "Check svc.conf options and/or run as root\n",
-                                 sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())),
+                                 ACE_TEXT_CHAR_TO_TCHAR (sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ()))),
                                 2);
             }
           else
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
index 9df67ea9933..e1d313cb086 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
@@ -6,10 +6,10 @@
 static int iterations = 5;
 static int shutdown_server = 0;
 
-static const char *ior = 0;
+static const ACE_TCHAR *ior = 0;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "k:i:x");
   int c;
@@ -50,14 +50,12 @@ parse_args (int argc, char **argv)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       int result =
         parse_args (argc, argv);
@@ -65,7 +63,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         return result;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior);
+        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
 
       test_var test =
         test::_narrow (object.in ());
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index 5730f6d5dd7..c293ae45cee 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -56,9 +56,9 @@ test_i::_default_POA (void)
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
-static const char *persistent_ior = "persistent_ior";
-static const char *transient_ior = "transient_ior";
-static const char *tp_persistent_ior = "tp_persistent_ior";
+static const ACE_TCHAR *persistent_ior = ACE_TEXT ("persistent_ior");
+static const ACE_TCHAR *transient_ior = ACE_TEXT ("transient_ior");
+static const ACE_TCHAR *tp_persistent_ior = ACE_TEXT ("tp_persistent_ior");
 static int debug = 0;
 
 static CORBA::ULong stacksize = 0;
@@ -70,7 +70,7 @@ static CORBA::ULong max_buffered_requests = 0;
 static CORBA::ULong max_request_buffer_size = 0;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "a:p:t:d:");
   int c;
@@ -126,8 +126,8 @@ write_iors_to_file (CORBA::Object_ptr object,
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
                 "%s: %s\n",
-                filename,
-                ior.in ()));
+                ACE_TEXT_CHAR_TO_TCHAR (filename),
+                ACE_TEXT_CHAR_TO_TCHAR (ior.in ())));
 
   u_int result = 0;
   result =
@@ -180,7 +180,7 @@ create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb,
 
   write_iors_to_file (test.in (),
                       orb,
-                      persistent_ior);
+                      ACE_TEXT_ALWAYS_CHAR (persistent_ior));
 }
 
 void
@@ -232,7 +232,7 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
 
   write_iors_to_file (test.in (),
                       orb,
-                      transient_ior);
+                      ACE_TEXT_ALWAYS_CHAR (transient_ior));
 }
 
 void
@@ -291,18 +291,16 @@ create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb,
 
   write_iors_to_file (test.in (),
                       orb,
-                      tp_persistent_ior);
+                      ACE_TEXT_ALWAYS_CHAR (tp_persistent_ior));
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       int result =
         parse_args (argc, argv);
diff --git a/TAO/tests/RTCORBA/Policies/Policies.cpp b/TAO/tests/RTCORBA/Policies/Policies.cpp
index 94987dfcd8c..cd8aebbdca2 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.cpp
+++ b/TAO/tests/RTCORBA/Policies/Policies.cpp
@@ -25,16 +25,14 @@
 #include "ace/Log_Msg.h"
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var object =
         orb->resolve_initial_references ("RTORB");
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
index 8ce4baa9218..6b46d1cd763 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -7,13 +7,13 @@
 #include "tao/RTCORBA/RTCORBA.h"
 #include "../check_supported_priorities.cpp"
 
-static const char *ior = 0;
+static const ACE_TCHAR *ior = 0;
 static int iterations = 5;
 static int shutdown_server = 0;
 static RTCORBA::Priority default_thread_priority;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "k:i:x");
   int c;
@@ -88,7 +88,7 @@ Task::svc (void)
         current->the_priority ();
 
       object =
-        this->orb_->string_to_object (ior);
+        this->orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
 
       test_var test =
         test::_narrow (object.in ());
@@ -123,14 +123,12 @@ Task::svc (void)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       int result =
         parse_args (argc, argv);
@@ -175,7 +173,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                                  "Cannot create thread with scheduling policy %s\n"
                                  "because the user does not have the appropriate privileges, terminating program....\n"
                                  "Check svc.conf options and/or run as root\n",
-                                 sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())),
+                                 ACE_TEXT_CHAR_TO_TCHAR (sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ()))),
                                 2);
             }
           else
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
index 4e31c300dac..15116dddb30 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
@@ -102,7 +102,7 @@ static CORBA::ULong max_request_buffer_size = 0;
 static CORBA::Boolean allow_borrowing = 0;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "s:c:");
   int c;
@@ -148,7 +148,7 @@ write_iors_to_file (CORBA::Object_ptr object,
   result =
     ACE_OS::fprintf (file,
                      "%s",
-                     ior.in ());
+                     ACE_TEXT_CHAR_TO_TCHAR (ior.in ()));
 
   ACE_ASSERT (result == ACE_OS::strlen (ior.in ()));
   ACE_UNUSED_ARG (result);
@@ -769,14 +769,12 @@ Task::svc (void)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       int result =
         parse_args (argc, argv);
@@ -812,7 +810,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                                  "Cannot create thread with scheduling policy %s\n"
                                  "because the user does not have the appropriate privileges, terminating program....\n"
                                  "Check svc.conf options and/or run as root\n",
-                                 sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())),
+                                 ACE_TEXT_CHAR_TO_TCHAR (sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ()))),
                                 2);
             }
           else
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
index e909d1f1d11..c71c5ba13a0 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
@@ -29,13 +29,13 @@ ACE_RCSID(Profile_And_Endpoint_Selection, client, "$Id$")
 static int iterations = 1;
 static int debug = 1;
 static int shutdown_server = 0;
-static const char *ior = "file://ior";
-static const char *invocation_priorities_file = "empty_file";
-static const char *protocols_file = "empty_file";
-static const char *bands_file = "empty_file";
+static const ACE_TCHAR *ior = ACE_TEXT ("file://ior");
+static const ACE_TCHAR *invocation_priorities_file = ACE_TEXT ("empty_file");
+static const ACE_TCHAR *protocols_file = ACE_TEXT ("empty_file");
+static const ACE_TCHAR *bands_file = ACE_TEXT ("empty_file");
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "b:d:i:k:p:t:x");
   int c;
@@ -242,7 +242,7 @@ Client::priority_invocations (int debug)
   ULong_Array priorities;
   int result =
     get_values ("client",
-                invocation_priorities_file,
+                ACE_TEXT_ALWAYS_CHAR (invocation_priorities_file),
                 "invocation priorities",
                 priorities,
                 debug);
@@ -309,7 +309,7 @@ Client::set_client_protocols_policies (int debug)
 
   int result =
     get_protocols ("client",
-                   protocols_file,
+                   ACE_TEXT_ALWAYS_CHAR (protocols_file),
                    this->rt_orb_.in (),
                    policies,
                    debug);
@@ -332,7 +332,7 @@ Client::set_priority_bands (int debug)
 
   int result =
     get_priority_bands ("client",
-                        bands_file,
+                        ACE_TEXT_ALWAYS_CHAR (bands_file),
                         this->rt_orb_.in (),
                         policies,
                         debug);
@@ -416,7 +416,7 @@ Task::svc (void)
       current->the_priority (0);
 
       object =
-        this->orb_->string_to_object (ior);
+        this->orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
 
       test_var test =
         test::_narrow (object.in ());
@@ -482,15 +482,13 @@ Task::svc (void)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       int parse_args_result =
         parse_args (argc, argv);
@@ -526,7 +524,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                                  "Cannot create thread with scheduling policy %s\n"
                                  "because the user does not have the appropriate privileges, terminating program....\n"
                                  "Check svc.conf options and/or run as root\n",
-                                 sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())),
+                                 ACE_TEXT_CHAR_TO_TCHAR (sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ()))),
                                 2);
             }
           else
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
index 4d1da5311d6..24440b9b20a 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
@@ -19,9 +19,9 @@ static CORBA::Boolean allow_borrowing = 0;
 
 static int debug = 1;
 static int ior_file_count = 1;
-static const char *ior_file_base = "ior";
-static const char *bands_file = "empty_file";
-static const char *lanes_file = "empty_file";
+static const ACE_TCHAR *ior_file_base = ACE_TEXT ("ior");
+static const ACE_TCHAR *bands_file = ACE_TEXT ("empty_file");
+static const ACE_TCHAR *lanes_file = ACE_TEXT ("empty_file");
 
 class test_i :
   public POA_test
@@ -92,7 +92,7 @@ test_i::_default_POA (void)
 }
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "b:d:l:o:");
   int c;
@@ -141,7 +141,7 @@ write_iors_to_file (CORBA::Object_ptr object,
   char filename[BUFSIZ];
   ACE_OS::sprintf (filename,
                    "%s_%d",
-                   ior_file_base,
+                   ACE_TEXT_ALWAYS_CHAR (ior_file_base),
                    ior_file_count);
   ior_file_count++;
 
@@ -213,7 +213,7 @@ rt_poa (CORBA::ORB_ptr orb,
 
   int result =
     get_priority_bands ("server",
-                        bands_file,
+                        ACE_TEXT_ALWAYS_CHAR (bands_file),
                         rt_orb,
                         policies,
                         debug);
@@ -227,7 +227,7 @@ rt_poa (CORBA::ORB_ptr orb,
 
   result =
     get_priority_lanes ("server",
-                        lanes_file,
+                        ACE_TEXT_ALWAYS_CHAR (lanes_file),
                         rt_orb,
                         stacksize,
                         static_threads,
@@ -352,14 +352,12 @@ Task::svc (void)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       int result =
         parse_args (argc, argv);
@@ -395,7 +393,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                                  "Cannot create thread with scheduling policy %s\n"
                                  "because the user does not have the appropriate privileges, terminating program....\n"
                                  "Check svc.conf options and/or run as root\n",
-                                 sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())),
+                                 ACE_TEXT_CHAR_TO_TCHAR (sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ()))),
                                 2);
             }
           else
diff --git a/TAO/tests/Server_Connection_Purging/client2.cpp b/TAO/tests/Server_Connection_Purging/client2.cpp
index a6db16230b9..e1bbf554b60 100644
--- a/TAO/tests/Server_Connection_Purging/client2.cpp
+++ b/TAO/tests/Server_Connection_Purging/client2.cpp
@@ -5,10 +5,10 @@
 #include "TestC.h"
 
 // Name of file contains ior.
-static const char *IOR = "file://ior";
+static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "k:i:d:x");
   int c;
@@ -39,16 +39,14 @@ parse_args (int argc, char **argv)
 
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
@@ -57,7 +55,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (IOR);
+        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (IOR));
 
       // Try to narrow the object reference to a <test> reference.
       test_var test_object = test::_narrow (object.in ());
diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp
index 7b19752c169..059e773e43d 100644
--- a/TAO/tests/Single_Read/client.cpp
+++ b/TAO/tests/Single_Read/client.cpp
@@ -8,7 +8,7 @@
 ACE_RCSID(Timed_Buffered_Oneways, client, "$Id$")
 
 // Name of file contains ior.
-static const char *IOR = "file://ior";
+static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 
 // Default iterations.
 static u_long iterations = 20;
@@ -21,7 +21,7 @@ static CORBA::ULong data_bytes = 1000;
 static int shutdown_server = 0;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "k:i:d:x");
   int c;
@@ -69,16 +69,14 @@ parse_args (int argc, char **argv)
 
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
@@ -87,7 +85,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (IOR);
+        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (IOR));
 
       // Try to narrow the object reference to a <test> reference.
       test_var test_object = test::_narrow (object.in ());
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index d4692ad38e1..55bd74f855b 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -31,7 +31,7 @@ ACE_RCSID(Timed_Buffered_Oneways, client, "$Id$")
 static int eager_buffering = 0;
 
 // Name of file contains ior.
-static const char *IOR = "file://ior";
+static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
 
 // Default iterations.
 static u_long iterations = 20;
@@ -53,7 +53,7 @@ static u_long interval = 500;
 static int shutdown_server = 0;
 
 static int
-parse_args (int argc, char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "ek:i:d:t:w:z:x");
   int c;
@@ -171,16 +171,14 @@ setup_policies (CORBA::ORB_ptr orb, test_ptr object)
 }
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   try
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         0);
+        CORBA::ORB_init (argc, argv);
 
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
@@ -189,7 +187,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (IOR);
+        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (IOR));
 
       // Try to narrow the object reference to a <test> reference.
       test_var test_object_no_policy = test::_narrow (object.in ());