Tue Oct 7 16:03:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 28 insertions, 18 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f558cd4b09b..dcefe5d9059 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Tue Oct  7 16:03:45 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
+        * orbsvcs/tests/Bug_2615_Regression/client.cpp
+        * orbsvcs/tests/Bug_2709_Regression/client.cpp
+        * orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
+        * orbsvcs/tests/Bug_2709_Regression/Client_Task.h
+        * orbsvcs/tests/Bug_2925_Regression/server.cpp
+          ACE_TCHAR fixes
+
 Tue Oct  7 15:20:45 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/tests/Bug_2247_Regression/server.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
index 91ab1821f5e..1588ff33e30 100644
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
+++ b/TAO/orbsvcs/tests/Bug_2377_Regression/uipmc_test.cpp
@@ -50,11 +50,11 @@ parse_args (int argc, ACE_TCHAR *argv[])
       switch (c)
         {
         case 'u':
-          uipmc_url = get_opts.opt_arg ();
+          uipmc_url = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ());
           success |= 0x01;
           break;
         case 'c':
-          client_uipmc_url = get_opts.opt_arg ();
+          client_uipmc_url = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ());
           success |= 0x02;
           break;
         }
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
index 3dafa38941b..a66ff5e4aca 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp
@@ -10,7 +10,7 @@
 ACE_RCSID(Hello, client, "$Id$")
 
 const ACE_TCHAR *ior = ACE_TEXT("file://ior.ior");
-const char *iogr = "file://iogr.ior";
+const ACE_TCHAR *iogr = ACE_TEXT("file://iogr.ior");
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
index 7e3d61bcb1b..92e32b206c8 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp
@@ -6,13 +6,13 @@
 
 //////////////////////////////////////////////////////////////////////////
 
-ACE_CString file_prefix("file://");
+ACE_TString file_prefix(ACE_TEXT("file://"));
 
 /// Constructor
 Client_Task::Client_Task (CORBA::ORB_ptr corb,
   ACE_Thread_Manager *thr_mgr,
-  const ACE_CString& collocated_ior_file,
-  const ACE_CString& server_ior_file)
+  const ACE_TString& collocated_ior_file,
+  const ACE_TString& server_ior_file)
   : ACE_Task_Base (thr_mgr)
   , corb_ (CORBA::ORB::_duplicate (corb))
   , collocated_ior_file_(collocated_ior_file)
@@ -24,7 +24,7 @@ CORBA::Object_ptr
 Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version)
 {
   CORBA::Object_var remote_server(
-    corb_->string_to_object (ACE_CString(file_prefix + this->server_ior_file_).c_str()));
+    corb_->string_to_object (ACE_TString(file_prefix + this->server_ior_file_).c_str()));
 
   if (CORBA::is_nil (remote_server.in ()))
     {
@@ -33,7 +33,7 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA:
     }
 
   CORBA::Object_var collocated_server(
-    corb_->string_to_object (ACE_CString(file_prefix + this->collocated_ior_file_).c_str()));
+    corb_->string_to_object (ACE_TString(file_prefix + this->collocated_ior_file_).c_str()));
 
   if (CORBA::is_nil (collocated_server.in ()))
     {
@@ -115,13 +115,13 @@ int Client_Task::svc (void)
         }
 
       CORBA::Object_var remote_server(
-        corb_->string_to_object (ACE_CString(file_prefix + this->server_ior_file_).c_str()));
+        corb_->string_to_object (ACE_TString(file_prefix + this->server_ior_file_).c_str()));
 
       Test_var remote_server_as_test =
         Test::_narrow (remote_server.in ());
 
       CORBA::Object_var collocated_server(
-        corb_->string_to_object (ACE_CString(file_prefix + this->collocated_ior_file_).c_str()));
+        corb_->string_to_object (ACE_TString(file_prefix + this->collocated_ior_file_).c_str()));
 
       Test_var collocated_server_as_test =
         Test::_narrow (collocated_server.in ());
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
index 21652b83757..a94e38cec90 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h
@@ -13,8 +13,8 @@ public:
   /// Constructor
   Client_Task (CORBA::ORB_ptr corb,
     ACE_Thread_Manager *thr_mgr,
-    const ACE_CString& collocated_ior_file,
-    const ACE_CString& server_ior_file);
+    const ACE_TString& collocated_ior_file,
+    const ACE_TString& server_ior_file);
 
   CORBA::Object_ptr make_iogr (
      const char* domain_id,
@@ -29,7 +29,7 @@ private:
 
   TAO_IOP::TAO_IOR_Manipulation_var iorm_;
 
-  const ACE_CString& collocated_ior_file_;
+  const ACE_TString& collocated_ior_file_;
 
-  const ACE_CString& server_ior_file_;
+  const ACE_TString& server_ior_file_;
 };
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
index 7077cd95300..194242928c1 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/client.cpp
@@ -13,8 +13,8 @@
 
 //////////////////////////////////////////////////////////////////////////
 
-ACE_CString collocated_ior_file("collocated_server.ior");
-ACE_CString server_ior_file("server.ior");
+ACE_TString collocated_ior_file(ACE_TEXT("collocated_server.ior"));
+ACE_TString server_ior_file(ACE_TEXT("server.ior"));
 
 //////////////////////////////////////////////////////////////////////////
 
diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp
index 0e8285a8a26..5f612065014 100644
--- a/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2925_Regression/server.cpp
@@ -37,11 +37,11 @@ parse_args (int argc, ACE_TCHAR *argv[])
       switch (c)
         {
         case 'u':
-          uipmc_url = get_opts.opt_arg ();
+          uipmc_url = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ());
           success |= 0x01;
           break;
         case 'o':
-          ior_output_file = get_opts.opt_arg ();
+          ior_output_file = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ());
           success |= 0x02;
           break;
         }