ChangeLogTag:Sat Apr 22 20:53:11 2000 Darrell Brunsch <brunsch@uci.edu>

1 files changed, 44 insertions, 44 deletions

diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp
index ec93d1e38d1..5fdcd6798bd 100644
--- a/tests/Message_Queue_Test.cpp
+++ b/tests/Message_Queue_Test.cpp
@@ -30,7 +30,7 @@
 
 ACE_RCSID(tests, Message_Queue_Test, "$Id$")
 
-const ASYS_TCHAR usage[] = ASYS_TEXT ("usage: Message_Queue_Test <number of messages>\n");
+const ACE_TCHAR usage[] = ACE_TEXT ("usage: Message_Queue_Test <number of messages>\n");
 
 typedef ACE_Message_Queue<ACE_NULL_SYNCH> QUEUE;
 typedef ACE_Message_Queue_Iterator<ACE_NULL_SYNCH> ITERATOR;
@@ -77,7 +77,7 @@ static int
 iterator_test (void)
 {
   const int ITERATIONS = 5;
-  ASYS_TCHAR buffer[ITERATIONS][BUFSIZ];
+  ACE_TCHAR buffer[ITERATIONS][BUFSIZ];
   // Use queue size from of 32 Kb, instead of the default of 16 Kb
   // (defined by ACE_Message_Queue_Base::DEFAULT_HWM), so that the
   // test runs on machines with 8Kb pagesizes.
@@ -93,7 +93,7 @@ iterator_test (void)
   for (i = 0; i < ITERATIONS; i++)
     {
       ACE_OS::sprintf (buffer[i],
-                       ASYS_TEXT ("%d"),
+                       ACE_TEXT ("%d"),
                        i + 1);
 
       ACE_Message_Block *entry;
@@ -104,18 +104,18 @@ iterator_test (void)
 
       if (queue.is_full ())
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("QUEUE:: the message queue is full on iteration %u!\n"),
+                           ACE_TEXT ("QUEUE:: the message queue is full on iteration %u!\n"),
                            i + 1),
                           -1);
 
       if (queue.enqueue (entry) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("QUEUE::enqueue\n")),
+                           ACE_TEXT ("QUEUE::enqueue\n")),
                           -1);
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\nForward Iterations\n")));
+              ACE_TEXT ("\nForward Iterations\n")));
   {
     ITERATOR iterator (queue);
 
@@ -123,12 +123,12 @@ iterator_test (void)
          iterator.next (entry) != 0;
          iterator.advance ())
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("%s\n"),
+                  ACE_TEXT ("%s\n"),
                   entry->base ()));
   }
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\nReverse Iterations\n")));
+              ACE_TEXT ("\nReverse Iterations\n")));
   {
     REVERSE_ITERATOR iterator (queue);
 
@@ -136,12 +136,12 @@ iterator_test (void)
          iterator.next (entry) != 0;
          iterator.advance ())
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("%s\n"),
+                  ACE_TEXT ("%s\n"),
                   entry->base ()));
   }
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\nForward Iterations\n")));
+              ACE_TEXT ("\nForward Iterations\n")));
   {
     QUEUE::ITERATOR iterator (queue);
 
@@ -149,12 +149,12 @@ iterator_test (void)
          iterator.next (entry) != 0;
          iterator.advance ())
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("%s\n"),
+                  ACE_TEXT ("%s\n"),
                   entry->base ()));
   }
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\nReverse Iterations\n")));
+              ACE_TEXT ("\nReverse Iterations\n")));
   {
     QUEUE::REVERSE_ITERATOR iterator (queue);
 
@@ -162,7 +162,7 @@ iterator_test (void)
          iterator.next (entry) != 0;
          iterator.advance ())
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("%s\n"),
+                  ACE_TEXT ("%s\n"),
                   entry->base ()));
   }
 
@@ -177,8 +177,8 @@ single_thread_performance_test (int queue_type = 0)
 {
   const char test_message[] =
     "ACE_Message_Queue Test Message";
-  const ASYS_TCHAR *message =
-    ASYS_TEXT ("ACE_Message_Queue<ACE_NULL_SYNCH>, single thread");
+  const ACE_TCHAR *message =
+    ACE_TEXT ("ACE_Message_Queue<ACE_NULL_SYNCH>, single thread");
   int i;
 
   // Create a message queue.
@@ -203,7 +203,7 @@ single_thread_performance_test (int queue_type = 0)
       ACE_NEW_RETURN (msgq,
                       ACE_Message_Queue_NT,
                       -1);
-      message = ASYS_TEXT ("ACE_Message_Queue_NT, single thread test");
+      message = ACE_TEXT ("ACE_Message_Queue_NT, single thread test");
     }
 #endif /* VXWORKS */
 
@@ -251,14 +251,14 @@ single_thread_performance_test (int queue_type = 0)
     {
       if (msgq->enqueue_tail (send_block[i]) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("enqueue")),
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("enqueue")),
                           -1);
 
       if (msgq->dequeue_head (receive_block_p[i]) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("dequeue_head")),
+                           ACE_TEXT ("%p\n"),
+                           ACE_TEXT ("dequeue_head")),
                           -1);
     }
 
@@ -267,7 +267,7 @@ single_thread_performance_test (int queue_type = 0)
   ACE_Time_Value tv;
   timer->elapsed_time (tv);
   ACE_DEBUG ((LM_INFO,
-              ASYS_TEXT ("%s: %u messages took %u msec (%f msec/message)\n"),
+              ACE_TEXT ("%s: %u messages took %u msec (%f msec/message)\n"),
               message,
               max_messages,
               tv.msec (),
@@ -322,8 +322,8 @@ receiver (void *arg)
   for (i = 0; i < max_messages; ++i)
     if (queue_wrapper->q_->dequeue_head (receive_block_p[i]) == -1)
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("%p\n"),
-                         ASYS_TEXT ("dequeue_head")),
+                         ACE_TEXT ("%p\n"),
+                         ACE_TEXT ("dequeue_head")),
                         0);
   timer->stop ();
 
@@ -349,8 +349,8 @@ sender (void *arg)
     if (queue_wrapper->q_->
         enqueue_tail (queue_wrapper->send_block_[i]) == -1)
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("%p\n"),
-                         ASYS_TEXT ("enqueue")),
+                         ACE_TEXT ("%p\n"),
+                         ACE_TEXT ("enqueue")),
                         0);
   return 0;
 }
@@ -360,8 +360,8 @@ int
 performance_test (int queue_type = 0)
 {
   Queue_Wrapper queue_wrapper;
-  const ASYS_TCHAR *message =
-    ASYS_TEXT ("ACE_Message_Queue<ACE_SYNCH>");
+  const ACE_TCHAR *message =
+    ACE_TEXT ("ACE_Message_Queue<ACE_SYNCH>");
   int i;
 
   // Create the messages.  Allocate off the heap in case messages is
@@ -400,7 +400,7 @@ performance_test (int queue_type = 0)
       ACE_NEW_RETURN (queue_wrapper.q_,
                       ACE_Message_Queue_NT,
                       -1);
-      message = ASYS_TEXT ("ACE_Message_Queue_NT");
+      message = ACE_TEXT ("ACE_Message_Queue_NT");
     }
 #endif /* VXWORKS */
 
@@ -408,22 +408,22 @@ performance_test (int queue_type = 0)
                                               &queue_wrapper,
                                               THR_BOUND) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("spawning sender thread")),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("spawning sender thread")),
                       -1);
 
   if (ACE_Thread_Manager::instance ()->spawn ((ACE_THR_FUNC) receiver,
                                               &queue_wrapper,
                                               THR_BOUND) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("spawning receiver thread")),
+                       ACE_TEXT ("%p\n"),
+                       ACE_TEXT ("spawning receiver thread")),
                       -1);
 
   ACE_Thread_Manager::instance ()->wait ();
   ACE_Time_Value tv;
   timer->elapsed_time (tv);
-  ACE_DEBUG ((LM_INFO, ASYS_TEXT ("%s: %u messages took %u msec (%f msec/message)\n"),
+  ACE_DEBUG ((LM_INFO, ACE_TEXT ("%s: %u messages took %u msec (%f msec/message)\n"),
               message,
               max_messages,
               tv.msec (),
@@ -442,16 +442,16 @@ performance_test (int queue_type = 0)
 #endif /* ACE_HAS_THREADS */
 
 int
-main (int argc, ASYS_TCHAR *argv[])
+main (int argc, ACE_TCHAR *argv[])
 {
-  ACE_START_TEST (ASYS_TEXT ("Message_Queue_Test"));
+  ACE_START_TEST (ACE_TEXT ("Message_Queue_Test"));
 
   int status = 0;
 
   if (argc == 2)
-    if (! ACE_OS::strcmp (argv[1], ASYS_TEXT ("-?")))
+    if (! ACE_OS::strcmp (argv[1], ACE_TEXT ("-?")))
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("%s/n"),
+                  ACE_TEXT ("%s/n"),
                   usage));
     else
       max_messages = ACE_OS::atoi (argv[1]);
@@ -459,23 +459,23 @@ main (int argc, ASYS_TCHAR *argv[])
   // Be sure that the a timed out get sets the error code properly.
   ACE_Message_Queue<ACE_SYNCH> q1;
   if (!q1.is_empty ()) {
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("New queue is not empty!\n")));
+    ACE_ERROR ((LM_ERROR, ACE_TEXT ("New queue is not empty!\n")));
     status = 1;
   }
   else {
     ACE_Message_Block *b;
     ACE_Time_Value tv (ACE_OS::gettimeofday());   // Now
     if (q1.dequeue_head (b, &tv) != -1) {
-      ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Dequeued from empty queue!\n")));
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Dequeued from empty queue!\n")));
       status = 1;
     }
     else if (errno != EWOULDBLOCK) {
-      ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"),
-                  ASYS_TEXT ("Dequeue timeout should be EWOULDBLOCK, got")));
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"),
+                  ACE_TEXT ("Dequeue timeout should be EWOULDBLOCK, got")));
       status = 1;
     }
     else {
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Timed dequeue test: OK\n")));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Timed dequeue test: OK\n")));
       status = 0;     // All is well
     }
   }
@@ -513,8 +513,8 @@ main (int argc, ASYS_TCHAR *argv[])
 
   if (status != 0)
     ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("test failed")));
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("test failed")));
   delete timer;
   timer = 0;