From 7f9cc52faf7aa2bb1dc9e3affe6a40b6fecb0e6c Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Tue, 10 Feb 2015 16:51:29 +0000
Subject: [PATCH] Remove use of zero length arrays in tests. Get tests passing
 with -pedantic-errors

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@228706 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../map/map.special/member_swap.pass.cpp      | 43 ++++---------------
 .../map/map.special/non_member_swap.pass.cpp  | 43 ++++---------------
 .../multimap.special/member_swap.pass.cpp     | 40 ++++-------------
 .../multimap.special/non_member_swap.pass.cpp | 40 ++++-------------
 .../multiset.special/member_swap.pass.cpp     | 40 ++++-------------
 .../multiset.special/non_member_swap.pass.cpp | 20 ++-------
 .../set/set.special/member_swap.pass.cpp      | 40 ++++-------------
 .../set/set.special/non_member_swap.pass.cpp  | 20 ++-------
 8 files changed, 58 insertions(+), 228 deletions(-)

diff --git a/test/std/containers/associative/map/map.special/member_swap.pass.cpp b/test/std/containers/associative/map/map.special/member_swap.pass.cpp
index 4f7bd5154..7c3ad9d50 100644
--- a/test/std/containers/associative/map/map.special/member_swap.pass.cpp
+++ b/test/std/containers/associative/map/map.special/member_swap.pass.cpp
@@ -20,18 +20,12 @@
 
 int main()
 {
-    {
     typedef std::pair<const int, double> V;
+    {
     typedef std::map<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);
@@ -110,17 +98,10 @@ int main()
     }
 #if __cplusplus >= 201103L
     {
-    typedef std::pair<const int, double> V;
     typedef std::map<int, double, std::less<int>, min_allocator<V>> 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);
@@ -128,9 +109,6 @@ int main()
         assert(m2 == m1_save);
     }
     {
-        V ar1[] =
-        {
-        };
         V ar2[] =
         {
             V(5, 5),
@@ -142,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;
@@ -158,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);
diff --git a/test/std/containers/associative/map/map.special/non_member_swap.pass.cpp b/test/std/containers/associative/map/map.special/non_member_swap.pass.cpp
index 57588e6ff..b042a4878 100644
--- a/test/std/containers/associative/map/map.special/non_member_swap.pass.cpp
+++ b/test/std/containers/associative/map/map.special/non_member_swap.pass.cpp
@@ -23,18 +23,12 @@
 
 int main()
 {
-    {
     typedef std::pair<const int, double> V;
+    {
     typedef std::map<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;
         swap(m1, m2);
@@ -42,9 +36,6 @@ int main()
         assert(m2 == m1_save);
     }
     {
-        V ar1[] =
-        {
-        };
         V ar2[] =
         {
             V(5, 5),
@@ -56,7 +47,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;
@@ -72,11 +63,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;
         swap(m1, m2);
@@ -181,17 +169,10 @@ int main()
     }
 #if __cplusplus >= 201103L
     {
-    typedef std::pair<const int, double> V;
     typedef std::map<int, double, std::less<int>, min_allocator<V>> 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;
         swap(m1, m2);
@@ -199,9 +180,6 @@ int main()
         assert(m2 == m1_save);
     }
     {
-        V ar1[] =
-        {
-        };
         V ar2[] =
         {
             V(5, 5),
@@ -213,7 +191,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;
@@ -229,11 +207,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;
         swap(m1, m2);
diff --git a/test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp b/test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp
index c8f30aa7c..fb17e7340 100644
--- a/test/std/containers/associative/multimap/multimap.special/member_swap.pass.cpp
+++ b/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);
diff --git a/test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp b/test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
index effec2be0..a91dfebb1 100644
--- a/test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
+++ b/test/std/containers/associative/multimap/multimap.special/non_member_swap.pass.cpp
@@ -27,14 +27,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;
         swap(m1, m2);
@@ -42,9 +36,6 @@ int main()
         assert(m2 == m1_save);
     }
     {
-        V ar1[] =
-        {
-        };
         V ar2[] =
         {
             V(5, 5),
@@ -56,7 +47,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;
@@ -72,11 +63,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;
         swap(m1, m2);
@@ -183,14 +171,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;
         swap(m1, m2);
@@ -198,9 +180,6 @@ int main()
         assert(m2 == m1_save);
     }
     {
-        V ar1[] =
-        {
-        };
         V ar2[] =
         {
             V(5, 5),
@@ -212,7 +191,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;
@@ -228,11 +207,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;
         swap(m1, m2);
diff --git a/test/std/containers/associative/multiset/multiset.special/member_swap.pass.cpp b/test/std/containers/associative/multiset/multiset.special/member_swap.pass.cpp
index ce906896b..7745ddab7 100644
--- a/test/std/containers/associative/multiset/multiset.special/member_swap.pass.cpp
+++ b/test/std/containers/associative/multiset/multiset.special/member_swap.pass.cpp
@@ -24,14 +24,8 @@ int main()
     typedef int V;
     typedef std::multiset<int> 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[] =
         {
             5,
@@ -53,7 +44,7 @@ int main()
             11,
             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()
             3,
             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);
@@ -113,14 +101,8 @@ int main()
     typedef int V;
     typedef std::multiset<int, std::less<int>, min_allocator<int>> 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);
@@ -128,9 +110,6 @@ int main()
         assert(m2 == m1_save);
     }
     {
-        V ar1[] =
-        {
-        };
         V ar2[] =
         {
             5,
@@ -142,7 +121,7 @@ int main()
             11,
             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;
@@ -158,11 +137,8 @@ int main()
             3,
             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);
diff --git a/test/std/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp b/test/std/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
index 222985a08..f456de7f6 100644
--- a/test/std/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
+++ b/test/std/containers/associative/multiset/multiset.special/non_member_swap.pass.cpp
@@ -23,14 +23,8 @@ int main()
     typedef int V;
     typedef std::multiset<int> 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;
         swap(m1, m2);
@@ -38,9 +32,6 @@ int main()
         assert(m2 == m1_save);
     }
     {
-        V ar1[] =
-        {
-        };
         V ar2[] =
         {
             5,
@@ -52,7 +43,7 @@ int main()
             11,
             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;
@@ -68,11 +59,8 @@ int main()
             3,
             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;
         swap(m1, m2);
diff --git a/test/std/containers/associative/set/set.special/member_swap.pass.cpp b/test/std/containers/associative/set/set.special/member_swap.pass.cpp
index f72abd7eb..b5129f880 100644
--- a/test/std/containers/associative/set/set.special/member_swap.pass.cpp
+++ b/test/std/containers/associative/set/set.special/member_swap.pass.cpp
@@ -24,14 +24,8 @@ int main()
     typedef int V;
     typedef std::set<int> 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[] =
         {
             5,
@@ -53,7 +44,7 @@ int main()
             11,
             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()
             3,
             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);
@@ -113,14 +101,8 @@ int main()
     typedef int V;
     typedef std::set<int, std::less<int>, min_allocator<int>> 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);
@@ -128,9 +110,6 @@ int main()
         assert(m2 == m1_save);
     }
     {
-        V ar1[] =
-        {
-        };
         V ar2[] =
         {
             5,
@@ -142,7 +121,7 @@ int main()
             11,
             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;
@@ -158,11 +137,8 @@ int main()
             3,
             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);
diff --git a/test/std/containers/associative/set/set.special/non_member_swap.pass.cpp b/test/std/containers/associative/set/set.special/non_member_swap.pass.cpp
index c9cffc68a..0ac14464c 100644
--- a/test/std/containers/associative/set/set.special/non_member_swap.pass.cpp
+++ b/test/std/containers/associative/set/set.special/non_member_swap.pass.cpp
@@ -23,14 +23,8 @@ int main()
     typedef int V;
     typedef std::set<int> 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;
         swap(m1, m2);
@@ -38,9 +32,6 @@ int main()
         assert(m2 == m1_save);
     }
     {
-        V ar1[] =
-        {
-        };
         V ar2[] =
         {
             5,
@@ -52,7 +43,7 @@ int main()
             11,
             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;
@@ -68,11 +59,8 @@ int main()
             3,
             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;
         swap(m1, m2);