Remove use of zero length arrays in tests. Get tests passing with -pedantic-errors

llvm-svn: 228706

1 files changed, 8 insertions, 32 deletions

diff --git a/libcxx/test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp
index c8f30aa7c71..fb17e7340bd 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp
@@ -24,14 +24,8 @@ int main()
     {
     typedef std::multimap<int, double> M;
     {
-        V ar1[] =
-        {
-        };
-        V ar2[] =
-        {
-        };
-        M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
-        M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
+        M m1;
+        M m2;
         M m1_save = m1;
         M m2_save = m2;
         m1.swap(m2);
@@ -39,9 +33,6 @@ int main()
         assert(m2 == m1_save);
     }
     {
-        V ar1[] =
-        {
-        };
         V ar2[] =
         {
             V(5, 5),
@@ -53,7 +44,7 @@ int main()
             V(11, 11),
             V(12, 12)
         };
-        M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
+        M m1;
         M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
         M m1_save = m1;
         M m2_save = m2;
@@ -69,11 +60,8 @@ int main()
             V(3, 3),
             V(4, 4)
         };
-        V ar2[] =
-        {
-        };
         M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
-        M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
+        M m2;
         M m1_save = m1;
         M m2_save = m2;
         m1.swap(m2);
@@ -112,14 +100,8 @@ int main()
     {
     typedef std::multimap<int, double, std::less<int>, min_allocator<std::pair<const int, double>>> M;
     {
-        V ar1[] =
-        {
-        };
-        V ar2[] =
-        {
-        };
-        M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
-        M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
+        M m1;
+        M m2;
         M m1_save = m1;
         M m2_save = m2;
         m1.swap(m2);
@@ -127,9 +109,6 @@ int main()
         assert(m2 == m1_save);
     }
     {
-        V ar1[] =
-        {
-        };
         V ar2[] =
         {
             V(5, 5),
@@ -141,7 +120,7 @@ int main()
             V(11, 11),
             V(12, 12)
         };
-        M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
+        M m1;
         M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
         M m1_save = m1;
         M m2_save = m2;
@@ -157,11 +136,8 @@ int main()
             V(3, 3),
             V(4, 4)
         };
-        V ar2[] =
-        {
-        };
         M m1(ar1, ar1+sizeof(ar1)/sizeof(ar1[0]));
-        M m2(ar2, ar2+sizeof(ar2)/sizeof(ar2[0]));
+        M m2;
         M m1_save = m1;
         M m2_save = m2;
         m1.swap(m2);