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

4 files changed, 16 insertions, 9 deletions

diff --git a/performance-tests/Misc/test_naming.cpp b/performance-tests/Misc/test_naming.cpp
index cad900da438..a7f3225a552 100644
--- a/performance-tests/Misc/test_naming.cpp
+++ b/performance-tests/Misc/test_naming.cpp
@@ -23,6 +23,8 @@
 
 ACE_RCSID(Misc, test_naming, "$Id$")
 
+#if defined (ACE_HAS_WCHAR)
+
 #define ACE_NS_MAX_ENTRIES 4000
 
 static char name[BUFSIZ];
@@ -164,9 +166,12 @@ void do_testing (int argc, char *argv[], int light)
               et.real_time, et.user_time, et.system_time));
 }
 
+#endif /* ACE_HAS_WCHAR */
+
 int
 main (int argc, char *argv[])
 {
+#if defined (ACE_HAS_WCHAR)
   // Do testing with SYNC on
   ACE_DEBUG ((LM_DEBUG, "SYNC is ON\n"));
   do_testing (argc, argv, 0);
@@ -174,6 +179,8 @@ main (int argc, char *argv[])
   // Do testing with SYNC off
   ACE_DEBUG ((LM_DEBUG, "SYNC is OFF\n"));
   do_testing (argc, argv, 1);
-
+#else /* ACE_HAS_WCHAR */
+  ACE_ERROR ((LM_INFO, "Naming isn't supported without wchar_t\n"));
+#endif /* ACE_HAS_WCHAR */
   return 0;
 }
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
index c607221fcf3..875f0bd2345 100644
--- a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
+++ b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
@@ -181,9 +181,9 @@ Leader_Follower_Task::svc (void)
 }
 
 static int
-parse_args (int argc, ASYS_TCHAR *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ASYS_TEXT ("m:s:w:b:t:d:"));
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("m:s:w:b:t:d:"));
   int c;
 
   while ((c = get_opt ()) != -1)
@@ -226,7 +226,7 @@ parse_args (int argc, ASYS_TCHAR *argv[])
 }
 
 int
-main (int argc, ASYS_TCHAR *argv[])
+main (int argc, ACE_TCHAR *argv[])
 {
   int result = parse_args (argc, argv);
   if (result != 0)
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
index b41f5e0a97a..81e8f006111 100644
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
@@ -223,9 +223,9 @@ IO_Task::svc (void)
 }
 
 static int
-parse_args (int argc, ASYS_TCHAR *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ASYS_TEXT ("m:s:w:b:t:d:"));
+  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("m:s:w:b:t:d:"));
   int c;
 
   while ((c = get_opt ()) != -1)
@@ -268,7 +268,7 @@ parse_args (int argc, ASYS_TCHAR *argv[])
 }
 
 int
-main (int argc, ASYS_TCHAR *argv[])
+main (int argc, ACE_TCHAR *argv[])
 {
   int result = parse_args (argc, argv);
   if (result != 0)
diff --git a/performance-tests/TCP/tcp_test.cpp b/performance-tests/TCP/tcp_test.cpp
index 86222eea2fa..a52483bd681 100644
--- a/performance-tests/TCP/tcp_test.cpp
+++ b/performance-tests/TCP/tcp_test.cpp
@@ -405,8 +405,8 @@ thread_pool_worker (void *)
     {
       if (ACE_Reactor::instance ()->handle_events () == -1)
         ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("(%t) %p\n"),
-                    ASYS_TEXT ("Error handling events")));
+                    ACE_TEXT ("(%t) %p\n"),
+                    ACE_TEXT ("Error handling events")));
     }
 
   return 0;