1 files changed, 12 insertions, 12 deletions

diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp
index c612e868b6f..cbc5ee7a35a 100644
--- a/tests/SV_Shared_Memory_Test.cpp
+++ b/tests/SV_Shared_Memory_Test.cpp
@@ -68,16 +68,16 @@ parent (char *shm)
     shm[i] = SHMDATA[i];
 
   if (mutex.release () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p"), ASYS_TEXT ("parent mutex.release")));
+    ACE_ERROR ((LM_ERROR, "(%P) %p", "parent mutex.release"));
   else if (synch.acquire () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p"), ASYS_TEXT ("parent synch.acquire")));
+    ACE_ERROR ((LM_ERROR, "(%P) %p", "parent synch.acquire"));
 
   if (myallocator ().remove () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"), ASYS_TEXT ("parent allocator.remove")));
+    ACE_ERROR ((LM_ERROR, "(%P) %p\n", "parent allocator.remove"));
   if (mutex.remove () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"), ASYS_TEXT ("parent mutex.remove")));
+    ACE_ERROR ((LM_ERROR, "(%P) %p\n", "parent mutex.remove"));
   if (synch.remove () == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("(%P) %p\n"), ASYS_TEXT ("parent synch.remove")));
+    ACE_ERROR ((LM_ERROR, "(%P) %p\n", "parent synch.remove"));
   return 0;
 }
 
@@ -102,15 +102,15 @@ child (char *shm)
   // semaphore wrappers.
   while (mutex.tryacquire () == -1)
     if (errno == EAGAIN)
-      ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P) spinning in child!\n")));
+      ACE_DEBUG ((LM_DEBUG, "(%P) spinning in child!\n"));
     else
-      ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P) child mutex.tryacquire")), 1);
+      ACE_ERROR_RETURN ((LM_ERROR, "(%P) child mutex.tryacquire"), 1);
 
   for (int i = 0; i < SHMSZ; i++)
     ACE_ASSERT (SHMDATA[i] == shm[i]);
 
   if (synch.release () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P) child synch.release")), 1);
+    ACE_ERROR_RETURN ((LM_ERROR, "(%P) child synch.release"), 1);
   return 0;
 }
 
@@ -127,9 +127,9 @@ template class ACE_Read_Guard<ACE_SV_Semaphore_Simple>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 #endif /* ACE_HAS_SYSV_IPC */
 int
-main (int, ASYS_TCHAR *[])
+main (int, char *[])
 {
-  ACE_START_TEST (ASYS_TEXT ("SV_Shared_Memory_Test"));
+  ACE_START_TEST ("SV_Shared_Memory_Test");
 
 #if defined (ACE_HAS_SYSV_IPC) && !defined (ACE_LACKS_FORK) && !defined(ACE_LACKS_SYSV_SHMEM)
   char *shm = (char *) myallocator ().malloc (27);
@@ -137,7 +137,7 @@ main (int, ASYS_TCHAR *[])
   switch (ACE_OS::fork ("SV_Shared_Memory_Test.cpp"))
     {
     case -1:
-      ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P) fork failed\n")), -1);
+      ACE_ERROR_RETURN ((LM_ERROR, "(%P) fork failed\n"), -1);
       /* NOTREACHED */
     case 0:
       child (shm);
@@ -148,7 +148,7 @@ main (int, ASYS_TCHAR *[])
     }
 #else
   ACE_ERROR ((LM_INFO,
-              ASYS_TEXT ("SYSV IPC, SYSV SHMEM, or fork are not supported on this platform\n")));
+              "SYSV IPC, SYSV SHMEM, or fork are not supported on this platform\n"));
 #endif /* ACE_HAS_SYSV_IPC */
   ACE_END_TEST;
   return 0;