Update the array tests to not use a local type; removes warnings in C++03. NFC

llvm-svn: 344417

diff --git a/libcxx/test/std/containers/sequences/array/array.data/data.pass.cpp b/libcxx/test/std/containers/sequences/array/array.data/data.pass.cpp
index 7148943..593df3c 100644 (file)
--- a/libcxx/test/std/containers/sequences/array/array.data/data.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/array.data/data.pass.cpp
@@ -19,6 +19,11 @@
 // Disable the missing braces warning for this reason.
 #include "disable_missing_braces_warning.h"
 
+struct NoDefault {
+  NoDefault(int) {}
+};
+
+
 int main()
 {
     {
@@ -55,9 +60,6 @@ int main()
       assert(pint % TEST_ALIGNOF(std::max_align_t) == 0);
     }
     {
-      struct NoDefault {
-        NoDefault(int) {}
-      };
       typedef NoDefault T;
       typedef std::array<T, 0> C;
       C c = {};

diff --git a/libcxx/test/std/containers/sequences/array/array.data/data_const.pass.cpp b/libcxx/test/std/containers/sequences/array/array.data/data_const.pass.cpp
index b99bf6a..e3d9a69 100644 (file)
--- a/libcxx/test/std/containers/sequences/array/array.data/data_const.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/array.data/data_const.pass.cpp
@@ -20,6 +20,10 @@
 // Disable the missing braces warning for this reason.
 #include "disable_missing_braces_warning.h"
 
+struct NoDefault {
+  NoDefault(int) {}
+};
+
 int main()
 {
     {
@@ -39,9 +43,6 @@ int main()
         (void)p; // to placate scan-build
     }
     {
-      struct NoDefault {
-        NoDefault(int) {}
-      };
       typedef NoDefault T;
       typedef std::array<T, 0> C;
       const C c = {};

diff --git a/libcxx/test/std/containers/sequences/array/begin.pass.cpp b/libcxx/test/std/containers/sequences/array/begin.pass.cpp
index 282a947..1c76472 100644 (file)
--- a/libcxx/test/std/containers/sequences/array/begin.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/begin.pass.cpp
@@ -18,6 +18,10 @@
 // Disable the missing braces warning for this reason.
 #include "disable_missing_braces_warning.h"
 
+struct NoDefault {
+  NoDefault(int) {}
+};
+
 
 int main()
 {
@@ -33,9 +37,6 @@ int main()
         assert(c[0] == 5.5);
     }
     {
-      struct NoDefault {
-        NoDefault(int) {}
-      };
       typedef NoDefault T;
       typedef std::array<T, 0> C;
       C c = {};