4 files changed, 18 insertions, 18 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 3c9f15e0e97..9bf572f3fce 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -774,7 +774,7 @@ Consumer_Main::parse_args (int argc, ACE_TCHAR *argv[])
       narg += consumed;
       corba_arg = false;
     }
-    else if (ACE_OS::strncmp (argv[narg], "-ORB", 4) == 0)
+    else if (ACE_OS::strncmp (argv[narg], ACE_TEXT("-ORB"), 4) == 0)
     {
       corba_arg = true;
     }
@@ -801,52 +801,52 @@ int
 Consumer_Main::parse_single_arg (int argc, ACE_TCHAR *argv[])
 {
   int consumed = 0;
-  if (ACE_OS::strcasecmp (argv[0], "-any") == 0)
+  if (ACE_OS::strcasecmp (argv[0], ACE_TEXT("-any")) == 0)
   {
     this->mode_ = MODE_ANY;
     consumed = 1;
   }
-  else if (ACE_OS::strcasecmp (argv[0], "-structured") == 0)
+  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT("-structured")) == 0)
   {
     this->mode_ = MODE_STRUCTURED;
     consumed = 1;
   }
-  else if (ACE_OS::strcasecmp (argv[0], "-sequence") == 0)
+  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT("-sequence")) == 0)
   {
     this->mode_ = MODE_SEQUENCE;
     consumed = 1;
   }
-  else if (ACE_OS::strcasecmp (argv[0], "-v") == 0)
+  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT("-v")) == 0)
   {
     this->verbose_ = true;
     consumed = 1;
   }
-  else if (ACE_OS::strcasecmp (argv[0], "-channel") == 0)
+  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT("-channel")) == 0)
   {
     this->channel_file_= argv[1];
     consumed = 2;
   }
-  else if (ACE_OS::strcasecmp (argv[0], "-expect") == 0 && argc > 1)
+  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT("-expect")) == 0 && argc > 1)
   {
     this->expect_ = ACE_OS::atoi (argv[1]);
     consumed = 2;
   }
-  else if (ACE_OS::strcasecmp (argv[0], "-fail") == 0 && argc > 1)
+  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT("-fail")) == 0 && argc > 1)
   {
     this->fail_ = ACE_OS::atoi (argv[1]);
     consumed = 2;
   }
-  else if (ACE_OS::strcasecmp (argv[0], "-serial_number") == 0)
+  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT("-serial_number")) == 0)
   {
     this->serial_number_= ACE_OS::atoi (argv[1]);
     consumed = 2;
   }
-  else if (ACE_OS::strcasecmp (argv[0], "-nonamesvc") == 0)
+  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT("-nonamesvc")) == 0)
   {
     this->use_naming_service_ = false;
     consumed = 1;
   }
-  else if (ACE_OS::strcasecmp (argv[0], "-disconnect") == 0)
+  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT("-disconnect")) == 0)
   {
     this->disconnect_on_exit_ = true;
     consumed = 1;
@@ -1210,7 +1210,7 @@ Consumer_Main::init_event_channel (void)
               ));
           }
           // kill the channel filename so we don't overwrite the file
-          this->channel_file_ = "";
+          this->channel_file_ = ACE_TEXT("");
         }
       }
       catch (...)
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
index 21dfc9e8ac9..358c29600c6 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h
@@ -216,7 +216,7 @@ class Consumer_Main
     MODE_ANY,
     MODE_STRUCTURED,
     MODE_SEQUENCE} mode_;   // -any, -structured, or -sequence
-  ACE_CString channel_file_; // -channel fileneame
+  ACE_TString channel_file_; // -channel fileneame
   size_t expect_;           // -expect n
   size_t fail_;             // -fail n
   bool use_naming_service_; // -nonamesvc
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
index 25293432de5..9ea2f3233a5 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -218,7 +218,7 @@ Supplier_Main::parse_args (int argc, ACE_TCHAR *argv[])
       narg += consumed;
       corba_arg = false;
     }
-    else if (ACE_OS::strncmp (argv[narg], "-ORB", 4) == 0)
+    else if (ACE_OS::strncmp (argv[narg], ACE_TEXT("-ORB"), 4) == 0)
     {
       corba_arg = true;
     }
@@ -289,7 +289,7 @@ Supplier_Main::parse_single_arg (int argc, ACE_TCHAR *argv[])
     this->use_naming_service_ = false;
     consumed = 1;
   }
-  else if (ACE_OS::strcasecmp (argv[0], "-disconnect") == 0)
+  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT("-disconnect")) == 0)
   {
     this->disconnect_on_exit_ = true;
     consumed = 1;
@@ -612,7 +612,7 @@ Supplier_Main::init_event_channel (void)
               ));
           }
           // kill the channel filename so we don't overwrite the file
-          this->channel_file_ = "";
+          this->channel_file_ = ACE_TEXT("");
         }
       }
       catch (...)
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
index 4f67cb6481e..6d998403a03 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h
@@ -134,12 +134,12 @@ class Supplier_Main
     MODE_ANY,
     MODE_STRUCTURED,
     MODE_SEQUENCE} mode_;    // -any, -structured, or -sequence
-  ACE_CString channel_file_; // -channel filename
+  ACE_TString channel_file_; // -channel filename
   size_t send_;              // -send n
   bool use_naming_service_;  // -nonamesvc
   size_t serial_number_;     // -serial_number
   bool disconnect_on_exit_;  // -disconnect
-  ACE_CString id_file_;      // -ids
+  ACE_TString id_file_;      // -ids
   size_t pause_;             // -pause n (pause after sending n messages)
   CORBA::ORB_var orb_;
   PortableServer::POA_var root_poa_;