ChangeLogTag: Fri May 16 16:34:35 2003 Irfan Pyarali <irfan@oomworks.com>

3 files changed, 63 insertions, 56 deletions

diff --git a/ChangeLog b/ChangeLog
index 54837dc8930..35d6b189055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri May 16 16:34:35 2003  Irfan Pyarali  <irfan@oomworks.com>
+
+	* tests/MT_Reference_Counted_Event_Handler_Test.cpp:
+	* tests/Timer_Queue_Reference_Counting_Test.cpp (cancellation_test): 
+
+	  Fixed static array initialization warnings.	
+
 Thu May 15 19:46:49 2003  Irfan Pyarali  <irfan@oomworks.com>
 
 	* ACEXML/common/Mem_Map_Stream.cpp:
diff --git a/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/tests/MT_Reference_Counted_Event_Handler_Test.cpp
index c94b52c29e5..938669f403c 100644
--- a/tests/MT_Reference_Counted_Event_Handler_Test.cpp
+++ b/tests/MT_Reference_Counted_Event_Handler_Test.cpp
@@ -67,37 +67,37 @@ static int test_configs[][5] =
     // make_invocations, run_event_loop_thread, run_purger_thread, run_receiver_thread, nested_upcalls
     //
 
-    // 0, 0, 0, 0, 0, // At least one thread should be running.
-    // 0, 0, 0, 1, 0, // If event_loop_thread is not running and invocation_thread is not making invocations,
+    // { 0, 0, 0, 0, 0, }, // At least one thread should be running.
+    // { 0, 0, 0, 1, 0, }, // If event_loop_thread is not running and invocation_thread is not making invocations,
     // no thread will know that the socket is closed.
-    // 0, 0, 1, 0, 0, // If invocation_thread is not making invocations and if receiver is not threaded,
+    // { 0, 0, 1, 0, 0, }, // If invocation_thread is not making invocations and if receiver is not threaded,
     // we cannot decide which socket to close.
-    // 0, 0, 1, 1, 0, // If event_loop_thread is not running and invocation_thread is not making invocations,
+    // { 0, 0, 1, 1, 0, }, // If event_loop_thread is not running and invocation_thread is not making invocations,
     // no thread will know that the socket is closed.
-    // 0, 1, 0, 0, 0, // If invocation_thread is not making invocations and if receiver is not threaded,
+    // { 0, 1, 0, 0, 0, }, // If invocation_thread is not making invocations and if receiver is not threaded,
     // we cannot decide which socket to close.
-    0, 1, 0, 1, 0,
-    // 0, 1, 0, 1, 1, // No need for nested upcalls without invocations.
-    // 0, 1, 1, 0, 0, // If invocation_thread is not making invocations and if receiver is not threaded,
+    { 0, 1, 0, 1, 0, },
+    // { 0, 1, 0, 1, 1, }, // No need for nested upcalls without invocations.
+    // { 0, 1, 1, 0, 0, }, // If invocation_thread is not making invocations and if receiver is not threaded,
     // we cannot decide which socket to close.
-    0, 1, 1, 1, 0,
-    // 0, 1, 1, 1, 1, // No need for nested upcalls without invocations.
-    // 1, 0, 0, 0, 0, // If both event_loop_thread and receiver are not threaded,
+    { 0, 1, 1, 1, 0, },
+    // { 0, 1, 1, 1, 1, }, // No need for nested upcalls without invocations.
+    // { 1, 0, 0, 0, 0, }, // If both event_loop_thread and receiver are not threaded,
     // no thread can receive the messages.
-    1, 0, 0, 1, 0,
-    // 1, 0, 0, 1, 1, // No need for nested upcalls without event loop being used by the receiver.
-    // 1, 0, 1, 0, 0, // If both event_loop_thread and receiver are not threaded,
+    { 1, 0, 0, 1, 0, },
+    // { 1, 0, 0, 1, 1, }, // No need for nested upcalls without event loop being used by the receiver.
+    // { 1, 0, 1, 0, 0, }, // If both event_loop_thread and receiver are not threaded,
     // no thread can receive the messages.
-    1, 0, 1, 1, 0,
-    // 1, 0, 1, 1, 1, // No need for nested upcalls without event loop being used by the receiver.
-    1, 1, 0, 0, 0,
-    1, 1, 0, 0, 1,
-    1, 1, 0, 1, 0,
-    // 1, 1, 0, 1, 1, // No need for nested upcalls without event loop being used by the receiver.
-    1, 1, 1, 0, 0,
-    1, 1, 1, 0, 1,
-    1, 1, 1, 1, 0,
-    // 1, 1, 1, 1, 1, // No need for nested upcalls without event loop being used by the receiver.
+    { 1, 0, 1, 1, 0, },
+    // { 1, 0, 1, 1, 1, }, // No need for nested upcalls without event loop being used by the receiver.
+    { 1, 1, 0, 0, 0, },
+    { 1, 1, 0, 0, 1, },
+    { 1, 1, 0, 1, 0, },
+    // { 1, 1, 0, 1, 1, }, // No need for nested upcalls without event loop being used by the receiver.
+    { 1, 1, 1, 0, 0, },
+    { 1, 1, 1, 0, 1, },
+    { 1, 1, 1, 1, 0, },
+    // { 1, 1, 1, 1, 1, }, // No need for nested upcalls without event loop being used by the receiver.
   };
 
 /* Replication of the ACE_Pipe class.  Only difference is that this
diff --git a/tests/Timer_Queue_Reference_Counting_Test.cpp b/tests/Timer_Queue_Reference_Counting_Test.cpp
index 6b041dd3cbe..33db9d8a5fb 100644
--- a/tests/Timer_Queue_Reference_Counting_Test.cpp
+++ b/tests/Timer_Queue_Reference_Counting_Test.cpp
@@ -208,38 +208,38 @@ cancellation_test<TIMER_QUEUE>::cancellation_test (const char *timer_queue_type)
               timer_queue_type));
 
   int configs[][5] = {
-    0, 0, 0, 0, 0,
-    0, 0, 0, 0, 1,
-    0, 0, 0, 1, 0,
-    0, 0, 0, 1, 1,
-    0, 0, 1, 0, 0,
-    0, 0, 1, 0, 1,
-    0, 0, 1, 1, 0,
-    0, 0, 1, 1, 1,
-    0, 1, 0, 0, 0,
-    0, 1, 0, 0, 1,
-    0, 1, 0, 1, 0,
-    0, 1, 0, 1, 1,
-    0, 1, 1, 0, 0,
-    0, 1, 1, 0, 1,
-    0, 1, 1, 1, 0,
-    0, 1, 1, 1, 1,
-    1, 0, 0, 0, 0,
-    1, 0, 0, 0, 1,
-    1, 0, 0, 1, 0,
-    1, 0, 0, 1, 1,
-    1, 0, 1, 0, 0,
-    1, 0, 1, 0, 1,
-    1, 0, 1, 1, 0,
-    1, 0, 1, 1, 1,
-    1, 1, 0, 0, 0,
-    1, 1, 0, 0, 1,
-    1, 1, 0, 1, 0,
-    1, 1, 0, 1, 1,
-    1, 1, 1, 0, 0,
-    1, 1, 1, 0, 1,
-    1, 1, 1, 1, 0,
-    1, 1, 1, 1, 1,
+    { 0, 0, 0, 0, 0, },
+    { 0, 0, 0, 0, 1, },
+    { 0, 0, 0, 1, 0, },
+    { 0, 0, 0, 1, 1, },
+    { 0, 0, 1, 0, 0, },
+    { 0, 0, 1, 0, 1, },
+    { 0, 0, 1, 1, 0, },
+    { 0, 0, 1, 1, 1, },
+    { 0, 1, 0, 0, 0, },
+    { 0, 1, 0, 0, 1, },
+    { 0, 1, 0, 1, 0, },
+    { 0, 1, 0, 1, 1, },
+    { 0, 1, 1, 0, 0, },
+    { 0, 1, 1, 0, 1, },
+    { 0, 1, 1, 1, 0, },
+    { 0, 1, 1, 1, 1, },
+    { 1, 0, 0, 0, 0, },
+    { 1, 0, 0, 0, 1, },
+    { 1, 0, 0, 1, 0, },
+    { 1, 0, 0, 1, 1, },
+    { 1, 0, 1, 0, 0, },
+    { 1, 0, 1, 0, 1, },
+    { 1, 0, 1, 1, 0, },
+    { 1, 0, 1, 1, 1, },
+    { 1, 1, 0, 0, 0, },
+    { 1, 1, 0, 0, 1, },
+    { 1, 1, 0, 1, 0, },
+    { 1, 1, 0, 1, 1, },
+    { 1, 1, 1, 0, 0, },
+    { 1, 1, 1, 0, 1, },
+    { 1, 1, 1, 1, 0, },
+    { 1, 1, 1, 1, 1, },
   };
 
   for (int i = 0;