Thu Apr 23 07:18:37 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * tests/FL_Cube/client.cpp
        * tests/HandleExhaustion/client.cpp
        * tests/Abstract_Interface/client.cpp
        * tests/Big_Reply/client.cpp
        * tests/Bug_1254_Regression/client.cpp
        * tests/Bug_2174_Regression/client.cpp
        * tests/Bug_2734_Regression/client.cpp
        * tests/Bug_2768_Regression/client.cpp
        * tests/Bug_3198_Regression/bug_3198_regression.cpp
        * tests/Bug_3598a_Regression/client.cpp
        * tests/Client_Leaks/client.cpp
        * tests/Leader_Followers/client.cpp
        * tests/MProfile_Forwarding/Manager.cpp
        * tests/Multiple/client.cpp
        * tests/Nested_Event_Loop/client.cpp
        * tests/NestedUpcall/Simple/client.cpp
        * tests/NestedUpcall/Simple/simple-client.cpp
        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
        * tests/POA/EndpointPolicy/client.cpp
        * tests/POA/Generic_Servant/client.cpp
        * tests/POA/Persistent_ID/client.cpp
        * tests/Portable_Interceptors/AdvSlot/client.cpp
        * tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp
        * tests/Portable_Interceptors/AdvSlotExt/client.cpp
        * tests/Portable_Interceptors/AMI/client.cpp
        * tests/Portable_Interceptors/Bug_2133/client.cpp
        * tests/RTCORBA/Linear_Priority/client.cpp
        * tests/RTCORBA/Persistent_IOR/client.cpp
        * tests/RTCORBA/Policy_Combinations/client.cpp
        * tests/Server_Connection_Purging/client2.cpp
        * tests/Single_Read/client.cpp
        * tests/Smart_Proxies/dtor/client.cpp
        * tests/Timed_Buffered_Oneways/client.cpp
        * tests/Timeout/client.cpp
          Removed not needed unicode to ascii conversion

        * tests/Hello/client.cpp:
          Fixed typo in comment

36 files changed, 83 insertions, 42 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4c0cf023069..eb8fd4e4bb0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,44 @@
+Thu Apr 23 07:18:37 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/FL_Cube/client.cpp
+        * tests/HandleExhaustion/client.cpp
+        * tests/Abstract_Interface/client.cpp
+        * tests/Big_Reply/client.cpp
+        * tests/Bug_1254_Regression/client.cpp
+        * tests/Bug_2174_Regression/client.cpp
+        * tests/Bug_2734_Regression/client.cpp
+        * tests/Bug_2768_Regression/client.cpp
+        * tests/Bug_3198_Regression/bug_3198_regression.cpp
+        * tests/Bug_3598a_Regression/client.cpp
+        * tests/Client_Leaks/client.cpp
+        * tests/Leader_Followers/client.cpp
+        * tests/MProfile_Forwarding/Manager.cpp
+        * tests/Multiple/client.cpp
+        * tests/Nested_Event_Loop/client.cpp
+        * tests/NestedUpcall/Simple/client.cpp
+        * tests/NestedUpcall/Simple/simple-client.cpp
+        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
+        * tests/POA/EndpointPolicy/client.cpp
+        * tests/POA/Generic_Servant/client.cpp
+        * tests/POA/Persistent_ID/client.cpp
+        * tests/Portable_Interceptors/AdvSlot/client.cpp
+        * tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp
+        * tests/Portable_Interceptors/AdvSlotExt/client.cpp
+        * tests/Portable_Interceptors/AMI/client.cpp
+        * tests/Portable_Interceptors/Bug_2133/client.cpp
+        * tests/RTCORBA/Linear_Priority/client.cpp
+        * tests/RTCORBA/Persistent_IOR/client.cpp
+        * tests/RTCORBA/Policy_Combinations/client.cpp
+        * tests/Server_Connection_Purging/client2.cpp
+        * tests/Single_Read/client.cpp
+        * tests/Smart_Proxies/dtor/client.cpp
+        * tests/Timed_Buffered_Oneways/client.cpp
+        * tests/Timeout/client.cpp
+          Removed not needed unicode to ascii conversion
+
+        * tests/Hello/client.cpp:
+          Fixed typo in comment
+
 Thu Apr 23 08:13:37 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * tests/RTCORBA/Bug_3643_Regression/client.cpp:
@@ -10,24 +51,24 @@ Wed Apr 22 17:59:18 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
         * TAO_IDL/ast/ast_sequence.cpp:
         * TAO_IDL/fe/y.tab.cpp:
         * TAO_IDL/fe/idl.yy:
-        
+
           Added check to catch illegal use of incomplete sequence
           type (sequence of undefined struct or union) as an
           operation return type or parameter. Thanks to
           Ron van Hoof <rvhoof27@gmail.com> for reporting the bug
           and for sending in the example IDL. This fix closes
           [BUGID:3648].
-          
+
         * TAO_IDL/util/utl_err.cpp:
-        
+
           Changed message associated with EIDL_ILLEGAL_ADD flag
           to be more informative.
 
         * TAO_IDL/tao_idl.mpc:
-        
+
           Removed a redundant item from the 'after' line of
           TAO_IDL_EXE.
-          
+
 Wed Apr 22 09:07:44 UTC 2009  Vladimir Zykov  <vz@prismtech.com>
 
         * tests/Bug_3632_Regression/test.cpp:
diff --git a/TAO/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp
index a9b91dcda89..c4a678fc71a 100644
--- a/TAO/tests/Abstract_Interface/client.cpp
+++ b/TAO/tests/Abstract_Interface/client.cpp
@@ -197,7 +197,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         }
 
       CORBA::Object_var obj =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior_input_file));
+        orb->string_to_object (ior_input_file);
 
       if (CORBA::is_nil (obj.in ()))
         {
diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp
index cb6a7de2c64..ff401da2ed4 100644
--- a/TAO/tests/Big_Reply/client.cpp
+++ b/TAO/tests/Big_Reply/client.cpp
@@ -49,7 +49,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+        orb->string_to_object (ior);
 
       Test::Big_Reply_var reply_gen =
         Test::Big_Reply::_narrow (tmp.in ());
diff --git a/TAO/tests/Bug_1254_Regression/client.cpp b/TAO/tests/Bug_1254_Regression/client.cpp
index 54d1dc20f20..0da8e0bf326 100644
--- a/TAO/tests/Bug_1254_Regression/client.cpp
+++ b/TAO/tests/Bug_1254_Regression/client.cpp
@@ -43,7 +43,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ACE_TEXT_ALWAYS_CHAR (ior));
+        orb->string_to_object (ior);
 
       BlobServer_var blobServer = BlobServer::_narrow(tmp.in());
       if(CORBA::is_nil(blobServer.in()))
diff --git a/TAO/tests/Bug_2174_Regression/client.cpp b/TAO/tests/Bug_2174_Regression/client.cpp
index c2d15a95592..b3162c7a9ef 100644
--- a/TAO/tests/Bug_2174_Regression/client.cpp
+++ b/TAO/tests/Bug_2174_Regression/client.cpp
@@ -53,7 +53,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
         Simple_Server::_narrow (object.in ());
diff --git a/TAO/tests/Bug_2734_Regression/client.cpp b/TAO/tests/Bug_2734_Regression/client.cpp
index 689a85e3493..755d3da6daf 100644
--- a/TAO/tests/Bug_2734_Regression/client.cpp
+++ b/TAO/tests/Bug_2734_Regression/client.cpp
@@ -96,7 +96,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
         Simple_Server::_narrow (object.in ());
diff --git a/TAO/tests/Bug_2768_Regression/client.cpp b/TAO/tests/Bug_2768_Regression/client.cpp
index 08b619eef2a..707b9119343 100644
--- a/TAO/tests/Bug_2768_Regression/client.cpp
+++ b/TAO/tests/Bug_2768_Regression/client.cpp
@@ -43,7 +43,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       return 1;
 
     CORBA::Object_var object_temp =
-      orb->string_to_object(ACE_TEXT_ALWAYS_CHAR (ior));
+      orb->string_to_object (ior);
 
     SimpleMessenger::Messenger_var messenger =
       SimpleMessenger::Messenger::_unchecked_narrow( object_temp.in ());
diff --git a/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp b/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp
index 69605476994..ac31228b5e0 100644
--- a/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp
+++ b/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp
@@ -47,7 +47,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-    CORBA::Object_var obj = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+    CORBA::Object_var obj = orb->string_to_object (ior);
     CORBA::PolicyList_var policies;
     CORBA::Boolean result = obj->_validate_connection (policies.out());
     if (result)
diff --git a/TAO/tests/Bug_3598a_Regression/client.cpp b/TAO/tests/Bug_3598a_Regression/client.cpp
index 06919103896..1eb9ffec04b 100644
--- a/TAO/tests/Bug_3598a_Regression/client.cpp
+++ b/TAO/tests/Bug_3598a_Regression/client.cpp
@@ -62,7 +62,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+        orb->string_to_object (ior);
 
       Test::Hello_var hello =
         Test::Hello::_narrow(tmp.in () );
diff --git a/TAO/tests/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp
index e0dbd06604a..01e917895f6 100644
--- a/TAO/tests/Client_Leaks/client.cpp
+++ b/TAO/tests/Client_Leaks/client.cpp
@@ -57,7 +57,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+        orb->string_to_object (ior);
 
       Test::Process_Factory_var process_factory =
         Test::Process_Factory::_narrow(tmp.in ());
diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp
index 746b9c64bd9..49152351bee 100644
--- a/TAO/tests/FL_Cube/client.cpp
+++ b/TAO/tests/FL_Cube/client.cpp
@@ -181,7 +181,7 @@ Client::parse_args (int argc, ACE_TCHAR *argv[])
       }
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+    this->orb_->string_to_object (ior);
 
   this->server_ =
     Simple_Server::_narrow (object.in ());
diff --git a/TAO/tests/HandleExhaustion/client.cpp b/TAO/tests/HandleExhaustion/client.cpp
index 5b4b0446711..dd2e4af7a87 100644
--- a/TAO/tests/HandleExhaustion/client.cpp
+++ b/TAO/tests/HandleExhaustion/client.cpp
@@ -47,7 +47,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+        orb->string_to_object (ior);
 
       Test_var test = Test::_narrow(tmp.in ());
 
diff --git a/TAO/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp
index 9999a38d5c7..940e5439939 100644
--- a/TAO/tests/Hello/client.cpp
+++ b/TAO/tests/Hello/client.cpp
@@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  // Indicates sucessful parsing of the command line
+  // Indicates successful parsing of the command line
   return 0;
 }
 
diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index ec2b7f9b5b4..50085c4d683 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -241,7 +241,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (IOR));
+        orb->string_to_object (IOR);
 
       // Try to narrow the object reference to a <server> reference.
       test_var server = test::_narrow (object.in ());
diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp
index f1489871650..21880114610 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.cpp
+++ b/TAO/tests/MProfile_Forwarding/Manager.cpp
@@ -175,18 +175,18 @@ Manager::make_iors_register (void)
 {
   // First  server
   CORBA::Object_var object_primary =
-    this->orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (first_ior));
+    this->orb_->string_to_object (first_ior);
 
   //Second server
   CORBA::Object_var object_secondary =
-    this->orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (second_ior));
+    this->orb_->string_to_object (second_ior);
 
   if (third_ior == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "Here is the culprit\n"));
   // Third Server
   CORBA::Object_var object_tertiary =
-    this->orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (third_ior));
+    this->orb_->string_to_object (third_ior);
 
   // Get an object reference for the ORBs IORManipultion object!
   CORBA::Object_ptr IORM =
diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp
index 08634f5a3e2..1b1d7a9d8f5 100644
--- a/TAO/tests/Multiple/client.cpp
+++ b/TAO/tests/Multiple/client.cpp
@@ -43,7 +43,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      CORBA::Object_var object = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+      CORBA::Object_var object = orb->string_to_object (ior);
 
       if (CORBA::is_nil (object.in ()))
         {
diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
index 26fa14a24b0..39912c97638 100644
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client.cpp
@@ -130,7 +130,7 @@ ACE_TMAIN (int argc,
 
       poa_manager->activate ();
 
-      object = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+      object = orb->string_to_object (ior);
 
       server_var server = server::_narrow (object.in ());
 
diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
index 89f634b7500..53fd7dc44a9 100644
--- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
@@ -137,7 +137,7 @@ ACT_TMAIN (int argc, ACE_TCHAR **argv)
 
       poa_manager->activate ();
 
-      object = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+      object = orb->string_to_object (ior);
 
       server_var server = server::_narrow (object.in ());
 
diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp
index a2bada21ad1..cda926dccea 100644
--- a/TAO/tests/Nested_Event_Loop/client.cpp
+++ b/TAO/tests/Nested_Event_Loop/client.cpp
@@ -95,7 +95,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       poa_manager->activate ();
 
       // Get an object reference from the argument string.
-      object = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (IOR));
+      object = orb->string_to_object (IOR);
 
       // Try to narrow the object reference to a <server> reference.
       server_var server_object = server::_narrow (object.in ());
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
index 82371609cb3..b32d87d3aa5 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
@@ -63,7 +63,7 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[])
 
     try
     {
-      co = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior_file_.c_str ()));
+      co = orb->string_to_object (ior_file_.c_str ());
 
       if (co == 0)
         {
diff --git a/TAO/tests/POA/EndpointPolicy/client.cpp b/TAO/tests/POA/EndpointPolicy/client.cpp
index a82eb00d24d..0ee720ca386 100644
--- a/TAO/tests/POA/EndpointPolicy/client.cpp
+++ b/TAO/tests/POA/EndpointPolicy/client.cpp
@@ -51,7 +51,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      tmp = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+      tmp = orb->string_to_object (ior);
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/POA/Generic_Servant/client.cpp b/TAO/tests/POA/Generic_Servant/client.cpp
index 3b8725f1aae..b00706c55da 100644
--- a/TAO/tests/POA/Generic_Servant/client.cpp
+++ b/TAO/tests/POA/Generic_Servant/client.cpp
@@ -122,7 +122,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (IOR));
+        orb->string_to_object (IOR);
 
       // Try to narrow the object reference to a test reference.
       test_var test = test::_narrow (object.in ());
diff --git a/TAO/tests/POA/Persistent_ID/client.cpp b/TAO/tests/POA/Persistent_ID/client.cpp
index 44246fffec2..fe95b34dfdf 100644
--- a/TAO/tests/POA/Persistent_ID/client.cpp
+++ b/TAO/tests/POA/Persistent_ID/client.cpp
@@ -73,7 +73,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         return parse_args_result;
 
       CORBA::Object_var object =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (IOR));
+        orb->string_to_object (IOR);
 
       test_var test1 =
         test::_narrow (object.in ());
diff --git a/TAO/tests/Portable_Interceptors/AMI/client.cpp b/TAO/tests/Portable_Interceptors/AMI/client.cpp
index 0ea1013c803..dec2ca68b50 100644
--- a/TAO/tests/Portable_Interceptors/AMI/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/client.cpp
@@ -79,7 +79,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         root_poa->the_POAManager ();
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+        orb->string_to_object (ior);
 
       Test::Echo_var echo =
         Test::Echo::_narrow (tmp.in ());
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp
index 6680f5cfc52..9dde6c00f21 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp
@@ -14,7 +14,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     return -1;
   }
 
-  CORBA::Object_var obj = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (argv[1]));
+  CORBA::Object_var obj = orb->string_to_object (argv[1]);
   StateTransfer_var server = StateTransfer::_narrow (obj.in ());
 
   CORBA::Short n  = server->number ();
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp
index 230158bcdd5..ed27268f76e 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp
@@ -29,7 +29,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     return -1;
   }
 
-  CORBA::Object_var obj = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (argv[1]));
+  CORBA::Object_var obj = orb->string_to_object (argv[1]);
   InvokeMe_var server = InvokeMe::_narrow (obj.in ());
 
   always Shutdown( server.in () ); // When goes out of scope!
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
index 6680f5cfc52..9dde6c00f21 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
@@ -14,7 +14,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     return -1;
   }
 
-  CORBA::Object_var obj = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (argv[1]));
+  CORBA::Object_var obj = orb->string_to_object (argv[1]);
   StateTransfer_var server = StateTransfer::_narrow (obj.in ());
 
   CORBA::Short n  = server->number ();
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
index 7f3621783ac..1da90efa1cc 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/client.cpp
@@ -61,7 +61,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+        orb->string_to_object (ior);
 
       Test::Hello_var hello =
         Test::Hello::_narrow(tmp.in () );
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
index cfc51faa19d..c95cb27668c 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
@@ -199,7 +199,7 @@ Task::svc (void)
         CORBA::PolicyManager::_narrow (object.in ());
 
       object =
-        this->orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+        this->orb_->string_to_object (ior);
 
       test_var test =
         test::_narrow (object.in ());
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
index f154282327c..e38d91d6d8f 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
@@ -63,7 +63,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         return result;
 
       CORBA::Object_var object =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+        orb->string_to_object (ior);
 
       test_var test =
         test::_narrow (object.in ());
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
index e479d7fd306..f0f3dee1ecd 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -88,7 +88,7 @@ Task::svc (void)
         get_implicit_thread_CORBA_priority (this->orb_.in ());
 
       object =
-        this->orb_->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+        this->orb_->string_to_object (ior);
 
       test_var test =
         test::_narrow (object.in ());
diff --git a/TAO/tests/Server_Connection_Purging/client2.cpp b/TAO/tests/Server_Connection_Purging/client2.cpp
index 1cd616d0d2f..406ab3f4fc9 100644
--- a/TAO/tests/Server_Connection_Purging/client2.cpp
+++ b/TAO/tests/Server_Connection_Purging/client2.cpp
@@ -55,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 (ACE_TEXT_ALWAYS_CHAR (IOR));
+        orb->string_to_object (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 4927ca14972..c756e56970d 100644
--- a/TAO/tests/Single_Read/client.cpp
+++ b/TAO/tests/Single_Read/client.cpp
@@ -85,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 (ACE_TEXT_ALWAYS_CHAR (IOR));
+        orb->string_to_object (IOR);
 
       // Try to narrow the object reference to a <test> reference.
       test_var test_object = test::_narrow (object.in ());
diff --git a/TAO/tests/Smart_Proxies/dtor/client.cpp b/TAO/tests/Smart_Proxies/dtor/client.cpp
index 0d9bb73f23a..1e9be0a8579 100644
--- a/TAO/tests/Smart_Proxies/dtor/client.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/client.cpp
@@ -42,7 +42,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     if (parse_args (argc, argv) != 0)
       return 1;
 
-    CORBA::Object_var obj = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+    CORBA::Object_var obj = orb->string_to_object (ior);
 
     // force a scope to see the destruction of the server object
     {
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index 07d9f055a8f..6bc6276367b 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -187,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 (ACE_TEXT_ALWAYS_CHAR (IOR));
+        orb->string_to_object (IOR);
 
       // Try to narrow the object reference to a <test> reference.
       test_var test_object_no_policy = test::_narrow (object.in ());
diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp
index 689a85e3493..755d3da6daf 100644
--- a/TAO/tests/Timeout/client.cpp
+++ b/TAO/tests/Timeout/client.cpp
@@ -96,7 +96,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior));
+        orb->string_to_object (ior);
 
       Simple_Server_var server =
         Simple_Server::_narrow (object.in ());