1 files changed, 6 insertions, 6 deletions
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index b4febf2f835..9a2ae93019f 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -122,9 +122,9 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
   str = process_str;
 
   const int ENV_BUF_LEN = 512;
-  char buf[ENV_BUF_LEN];
+  ACE_TCHAR buf[ENV_BUF_LEN];
   server_addr.addr_to_string(buf,ENV_BUF_LEN,0);
-  options.setenv("EventChannelFactoryAddr", buf);
+  options.setenv(ACE_TEXT("EventChannelFactoryAddr"), buf);
 
   // extract the object ID from the criteria
   for (size_t i = 0; i < the_criteria.length(); ++i)
@@ -135,10 +135,10 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
       const char* id_str = name[0].id.in();
       the_criteria[i].val >>= val;
       if (id_str[0] != '-') // environment variable
-        options.setenv(id_str, "%s", val);
+        options.setenv(ACE_TEXT_TO_TCHAR_IN(id_str), "%s", val);
       else {// command line option
-        ACE_OS::sprintf(buf, " %s %s", id_str, val);
-        str += buf;
+        ACE_OS::sprintf(buf, ACE_TEXT(" %s %s"), id_str, val);
+        str += ACE_TEXT_TO_CHAR_IN(buf);
       }
     }
   }
@@ -178,7 +178,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
   char ior[5000] = {'0'};
   int n = 0;
   int byteRead=0;
-  while (0 != (n = stream.recv(ior+byteRead, 5000-byteRead)))  {
+  while ((n = stream.recv(ior+byteRead, 5000-byteRead)))  {
     byteRead += n;
   }