From 36daf707abd49a249046aa80a02ee0a3c3c53de0 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Wed, 24 Oct 2012 09:42:20 -0700
Subject: [PATCH] Bug 804872 - TestObserverArray.cpp shouldn't invoke macros
 with empty arguments.  This is a C99/C++11 extension, and this file isn't
 currently compiled as C++11.  r=dholbert

---
 xpcom/tests/TestObserverArray.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/xpcom/tests/TestObserverArray.cpp b/xpcom/tests/TestObserverArray.cpp
index 5404174603ff..8bf47aa2d91b 100644
--- a/xpcom/tests/TestObserverArray.cpp
+++ b/xpcom/tests/TestObserverArray.cpp
@@ -54,21 +54,21 @@ int main(int argc, char **argv)
 
   // Basic sanity
   static int test1Expected[] = { 3, 4 };
-  DO_TEST(ForwardIterator, test1Expected, );
+  DO_TEST(ForwardIterator, test1Expected, { /* nothing */ });
 
   // Appends
   static int test2Expected[] = { 3, 4, 2 };
   DO_TEST(ForwardIterator, test2Expected,
           if (count == 1) arr.AppendElement(2);
           );
-  DO_TEST(ForwardIterator, test2Expected, );
+  DO_TEST(ForwardIterator, test2Expected, { /* nothing */ });
 
   DO_TEST(EndLimitedIterator, test2Expected,
           if (count == 1) arr.AppendElement(5);
           );
 
   static int test5Expected[] = { 3, 4, 2, 5 };
-  DO_TEST(ForwardIterator, test5Expected, );
+  DO_TEST(ForwardIterator, test5Expected, { /* nothing */ });
 
   // Removals
   DO_TEST(ForwardIterator, test5Expected,
@@ -76,27 +76,27 @@ int main(int argc, char **argv)
           );
 
   static int test7Expected[] = { 4, 2, 5 };
-  DO_TEST(ForwardIterator, test7Expected, );
+  DO_TEST(ForwardIterator, test7Expected, { /* nothing */ });
 
   static int test8Expected[] = { 4, 5 };
   DO_TEST(ForwardIterator, test8Expected,
           if (count == 1) arr.RemoveElementAt(1);
           );
-  DO_TEST(ForwardIterator, test8Expected, );
+  DO_TEST(ForwardIterator, test8Expected, { /* nothing */ });
 
   arr.AppendElement(2);
   arr.AppendElementUnlessExists(6);
   static int test10Expected[] = { 4, 5, 2, 6 };
-  DO_TEST(ForwardIterator, test10Expected, );
+  DO_TEST(ForwardIterator, test10Expected, { /* nothing */ });
 
   arr.AppendElementUnlessExists(5);
-  DO_TEST(ForwardIterator, test10Expected, );
+  DO_TEST(ForwardIterator, test10Expected, { /* nothing */ });
 
   static int test12Expected[] = { 4, 5, 6 };
   DO_TEST(ForwardIterator, test12Expected,
           if (count == 1) arr.RemoveElementAt(2);
           );
-  DO_TEST(ForwardIterator, test12Expected, );
+  DO_TEST(ForwardIterator, test12Expected, { /* nothing */ });
 
   // Removals + Appends
   static int test14Expected[] = { 4, 6, 7 };
@@ -106,11 +106,11 @@ int main(int argc, char **argv)
             arr.AppendElement(7);
           }
           );
-  DO_TEST(ForwardIterator, test14Expected, );
+  DO_TEST(ForwardIterator, test14Expected, { /* nothing */ });
 
   arr.AppendElement(2);
   static int test16Expected[] = { 4, 6, 7, 2 };
-  DO_TEST(ForwardIterator, test16Expected, );
+  DO_TEST(ForwardIterator, test16Expected, { /* nothing */ });
 
   static int test17Expected[] = { 4, 7, 2 };
   DO_TEST(EndLimitedIterator, test17Expected,
@@ -121,15 +121,15 @@ int main(int argc, char **argv)
           );
 
   static int test18Expected[] = { 4, 7, 2, 8 };
-  DO_TEST(ForwardIterator, test18Expected, );
+  DO_TEST(ForwardIterator, test18Expected, { /* nothing */ });
 
   // Prepends
   arr.PrependElementUnlessExists(3);
   static int test19Expected[] = { 3, 4, 7, 2, 8 };
-  DO_TEST(ForwardIterator, test19Expected, );
+  DO_TEST(ForwardIterator, test19Expected, { /* nothing */ });
 
   arr.PrependElementUnlessExists(7);
-  DO_TEST(ForwardIterator, test19Expected, );
+  DO_TEST(ForwardIterator, test19Expected, { /* nothing */ });
 
   // Commented out because it fails; bug 474369 will fix
   /*  DO_TEST(ForwardIterator, test19Expected,
@@ -139,7 +139,7 @@ int main(int argc, char **argv)
           );
 
   static int test22Expected[] = { 9, 3, 4, 7, 2, 8 };
-  DO_TEST(ForwardIterator, test22Expected, );
+  DO_TEST(ForwardIterator, test22Expected, { });
   */
   
   return rv;