summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/containers/sequences/array/array.tuple
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test/std/containers/sequences/array/array.tuple')
-rw-r--r--libcxx/test/std/containers/sequences/array/array.tuple/get.fail.cpp5
-rw-r--r--libcxx/test/std/containers/sequences/array/array.tuple/get.pass.cpp4
-rw-r--r--libcxx/test/std/containers/sequences/array/array.tuple/get_const.pass.cpp4
-rw-r--r--libcxx/test/std/containers/sequences/array/array.tuple/get_rv.pass.cpp4
4 files changed, 13 insertions, 4 deletions
diff --git a/libcxx/test/std/containers/sequences/array/array.tuple/get.fail.cpp b/libcxx/test/std/containers/sequences/array/array.tuple/get.fail.cpp
index 6b2385da065..13323dd8e51 100644
--- a/libcxx/test/std/containers/sequences/array/array.tuple/get.fail.cpp
+++ b/libcxx/test/std/containers/sequences/array/array.tuple/get.fail.cpp
@@ -20,7 +20,10 @@
#include <cassert>
#include "test_macros.h"
-#include "../suppress_array_warnings.h"
+
+// std::array is explicitly allowed to be initialized with A a = { init-list };.
+// Disable the missing braces warning for this reason.
+#include "disable_missing_braces_warning.h"
int main()
{
diff --git a/libcxx/test/std/containers/sequences/array/array.tuple/get.pass.cpp b/libcxx/test/std/containers/sequences/array/array.tuple/get.pass.cpp
index c4557078fc4..4f210c4f762 100644
--- a/libcxx/test/std/containers/sequences/array/array.tuple/get.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/array.tuple/get.pass.cpp
@@ -16,7 +16,9 @@
#include "test_macros.h"
-#include "../suppress_array_warnings.h"
+// std::array is explicitly allowed to be initialized with A a = { init-list };.
+// Disable the missing braces warning for this reason.
+#include "disable_missing_braces_warning.h"
#if TEST_STD_VER > 11
diff --git a/libcxx/test/std/containers/sequences/array/array.tuple/get_const.pass.cpp b/libcxx/test/std/containers/sequences/array/array.tuple/get_const.pass.cpp
index ddc2ab2855c..04606bf6cf7 100644
--- a/libcxx/test/std/containers/sequences/array/array.tuple/get_const.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/array.tuple/get_const.pass.cpp
@@ -16,7 +16,9 @@
#include "test_macros.h"
-#include "../suppress_array_warnings.h"
+// std::array is explicitly allowed to be initialized with A a = { init-list };.
+// Disable the missing braces warning for this reason.
+#include "disable_missing_braces_warning.h"
int main()
{
diff --git a/libcxx/test/std/containers/sequences/array/array.tuple/get_rv.pass.cpp b/libcxx/test/std/containers/sequences/array/array.tuple/get_rv.pass.cpp
index 412c7c78aa8..72ef49b157f 100644
--- a/libcxx/test/std/containers/sequences/array/array.tuple/get_rv.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/array.tuple/get_rv.pass.cpp
@@ -18,7 +18,9 @@
#include <utility>
#include <cassert>
-#include "../suppress_array_warnings.h"
+// std::array is explicitly allowed to be initialized with A a = { init-list };.
+// Disable the missing braces warning for this reason.
+#include "disable_missing_braces_warning.h"
int main()
{
OpenPOWER on IntegriCloud