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

15 files changed, 92 insertions, 100 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 740ce8f4905..be1c28f736f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Thu Jun 19 13:07:00 UTC 2008  Simon Massey  <sma at prismtech dot com>
+
+        * performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp:
+        * tests/Bug_2234_Regression/client.cpp:
+        * tests/Bug_2234_Regression/server.cpp:
+        * tests/Bug_2935_Regression/source.cpp:
+        * tests/Bug_3276_Regression/Manager.cpp:
+        * tests/Bug_3276_Regression/Manager.h:
+        * tests/CDR/basic_types.cpp:
+        * tests/CDR/tc.cpp:
+        * tests/MProfile_Forward/Manager.cpp:
+        * tests/NestedUpcall/Simple/client.cpp:
+        * tests/NestedUpcall/Simple/server.cpp:
+        * tests/NestedUpcall/Simple/simple-client.cpp:
+        * tests/POA/Loader/Server_Manager.cpp:
+        * tests/POA/On_Demand_Loading/Server_Manager.cpp:
+
+          Correct Fuzz errors concerning Wide character build compatabily
+          with ORB_init().
+
 Thu Jun 19 12:25:02 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
 
         * orbsvcs/orbsvcs/AV/media_timer.cpp:
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
index 1ef9bd731eb..d268634d3d4 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
@@ -23,8 +23,9 @@ void
 Test_i::shutdown (const char *orb_id)
 {
   int argc = 0;
+  ACE_TCHAR **argv = 0;
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                        0,
+                                        argv,
                                         orb_id);
 
   orb->shutdown (0);
diff --git a/TAO/tests/Bug_2234_Regression/client.cpp b/TAO/tests/Bug_2234_Regression/client.cpp
index 4ac4885d0b7..8815a43ae60 100644
--- a/TAO/tests/Bug_2234_Regression/client.cpp
+++ b/TAO/tests/Bug_2234_Regression/client.cpp
@@ -18,7 +18,7 @@ main(
   try
   {
     CORBA::ORB_var
-       orb= CORBA::ORB_init( argc, argv, 0 );
+       orb= CORBA::ORB_init (argc, argv);
     CORBA::Object_var
        object= orb->string_to_object( "file://server.ior" );
     Test::Foo_var
@@ -52,7 +52,7 @@ main(
        rS;
     ACE_DEBUG( (LM_INFO, ". String()          ") );
     rS= foo->TestString( aS.in(), bS.out(), cS.inout());
-    ACE_DEBUG( (LM_INFO, "a is %s, b is %s, c is %s, r is %s:  ", aS.in(), bS.in(), cS.in(), rS.in()) );
+    ACE_DEBUG( (LM_INFO, "a is %s, b is %s, c is %s, r is %s:  ", ACE_TEXT_CHAR_TO_TCHAR (aS.in ()), ACE_TEXT_CHAR_TO_TCHAR (bS.in ()), ACE_TEXT_CHAR_TO_TCHAR (cS.in ()), ACE_TEXT_CHAR_TO_TCHAR (rS.in ())) );
     if ((0 != *aS.in()) && (0 != ACE_OS::strcmp(aS.in(), "1"))) {
        ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
     else if ((0 != *aS.in()) && (0 != ACE_OS::strcmp(bS.in(), "2"))) {
@@ -96,7 +96,7 @@ main(
     cVS->val= CORBA::string_dup("3");
     ACE_DEBUG( (LM_INFO, ". MyVarStruct()     ") );
     rVS= foo->TestVarStruct( aVS.in(), bVS.out(), cVS.inout());
-    ACE_DEBUG( (LM_INFO, "a is %s, b is %s, c is %s, r is %s:  ", aVS->val.in(), bVS->val.in(), cVS->val.in(), rVS->val.in()) );
+    ACE_DEBUG( (LM_INFO, "a is %s, b is %s, c is %s, r is %s:  ", ACE_TEXT_CHAR_TO_TCHAR (aVS->val.in()), ACE_TEXT_CHAR_TO_TCHAR (bVS->val.in ()), ACE_TEXT_CHAR_TO_TCHAR (cVS->val.in ()), ACE_TEXT_CHAR_TO_TCHAR (rVS->val.in ())) );
     if ((0 != *aVS->val) && (0 != ACE_OS::strcmp(aVS->val, "1"))) {
        ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
     else if ((0 != *bVS->val) && (0 != ACE_OS::strcmp(bVS->val, "2"))) {
diff --git a/TAO/tests/Bug_2234_Regression/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp
index ac0e36fd044..0c01e115e3c 100644
--- a/TAO/tests/Bug_2234_Regression/server.cpp
+++ b/TAO/tests/Bug_2234_Regression/server.cpp
@@ -597,7 +597,7 @@ public:
         break;
 
       case 2:
-        ACE_DEBUG( (LM_INFO, "String %s", vU->valString()) );
+        ACE_DEBUG( (LM_INFO, "String %s", ACE_TEXT_CHAR_TO_TCHAR (vU->valString())) );
         break;
 
       default:
@@ -765,7 +765,7 @@ int main( int argc, char *argv[] )
       initialiser= initialiser_p;
     PortableInterceptor::register_orb_initializer( initialiser.in() );
 
-    orb= CORBA::ORB_init( argc, argv, 0 );
+    orb= CORBA::ORB_init (argc, argv);
     CORBA::Object_var
       Object = orb->resolve_initial_references( "RootPOA" );
     PortableServer::POA_var rootPOA=
diff --git a/TAO/tests/Bug_2935_Regression/source.cpp b/TAO/tests/Bug_2935_Regression/source.cpp
index 7f10087ec61..ece38c148de 100644
--- a/TAO/tests/Bug_2935_Regression/source.cpp
+++ b/TAO/tests/Bug_2935_Regression/source.cpp
@@ -4,11 +4,11 @@
 
 // A ThreeTier client that calls tick and/or tock
 
-const char * ior_input_file = 0;
+const ACE_TCHAR * ior_input_file = 0;
 
 char input_ior[5000];
 
-void eat_args (int & argc, char *argv[], int argp, int how_many)
+void eat_args (int & argc, ACE_TCHAR *argv[], int argp, int how_many)
 {
   for (int marg = argp; marg + how_many < argc; ++marg)
     {
@@ -17,7 +17,7 @@ void eat_args (int & argc, char *argv[], int argp, int how_many)
   argc -= how_many;
 }
 
-bool parse_args (int & argc, char *argv[])
+bool parse_args (int & argc, ACE_TCHAR *argv[])
 {
   int argp = 1;
   while (argp < argc)
@@ -34,7 +34,7 @@ bool parse_args (int & argc, char *argv[])
           // capture input file name
           // then remove it from arguemnt list
           ior_input_file = argv[argp + 1];
-          eat_args(argc, argv, argp, 2);
+          eat_args (argc, argv, argp, 2);
         }
       else
         {
@@ -54,7 +54,7 @@ bool parse_args (int & argc, char *argv[])
 
 
 int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int result = 0;
   ACE_DEBUG ((LM_DEBUG,
@@ -63,9 +63,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       // 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.
       if (!parse_args (argc, argv))
@@ -111,5 +109,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
               "Source (%P|%t) exits\n"));
   return result;
 }
-
-
diff --git a/TAO/tests/Bug_3276_Regression/Manager.cpp b/TAO/tests/Bug_3276_Regression/Manager.cpp
index 78b73ffa0d5..dae57f14927 100644
--- a/TAO/tests/Bug_3276_Regression/Manager.cpp
+++ b/TAO/tests/Bug_3276_Regression/Manager.cpp
@@ -1,17 +1,17 @@
 //$Id$
 
+#include "ace/SString.h"
 #include "Manager.h"
 #include "test_i.h"
 
-#include "ace/SString.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-const char *control_ior = 0;
-const char *proxy_ior = 0;
+const ACE_TCHAR *control_ior = 0;
+const ACE_TCHAR *proxy_ior = 0;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "c:p:");
   int c;
@@ -64,7 +64,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                "Cannot open output file for writing IOR: %s",
                                proxy_ior),
                                1);
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fprintf (output_file, "%s", ACE_TEXT_CHAR_TO_TCHAR (ior.in ()));
           ACE_OS::fclose (output_file);
         }
 
@@ -76,7 +76,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ior =
         orb->object_to_string (server.in ());
 
-      ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
+      ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ACE_TEXT_CHAR_TO_TCHAR (ior.in ())));
 
       // If the proxy_ior exists, output the ior to it
       if (control_ior != 0)
@@ -90,7 +90,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                                "Cannot open output file for writing IOR: %s",
                                control_ior),
                                1);
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fprintf (output_file, "%s", ACE_TEXT_CHAR_TO_TCHAR (ior.in ()));
           ACE_OS::fclose (output_file);
         }
 
@@ -130,11 +130,9 @@ Manager::server (void)
 }
 
 int
-Manager::init (int argc, char *argv[])
+Manager::init (int argc, ACE_TCHAR *argv[])
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
-                                0);
+  this->orb_ = CORBA::ORB_init (argc, argv);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
diff --git a/TAO/tests/Bug_3276_Regression/Manager.h b/TAO/tests/Bug_3276_Regression/Manager.h
index 1a24ef65849..7531e48955f 100644
--- a/TAO/tests/Bug_3276_Regression/Manager.h
+++ b/TAO/tests/Bug_3276_Regression/Manager.h
@@ -13,7 +13,7 @@ public:
 
   ~Manager (void);
 
-  int init (int argc, char *argv[]);
+  int init (int argc, ACE_TCHAR *argv[]);
   // Initialize the ORB, POA etc.
 
   int activate_servant (void);
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index 2e0949f8620..e1d50af68e9 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -212,13 +212,11 @@ test_get (TAO_InputCDR &cdr, const CDR_Test_Types &test_types)
 }
 
 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_var orb = CORBA::ORB_init (argc, argv);
 
       ACE_Get_Opt get_opt (argc, argv, "dn:l:");
       int opt;
diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp
index 80a4d9e4833..5dd9249d07e 100644
--- a/TAO/tests/CDR/tc.cpp
+++ b/TAO/tests/CDR/tc.cpp
@@ -34,13 +34,11 @@ ACE_RCSID (CDR,
 // verify that CDR offers the services needed for Typecode...
 
 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_var orb = CORBA::ORB_init (argc, argv);
 
       static const CORBA::TypeCode_ptr tcs[]=
       {
@@ -136,8 +134,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                                 " KIND = %d%$"
                                 " LENGTH = %d"
                                 "%}%}\n",
-                                (id?id:"empty ID"),
-                                (name?name:"empty name"),
+                                ACE_TEXT_CHAR_TO_TCHAR ((id?id:"empty ID")),
+                                ACE_TEXT_CHAR_TO_TCHAR ((name?name:"empty name")),
                                 k,
                                 length));
                   }
diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp
index d7b72b9d388..32c5ff97422 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.cpp
+++ b/TAO/tests/MProfile_Forwarding/Manager.cpp
@@ -41,7 +41,7 @@ parse_args (int argc, char *argv[])
                            "-b <iorfile>"
                            "-c <iorfile>"
                            "\n",
-                           argv [0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (argv [0])),
                           -1);
       }
   // Indicates sucessful parsing of the command line
@@ -91,9 +91,7 @@ int
 Manager::init (int argc,
                char *argv[])
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
-                                0);
+  this->orb_ = CORBA::ORB_init (argc, argv);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
@@ -243,7 +241,7 @@ Manager::make_iors_register (void)
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
+                           ACE_TEXT_CHAR_TO_TCHAR (ior_output_file)),
                           1);
       ACE_OS::fprintf (output_file, "%s", iorref1.in ());
       ACE_OS::fclose (output_file);
diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
index 90152bf511b..b80fa3a78b3 100644
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client.cpp
@@ -6,7 +6,7 @@
 
 ACE_RCSID(Simple, client, "$Id$")
 
-static const char *ior = "file://test.ior";
+static const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 // Server IOR.
 
 static int shutdown_server = 0;
@@ -61,7 +61,7 @@ Client_Task::svc (void)
 
 static int
 parse_args (int argc,
-            char **argv)
+            ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "qxn:k:");
   int c;
@@ -109,17 +109,14 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR **argv)
 {
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
-      int result = parse_args (argc,
-                               argv);
+      int result = parse_args (argc, argv);
       if (result != 0)
         return result;
 
@@ -133,7 +130,7 @@ main (int argc,
 
       poa_manager->activate ();
 
-      object = orb->string_to_object (ior);
+      object = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
 
       server_var server = server::_narrow (object.in ());
 
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp
index cecdab57937..3eb3ad1f790 100644
--- a/TAO/tests/NestedUpcall/Simple/server.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server.cpp
@@ -9,7 +9,7 @@ ACE_RCSID(Simple, server, "$Id$")
 static int quiet = 0;
 // The test is quiet...
 
-static const char *ior_file = "test.ior";
+static const ACE_TCHAR *ior_file = ACE_TEXT ("test.ior");
 // File of file to which the ior is written
 
 static int number_of_threads = 1;
@@ -63,7 +63,7 @@ write_ior_to_file (const char *ior)
       static_cast<size_t> (result) != ACE_OS::strlen (ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %s to %s\n",
-                       ior,
+                       ACE_TEXT_CHAR_TO_TCHAR (ior),
                        ior_file),
                       -1);
 
@@ -74,7 +74,7 @@ write_ior_to_file (const char *ior)
 
 static int
 parse_args (int argc,
-            char **argv)
+            ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "q:f:t:");
   int c;
@@ -110,17 +110,13 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
-      int result = parse_args (argc,
-                               argv);
+      int result = parse_args (argc, argv);
       if (result != 0)
         return result;
 
@@ -163,8 +159,7 @@ main (int argc,
       if (result != 0)
         return result;
 
-      root_poa->destroy (1,
-                         1);
+      root_poa->destroy (1, 1);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
index 756ad7811fd..f13600c93a7 100644
--- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
@@ -6,7 +6,7 @@
 
 ACE_RCSID(Simple, client, "$Id$")
 
-static const char *ior = "file://test.ior";
+static const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
 // Server IOR.
 
 static int shutdown_server = 0;
@@ -65,8 +65,7 @@ Client_Task::svc (void)
 }
 
 static int
-parse_args (int argc,
-            char **argv)
+parse_args (int argc, ACE_TCHAR **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "qxn:k:t:");
   int c;
@@ -118,17 +117,13 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACT_TMAIN (int argc, ACE_TCHAR **argv)
 {
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
-      int result = parse_args (argc,
-                               argv);
+      int result = parse_args (argc, argv);
       if (result != 0)
         return result;
 
@@ -142,7 +137,7 @@ main (int argc,
 
       poa_manager->activate ();
 
-      object = orb->string_to_object (ior);
+      object = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
 
       server_var server = server::_narrow (object.in ());
 
diff --git a/TAO/tests/POA/Loader/Server_Manager.cpp b/TAO/tests/POA/Loader/Server_Manager.cpp
index 5a7a5d04c05..6e2767aed5e 100644
--- a/TAO/tests/POA/Loader/Server_Manager.cpp
+++ b/TAO/tests/POA/Loader/Server_Manager.cpp
@@ -41,7 +41,7 @@ Server_i::parse_args (int argc,
                            "usage:  %s "
                            "[-f ior_output_file] "
                            "\n",
-                           argv [0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (argv [0])),
                           -1);
       }
 
@@ -77,8 +77,8 @@ Server_i::write_iors_to_file (const char *first_ior,
       || output_file_2 == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Cannot open output files for writing IORs: %s, %s\n",
-                       ior_output_file_1,
-                       ior_output_file_2),
+                       ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_1),
+                       ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_2)),
                       -1);
 
   int result = ACE_OS::fprintf (output_file_1,
@@ -88,8 +88,8 @@ Server_i::write_iors_to_file (const char *first_ior,
       || static_cast<size_t> (result) != ACE_OS::strlen (first_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %s to %s\n",
-                       first_ior,
-                       ior_output_file_1),
+                       ACE_TEXT_CHAR_TO_TCHAR (first_ior),
+                       ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_1)),
                       -1);
 
   result = ACE_OS::fprintf (output_file_2,
@@ -99,8 +99,8 @@ Server_i::write_iors_to_file (const char *first_ior,
       || static_cast<size_t> (result) != ACE_OS::strlen (second_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %s to %s\n",
-                       second_ior,
-                       ior_output_file_2),
+                       ACE_TEXT_CHAR_TO_TCHAR (second_ior),
+                       ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_2)),
                       -1);
   ACE_OS::fclose (output_file_1);
   ACE_OS::fclose (output_file_2);
@@ -115,9 +115,7 @@ Server_i::init (int argc, char **argv)
   try
     {
       // Initialize the ORB.
-      orb_ = CORBA::ORB_init (argc,
-                              argv,
-                              0);
+      orb_ = CORBA::ORB_init (argc, argv);
 
       int result = parse_args (argc, argv);
       if (result != 0)
@@ -333,8 +331,8 @@ Server_i::run (void)
       // Print the ior's of first_test and second_test.
 
       ACE_DEBUG ((LM_DEBUG,"%s\n%s\n",
-                  first_test_ior.in (),
-                  second_test_ior.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (first_test_ior.in ()),
+                  ACE_TEXT_CHAR_TO_TCHAR (second_test_ior.in ())));
 
       int write_result =
         this->write_iors_to_file (first_test_ior.in (),
diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
index 5e7b040d916..c2f4cf4b6c6 100644
--- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
@@ -42,7 +42,7 @@ Server_i::parse_args (int argc,
                            "usage:  %s "
                            "[-f ior_output_file] "
                            "\n",
-                           argv [0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (argv [0])),
                           -1);
       }
 
@@ -78,8 +78,8 @@ Server_i::write_iors_to_file (const char *first_ior,
       || output_file_2 == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Cannot open output files for writing IORs: %s, %s\n",
-                       ior_output_file_1,
-                       ior_output_file_2),
+                       ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_1),
+                       ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_2)),
                       -1);
 
   int result = ACE_OS::fprintf (output_file_1,
@@ -89,8 +89,8 @@ Server_i::write_iors_to_file (const char *first_ior,
       || static_cast<size_t> (result) != ACE_OS::strlen (first_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %s to %s\n",
-                       first_ior,
-                       ior_output_file_1),
+                       ACE_TEXT_CHAR_TO_TCHAR (first_ior),
+                       ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_1)),
                       -1);
 
   result = ACE_OS::fprintf (output_file_2,
@@ -100,8 +100,8 @@ Server_i::write_iors_to_file (const char *first_ior,
       || static_cast<size_t> (result) != ACE_OS::strlen (second_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %s to %s\n",
-                       second_ior,
-                       ior_output_file_2),
+                       ACE_TEXT_CHAR_TO_TCHAR (second_ior),
+                       ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_2)),
                       -1);
   ACE_OS::fclose (output_file_1);
   ACE_OS::fclose (output_file_2);
@@ -117,9 +117,7 @@ Server_i::init (int argc, char **argv)
   try
     {
       // Initialize the ORB.
-      orb_ = CORBA::ORB_init (argc,
-                              argv,
-                              0);
+      orb_ = CORBA::ORB_init (argc, argv);
 
       int result = parse_args (argc, argv);
       if (result != 0)
@@ -324,8 +322,8 @@ Server_i::run (void)
       // Print the ior's of first_test and second_test.
 
       ACE_DEBUG ((LM_DEBUG,"%s\n%s\n",
-                  first_test_ior.in (),
-                  second_test_ior.in ()));
+                  ACE_TEXT_CHAR_TO_TCHAR (first_test_ior.in ()),
+                  ACE_TEXT_CHAR_TO_TCHAR (second_test_ior.in ())));
 
       int write_result =
         this->write_iors_to_file (first_test_ior.in (),