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

3 files changed, 12 insertions, 22 deletions

diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index a61311735b4..c57819d94cf 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -31,12 +31,9 @@ Latency_Query_Client::init (int argc,
 {
   try
     {
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    0);
+      this->orb_ = CORBA::ORB_init (argc, argv);
 
-      int retval = this->parse_args (argc,
-                                     argv);
+      int retval = this->parse_args (argc, argv);
 
       if (retval != 0)
         {
@@ -183,7 +180,7 @@ Latency_Query_Client::parse_args (int argc,
                             " [-d]"
                             " [-i iterations]"
                             "\n",
-                            argv [0]),
+                            ACE_TEXT_CHAR_TO_TCHAR (argv [0])),
                             -1);
         }
     }
@@ -232,4 +229,3 @@ Latency_Query_Client::populate_ifr (void)
 
   return 0;
 }
-
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index 0461fce43bb..090278b9681 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -23,12 +23,9 @@ Ptest::init (int argc,
 {
   try
     {
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    0);
+      this->orb_ = CORBA::ORB_init (argc, argv);
 
-      int retval = this->parse_args (argc,
-                                     argv);
+      int retval = this->parse_args (argc, argv);
 
       if (retval != 0)
         return retval;
@@ -111,7 +108,7 @@ Ptest::parse_args (int argc,
                            " [-d]"
                            " [-q]"
                            "\n",
-                           argv [0]),
+                           ACE_TEXT_CHAR_TO_TCHAR (argv [0])),
                           -1);
       }
 
@@ -219,7 +216,7 @@ Ptest::query (void)
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("StructDef::members[%d]::name: %s\n"),
                       i,
-                      out_members[i].name.in ()));
+                      ACE_TEXT_CHAR_TO_TCHAR (out_members[i].name.in ())));
         }
 
       if (i == length - 1)
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index da3b881bd0f..a5b33e6dbab 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -204,7 +204,7 @@ Client_i::read_ior (char *filename)
   if (f_handle == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "[CLIENT] Process/Thread Id : (%P/%t) Unable to open %s for writing: %p\n",
-                       filename),
+                       ACE_TEXT_CHAR_TO_TCHAR (filename)),
                       -1);
 
   ACE_Read_Buffer ior_buffer (f_handle);
@@ -267,7 +267,7 @@ Client_i::parse_args (void)
                            " [-k ior]"
                             " [-x]"
                            "\n",
-                            this->argv_ [0]),
+                            ACE_TEXT_CHAR_TO_TCHAR (this->argv_ [0])),
                            -1);
        }
 
@@ -335,7 +335,7 @@ Client_i::obtain_initial_references (void)
 
       ACE_DEBUG ((LM_DEBUG,
                   "%s|\n",
-                  name));
+                  ACE_TEXT_CHAR_TO_TCHAR (name)));
 
       CORBA::Object_var temp_object =
         my_name_client_->resolve (clerk_name);
@@ -367,13 +367,10 @@ Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-
   try
     {
       // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    0);
+      this->orb_ = CORBA::ORB_init (this->argc_, this->argv_);
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -390,7 +387,7 @@ Client_i::init (int argc, char **argv)
           if (CORBA::is_nil (server_object.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
                                "invalid ior <%s>\n",
-                               this->ior_),
+                               ACE_TEXT_CHAR_TO_TCHAR (this->ior_)),
                               -1);
           this->clerk_ =
             CosTime::TimeService::_narrow (server_object.in ());