2 files changed, 8 insertions, 8 deletions

diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
index 1865e09694f..73d788b8405 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
@@ -160,13 +160,13 @@ Client::parse_args (int argc, ACE_TCHAR* argv[])
         one_way_test_ = true;
         break;
       case 'k':
-        test_ior = get_opts.opt_arg ();
+        test_ior = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ());
         break;
       case 'b':
-        back_ior = get_opts.opt_arg ();
+        back_ior = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ());
         break;
       case 'f':
-        flush_strategy = get_opts.opt_arg ();
+        flush_strategy = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ());
         break;
       default:
         ACE_ERROR_RETURN ((LM_ERROR, "Invalid option \'-%c\'\n", c)
@@ -180,13 +180,13 @@ Client::parse_args (int argc, ACE_TCHAR* argv[])
   obj = orb_->string_to_object (back_ior.c_str());
   management_ = Test::_narrow (obj.in ());
 
-  if (ACE_OS::strcasecmp (ACE_TEXT("lf"), flush_strategy.c_str()) == 0) {
+  if (ACE_OS::strcasecmp ("lf", flush_strategy.c_str()) == 0) {
     flush_strategy_ = LF;
   }
-  else if (ACE_OS::strcasecmp (ACE_TEXT("blocking"), flush_strategy.c_str()) == 0) {
+  else if (ACE_OS::strcasecmp ("blocking", flush_strategy.c_str()) == 0) {
     flush_strategy_ = BLOCKING;
   }
-  else if (ACE_OS::strcasecmp (ACE_TEXT("reactive"), flush_strategy.c_str()) == 0) {
+  else if (ACE_OS::strcasecmp ("reactive", flush_strategy.c_str()) == 0) {
     flush_strategy_ = REACTIVE;
   }
 
diff --git a/TAO/tests/Oneway_Send_Timeouts/main.cpp b/TAO/tests/Oneway_Send_Timeouts/main.cpp
index 7db7cb03175..4d77273b0c7 100644
--- a/TAO/tests/Oneway_Send_Timeouts/main.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/main.cpp
@@ -37,7 +37,7 @@ MyMain::print_usage ()
 bool
 MyMain::init_server (const ACE_TCHAR* args)
 {
-  std::string my_args (args);
+  std::string my_args (ACE_TEXT_ALWAYS_CHAR(args));
   // main thread and extra thread for backdoor operations
   int thread_pool = 2;
 
@@ -74,7 +74,7 @@ MyMain::init_server (const ACE_TCHAR* args)
 bool
 MyMain::init_client (const ACE_TCHAR* args)
 {
-  std::string my_args (args);
+  std::string my_args (ACE_TEXT_ALWAYS_CHAR(args));
   int thread_pool = 1;
 
   ACE_auto_ptr_reset (client_task_, new Client_Task (my_args));