Made it CE friendly

1 files changed, 13 insertions, 11 deletions

diff --git a/tests/Buffer_Stream_Test.cpp b/tests/Buffer_Stream_Test.cpp
index bbe64249149..f57b63ffe0c 100644
--- a/tests/Buffer_Stream_Test.cpp
+++ b/tests/Buffer_Stream_Test.cpp
@@ -81,7 +81,7 @@ int
 Common_Task::open (void *)
 {
   if (this->activate (THR_NEW_LWP | THR_DETACHED) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn")), -1);
   return 0;
 }
 
@@ -89,7 +89,7 @@ int
 Common_Task::close (u_long exit_status)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%t) thread is exiting with status %d in module %s\n",
+              ASYS_TEXT ("(%t) thread is exiting with status %d in module %s\n"),
              exit_status,
               this->name ()));
 
@@ -125,12 +125,13 @@ Supplier::svc (void)
       mb->wr_ptr (2);
 
       if (this->put_next (mb) == -1)
-        ACE_ERROR ((LM_ERROR, "(%t) %p\n", "put_next"));
+        ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%t) %p\n"),
+                    ASYS_TEXT ("put_next")));
     }
 
   ACE_NEW_RETURN(mb, ACE_Message_Block, -1);
   if (this->put_next (mb) == -1)
-    ACE_ERROR ((LM_ERROR, "(%t) %p\n", "put_next"));
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%t) %p\n"), ASYS_TEXT ("put_next")));
 
   return 0;
 }
@@ -191,9 +192,9 @@ Consumer::svc (void)
 // Main driver function.
 
 int
-main (int, char *[])
+main (int, ASYS_TCHAR *[])
 {
-  ACE_START_TEST ("Buffer_Stream_Test");
+  ACE_START_TEST (ASYS_TEXT ("Buffer_Stream_Test"));
 
 #if defined (ACE_HAS_THREADS)
   // Control hierachically-related active objects.
@@ -202,22 +203,23 @@ main (int, char *[])
   MT_Module *sm;
 
   // Allocate the Consumer and Supplier modules.
-  ACE_NEW_RETURN (cm, MT_Module ("Consumer", new Consumer), -1);
-  ACE_NEW_RETURN (sm, MT_Module ("Supplier", new Supplier), -1);
+  ACE_NEW_RETURN (cm, MT_Module (ASYS_TEXT ("Consumer"), new Consumer), -1);
+  ACE_NEW_RETURN (sm, MT_Module (ASYS_TEXT ("Supplier"), new Supplier), -1);
 
   // Create Supplier and Consumer Modules and push them onto the
   // Stream.  All processing is performed in the Stream.
 
   if (stream.push (cm) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "push"), 1);
+    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("push")), 1);
   else if (stream.push (sm) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "push"), 1);
+    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("push")), 1);
 
   // Barrier synchronization: wait for the threads to exit, then exit
   // ourselves.
   ACE_Thread_Manager::instance ()->wait ();
 #else
-  ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n"));
+  ACE_ERROR ((LM_ERROR,
+              ASYS_TEXT ("threads not supported on this platform\n")));
 #endif /* ACE_HAS_THREADS */
   ACE_END_TEST;
   return 0;