foo

26 files changed, 37 insertions, 33 deletions

diff --git a/tests/Barrier_Test.cpp b/tests/Barrier_Test.cpp
index 37e779181a7..be44b998f84 100644
--- a/tests/Barrier_Test.cpp
+++ b/tests/Barrier_Test.cpp
@@ -66,7 +66,7 @@ tester (Tester_Args *args)
 #endif /* ACE_HAS_THREADS */
 
 int 
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("Barrier_Test");
 
diff --git a/tests/Buffer_Stream_Test.cpp b/tests/Buffer_Stream_Test.cpp
index f08b3c4691e..bce8c31b266 100644
--- a/tests/Buffer_Stream_Test.cpp
+++ b/tests/Buffer_Stream_Test.cpp
@@ -197,7 +197,7 @@ Consumer::svc (void)
 // Main driver function.
 
 int 
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("Buffer_Stream_Test");
 
diff --git a/tests/CPP_Test.cpp b/tests/CPP_Test.cpp
index fed43aaa5b2..4c0bd291a50 100644
--- a/tests/CPP_Test.cpp
+++ b/tests/CPP_Test.cpp
@@ -250,7 +250,7 @@ spawn (void)
 }
 
 int
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("CPP_Test");
 
diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp
index 5357ee597bc..00ed154ebbf 100644
--- a/tests/Future_Test.cpp
+++ b/tests/Future_Test.cpp
@@ -311,7 +311,7 @@ template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>;
 #endif /* ACE_HAS_THREADS */
 
 int
-main (int, char *argv[]) 
+main (int, char *[]) 
 {
   ACE_START_TEST ("Future_Test");
 
diff --git a/tests/Handle_Set_Test.cpp b/tests/Handle_Set_Test.cpp
index d8803dfb137..ef0ec5ffe17 100644
--- a/tests/Handle_Set_Test.cpp
+++ b/tests/Handle_Set_Test.cpp
@@ -65,7 +65,7 @@ run_test (int count)
 }
 
 int
-main (int argc, char *argv[])
+main (int argc, char *[])
 {
   ACE_START_TEST ("Handle_Set_Test");
 
diff --git a/tests/MM_Shared_Memory_Test.cpp b/tests/MM_Shared_Memory_Test.cpp
index 0f8e38a9da5..aacbfd3137b 100644
--- a/tests/MM_Shared_Memory_Test.cpp
+++ b/tests/MM_Shared_Memory_Test.cpp
@@ -120,7 +120,7 @@ spawn (void)
 }
 
 int
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("MM_Shared_Memory_Test");
 
diff --git a/tests/Map_Manager_Test.cpp b/tests/Map_Manager_Test.cpp
index 51f4f8dc193..e059b2bcb9b 100644
--- a/tests/Map_Manager_Test.cpp
+++ b/tests/Map_Manager_Test.cpp
@@ -31,7 +31,7 @@ typedef ACE_Map_Reverse_Iterator <KEY, VALUE, MUTEX> REVERSE_ITERATOR;
 typedef ACE_Map_Entry <KEY, VALUE> ENTRY;
 
 int 
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("Map_Manager_Test");
 
diff --git a/tests/Mem_Map_Test.cpp b/tests/Mem_Map_Test.cpp
index 4f5216c4d97..3054d4208ad 100644
--- a/tests/Mem_Map_Test.cpp
+++ b/tests/Mem_Map_Test.cpp
@@ -91,7 +91,7 @@ create_test_file (int size, int num_lines)
 }
 
 int
-main (int, char **argv)
+main (int, char *[])
 {
   ACE_START_TEST ("Mem_Map_Test");
 
diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp
index 4daee69cb9a..fcff279346d 100644
--- a/tests/Message_Queue_Test.cpp
+++ b/tests/Message_Queue_Test.cpp
@@ -26,7 +26,7 @@ typedef ACE_Message_Queue_Iterator <ACE_NULL_SYNCH> ITERATOR;
 typedef ACE_Message_Queue_Reverse_Iterator <ACE_NULL_SYNCH> REVERSE_ITERATOR;
 
 int 
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("Message_Queue_Test");
 
diff --git a/tests/Mutex_Test.cpp b/tests/Mutex_Test.cpp
index 518b957fb40..7bdc4acbe84 100644
--- a/tests/Mutex_Test.cpp
+++ b/tests/Mutex_Test.cpp
@@ -103,7 +103,7 @@ spawn (void)
 }
 
 int
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("Mutex_Test");
 
diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp
index 80a04f8c474..efd9edfd906 100644
--- a/tests/Pipe_Test.cpp
+++ b/tests/Pipe_Test.cpp
@@ -45,10 +45,10 @@ parse_args (int argc, char *argv[])
     switch (c)
     {
     case 'd':
-      ::close_pipe = 0;
+      close_pipe = 0;
       break;
     case 'c':
-      ::child_process = 1;
+      child_process = 1;
       break;
     default:
       print_usage_and_die ();
@@ -65,15 +65,15 @@ open (ACE_Pipe &pipe,
   ACE_ASSERT (pipe.read_handle () != ACE_INVALID_HANDLE
 	      && pipe.write_handle () != ACE_INVALID_HANDLE);
 
-  if (::close_pipe)
+  if (close_pipe)
     pipe.close ();
 }
 
 int 
 main (int argc, char *argv[])
 {
-  ::parse_args (argc, argv);
-  if (::child_process)
+  parse_args (argc, argv);
+  if (child_process)
     {      
       ACE_APPEND_LOG ("Pipe_Test-children");      
       ACE_Pipe a, b, c, d, e;
@@ -94,7 +94,7 @@ main (int argc, char *argv[])
       char *s_argv[4];
       s_argv[0] = "Pipe_Test" ACE_PLATFORM_EXE_SUFFIX;
       s_argv[1] = "-c"; // child/slave process
-      if (::close_pipe == 0)	
+      if (close_pipe == 0)	
 	s_argv[2] = "-d";
       else
 	s_argv[2] = 0;
diff --git a/tests/Priority_Buffer_Test.cpp b/tests/Priority_Buffer_Test.cpp
index fd20df7937c..d947b0c7da6 100644
--- a/tests/Priority_Buffer_Test.cpp
+++ b/tests/Priority_Buffer_Test.cpp
@@ -135,7 +135,7 @@ producer (void *args)
 // size of each line.
 
 int 
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("Priority_Buffer_Test");
 
diff --git a/tests/Reactor_Timer_Test.cpp b/tests/Reactor_Timer_Test.cpp
index ff5d6b9938e..4f843c77c37 100644
--- a/tests/Reactor_Timer_Test.cpp
+++ b/tests/Reactor_Timer_Test.cpp
@@ -50,7 +50,7 @@ public:
 };
 
 int
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("Reactor_Timer_Test");
 
diff --git a/tests/Reactors_Test.cpp b/tests/Reactors_Test.cpp
index b2780d94a04..8bad943910d 100644
--- a/tests/Reactors_Test.cpp
+++ b/tests/Reactors_Test.cpp
@@ -177,7 +177,7 @@ template class ACE_Atomic_Op<ACE_Thread_Mutex, u_long>;
 #endif /* ACE_HAS_THREADS */
 
 int 
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("Reactors_Test");
 
diff --git a/tests/Recursive_Mutex_Test.cpp b/tests/Recursive_Mutex_Test.cpp
index d626899ff29..14975dc3c99 100644
--- a/tests/Recursive_Mutex_Test.cpp
+++ b/tests/Recursive_Mutex_Test.cpp
@@ -64,7 +64,7 @@ worker (void *arg)
 #endif /* ACE_HAS_THREADS */
 
 int
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("Recursive_Mutex_Test");
 
diff --git a/tests/SPIPE_Test.cpp b/tests/SPIPE_Test.cpp
index 47249caebeb..c1f8c287b92 100644
--- a/tests/SPIPE_Test.cpp
+++ b/tests/SPIPE_Test.cpp
@@ -134,7 +134,7 @@ spawn (void)
 }
 
 int
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("SPIPE_Test");
 
diff --git a/tests/SString_Test.cpp b/tests/SString_Test.cpp
index f9b5df0f405..2f5e9598e03 100644
--- a/tests/SString_Test.cpp
+++ b/tests/SString_Test.cpp
@@ -22,7 +22,7 @@
 #include "test_config.h"
 
 int 
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("SString_Test");
 
diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp
index 594918ef216..54ca146294f 100644
--- a/tests/SV_Shared_Memory_Test.cpp
+++ b/tests/SV_Shared_Memory_Test.cpp
@@ -95,7 +95,7 @@ child (char *shm)
 #endif /* ACE_HAS_SYSV_IPC */
 
 int
-main (int, char * /* argv */[])
+main (int, char *[])
 {
   ACE_START_TEST ("SV_Shared_Memory_Test");
 
diff --git a/tests/TSS_Test.cpp b/tests/TSS_Test.cpp
index 5efd91cf7ce..0642f84e2ba 100644
--- a/tests/TSS_Test.cpp
+++ b/tests/TSS_Test.cpp
@@ -22,10 +22,10 @@
 
 #include "ace/Service_Config.h"
 #include "ace/Synch.h"
-
 #include "test_config.h"
 
-#if defined (ACE_HAS_THREADS)
+#if defined (ACE_HAS_THREADS) 
+#if !defined (ACE_TEMPLATES_REQUIRE_PRAGMA) // AIX is evil
 
 static const int ITERATIONS = 100;
 
@@ -193,10 +193,11 @@ handler (int signum)
 template class ACE_TSS<Errno>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
 
+#endif /* !ACE_TEMPLATES_REQUIRE_PRAGMA */
 #endif /* ACE_HAS_THREADS */
 
 int 
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("TSS_Test");
   
@@ -213,6 +214,9 @@ main (int, char *argv[])
     ACE_OS::perror ("ACE_Thread_Manager::spawn_n");
 
   ACE_Service_Config::thr_mgr ()->wait ();
+#elif defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+  ACE_ERROR ((LM_ERROR, 
+	      "This platform has an evil template instantiation mechanism...\n"));
 #else
   ACE_ERROR ((LM_ERROR, 
 	      "threads are not supported on this platform\n"));
diff --git a/tests/Task_Test.cpp b/tests/Task_Test.cpp
index 57bbc72eec9..be1256c3023 100644
--- a/tests/Task_Test.cpp
+++ b/tests/Task_Test.cpp
@@ -91,7 +91,7 @@ Barrier_Task::svc (void)
 #endif /* ACE_HAS_THREADS */
 
 int 
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("Task_Test");
 
diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp
index a61f92b22eb..8d7c654c4a3 100644
--- a/tests/Thread_Pool_Test.cpp
+++ b/tests/Thread_Pool_Test.cpp
@@ -190,7 +190,7 @@ produce (Thread_Pool &thread_pool)
 #endif /* ACE_HAS_THREADS */
 
 int 
-main (int argc, char *argv[])
+main (int argc, char *[])
 {
   ACE_START_TEST ("Thread_Pool_Test");
 #if defined (ACE_HAS_THREADS)
diff --git a/tests/Time_Service_Test.cpp b/tests/Time_Service_Test.cpp
index f83c14f4429..d26eb9fb83c 100644
--- a/tests/Time_Service_Test.cpp
+++ b/tests/Time_Service_Test.cpp
@@ -27,7 +27,7 @@
 #include "ace/Process.h"
 
 int
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("Time_Service_Test");
 
diff --git a/tests/Time_Value_Test.cpp b/tests/Time_Value_Test.cpp
index fcce2d43f6f..74488ead5e3 100644
--- a/tests/Time_Value_Test.cpp
+++ b/tests/Time_Value_Test.cpp
@@ -22,7 +22,7 @@
 #include "test_config.h"
 
 int
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("Time_Value_Test");
 
diff --git a/tests/Timer_Queue_Test.cpp b/tests/Timer_Queue_Test.cpp
index f305fcf45a0..f0ec1c90815 100644
--- a/tests/Timer_Queue_Test.cpp
+++ b/tests/Timer_Queue_Test.cpp
@@ -35,7 +35,7 @@ public:
 };
 
 int
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("Timer_Queue_Test");
 
diff --git a/tests/Tokens_Test.cpp b/tests/Tokens_Test.cpp
index f5592e76e20..5e22c657c1f 100644
--- a/tests/Tokens_Test.cpp
+++ b/tests/Tokens_Test.cpp
@@ -175,7 +175,7 @@ run_test (ACE_Token_Proxy *A,
 #endif /* ACE_HAS_THREADS */
 
 int
-main (int, char* argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("Tokens_Test");
 #if defined (ACE_HAS_THREADS)
diff --git a/tests/UPIPE_SAP_Test.cpp b/tests/UPIPE_SAP_Test.cpp
index 07a2800fe3c..7d43ced4f12 100644
--- a/tests/UPIPE_SAP_Test.cpp
+++ b/tests/UPIPE_SAP_Test.cpp
@@ -152,7 +152,7 @@ acceptor (void *args)
 #endif /* ACE_HAS_THREADS */
 
 int 
-main (int, char *argv[])
+main (int, char *[])
 {
   ACE_START_TEST ("UPIPE_SAP_Test");