Fix warnings in array and assoc containers

llvm-svn: 242629
diff --git a/libcxx/test/std/containers/sequences/array/indexing.pass.cpp b/libcxx/test/std/containers/sequences/array/indexing.pass.cpp
index e4dda0d..c550d14 100644
--- a/libcxx/test/std/containers/sequences/array/indexing.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/indexing.pass.cpp
@@ -17,6 +17,10 @@
 #include <array>
 #include <cassert>
 
+#include "test_macros.h"
+
+#include "suppress_array_warnings.h"
+
 int main()
 {
     {
@@ -42,13 +46,13 @@
         C::const_reference r2 = c[2];
         assert(r2 == 3.5);
     }
-    
-#if _LIBCPP_STD_VER > 11 
+
+#if TEST_STD_VER > 11
     {
         typedef double T;
         typedef std::array<T, 3> C;
         constexpr C c = {1, 2, 3.5};
-        
+
         constexpr T t1 = c[0];
         static_assert (t1 == 1, "");