1 files changed, 9 insertions, 10 deletions
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index d413a5becac..1ae4f59307d 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -21,7 +21,6 @@
 #endif /* ACE_VXWORKS && !__RTP__ */
 
 #include "server.h"
-#include "ace/OS_NS_string.h"
 #include "ace/Sched_Params.h"
 #include "tao/Strategies/advanced_resource.h"
 
@@ -172,17 +171,17 @@ Server::write_iors (void)
 int
 Server::activate_high_servant (void)
 {
-  ACE_TCHAR orbendpoint[BUFSIZ];
+  char orbendpoint[BUFSIZ];
 
-  ACE_OS::strcpy (orbendpoint, ACE_TEXT ("-ORBEndpoint "));
-  ACE_OS::strcat (orbendpoint, GLOBALS::instance ()->endpoint);
+  ACE_OS::sprintf (orbendpoint,
+                   "-ORBEndpoint %s ",
+                   ACE_TEXT_ALWAYS_CHAR (GLOBALS::instance ()->endpoint));
 
-  ACE_TCHAR *high_second_argv[] =
-    { orbendpoint,
-      const_cast<ACE_TCHAR *> (ACE_TEXT ("-ORBSndSock 32768 ")),
-      const_cast<ACE_TCHAR *> (ACE_TEXT ("-ORBRcvSock 32768 ")),
-      0
-    };
+  char *high_second_argv[] =
+    {orbendpoint,
+     const_cast<char *> ("-ORBSndSock 32768 "),
+     const_cast<char *> ("-ORBRcvSock 32768 "),
+     0};
   ACE_NEW_RETURN (this->high_argv_,
                   ACE_ARGV (this->argv_, high_second_argv),
                   -1);