diff options
19 files changed, 62 insertions, 18 deletions
diff --git a/libcxx/test/std/containers/sequences/array/array.cons/initializer_list.pass.cpp b/libcxx/test/std/containers/sequences/array/array.cons/initializer_list.pass.cpp index 34db59de5e2..5e429adb6fc 100644 --- a/libcxx/test/std/containers/sequences/array/array.cons/initializer_list.pass.cpp +++ b/libcxx/test/std/containers/sequences/array/array.cons/initializer_list.pass.cpp @@ -14,7 +14,9 @@ #include <array> #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() { 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 80b7d0636fe..d7aed70c98a 100644 --- a/libcxx/test/std/containers/sequences/array/array.data/data.pass.cpp +++ b/libcxx/test/std/containers/sequences/array/array.data/data.pass.cpp @@ -14,7 +14,9 @@ #include <array> #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() { 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 1c9abdd0893..58840e94089 100644 --- 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 @@ -14,7 +14,9 @@ #include <array> #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() { diff --git a/libcxx/test/std/containers/sequences/array/array.fill/fill.pass.cpp b/libcxx/test/std/containers/sequences/array/array.fill/fill.pass.cpp index f98dbbda557..5bc42ceb89f 100644 --- a/libcxx/test/std/containers/sequences/array/array.fill/fill.pass.cpp +++ b/libcxx/test/std/containers/sequences/array/array.fill/fill.pass.cpp @@ -14,7 +14,9 @@ #include <array> #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() { diff --git a/libcxx/test/std/containers/sequences/array/array.size/size.pass.cpp b/libcxx/test/std/containers/sequences/array/array.size/size.pass.cpp index 89b893afd82..a833fdc0471 100644 --- a/libcxx/test/std/containers/sequences/array/array.size/size.pass.cpp +++ b/libcxx/test/std/containers/sequences/array/array.size/size.pass.cpp @@ -14,7 +14,9 @@ #include <array> #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() { diff --git a/libcxx/test/std/containers/sequences/array/array.special/swap.pass.cpp b/libcxx/test/std/containers/sequences/array/array.special/swap.pass.cpp index 82ce904db71..c1b0b235ab3 100644 --- a/libcxx/test/std/containers/sequences/array/array.special/swap.pass.cpp +++ b/libcxx/test/std/containers/sequences/array/array.special/swap.pass.cpp @@ -14,7 +14,9 @@ #include <array> #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() { diff --git a/libcxx/test/std/containers/sequences/array/array.swap/swap.pass.cpp b/libcxx/test/std/containers/sequences/array/array.swap/swap.pass.cpp index 22bf6579914..651798e1e79 100644 --- a/libcxx/test/std/containers/sequences/array/array.swap/swap.pass.cpp +++ b/libcxx/test/std/containers/sequences/array/array.swap/swap.pass.cpp @@ -14,7 +14,9 @@ #include <array> #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() { 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() { diff --git a/libcxx/test/std/containers/sequences/array/at.pass.cpp b/libcxx/test/std/containers/sequences/array/at.pass.cpp index c4f7acb9f2a..c271788f36f 100644 --- a/libcxx/test/std/containers/sequences/array/at.pass.cpp +++ b/libcxx/test/std/containers/sequences/array/at.pass.cpp @@ -19,7 +19,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/begin.pass.cpp b/libcxx/test/std/containers/sequences/array/begin.pass.cpp index a6218ae0b01..b12ffc851b8 100644 --- a/libcxx/test/std/containers/sequences/array/begin.pass.cpp +++ b/libcxx/test/std/containers/sequences/array/begin.pass.cpp @@ -14,7 +14,9 @@ #include <array> #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() { diff --git a/libcxx/test/std/containers/sequences/array/front_back.pass.cpp b/libcxx/test/std/containers/sequences/array/front_back.pass.cpp index ebe3a180388..bccaade986e 100644 --- a/libcxx/test/std/containers/sequences/array/front_back.pass.cpp +++ b/libcxx/test/std/containers/sequences/array/front_back.pass.cpp @@ -19,7 +19,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/indexing.pass.cpp b/libcxx/test/std/containers/sequences/array/indexing.pass.cpp index c550d141bcb..5ccb0b487b9 100644 --- a/libcxx/test/std/containers/sequences/array/indexing.pass.cpp +++ b/libcxx/test/std/containers/sequences/array/indexing.pass.cpp @@ -19,7 +19,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/experimental/utilities/tuple/tuple.apply/arg_type.pass.cpp b/libcxx/test/std/experimental/utilities/tuple/tuple.apply/arg_type.pass.cpp index 56dc3c6aaa2..cb44707fa7e 100644 --- a/libcxx/test/std/experimental/utilities/tuple/tuple.apply/arg_type.pass.cpp +++ b/libcxx/test/std/experimental/utilities/tuple/tuple.apply/arg_type.pass.cpp @@ -20,6 +20,11 @@ #include <utility> #include <cassert> +// 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" + + namespace ex = std::experimental; int call_with_value(int x, int y) { return (x + y); } diff --git a/libcxx/test/std/experimental/utilities/tuple/tuple.apply/extended_types.pass.cpp b/libcxx/test/std/experimental/utilities/tuple/tuple.apply/extended_types.pass.cpp index 322554925d3..0c5170f29ce 100644 --- a/libcxx/test/std/experimental/utilities/tuple/tuple.apply/extended_types.pass.cpp +++ b/libcxx/test/std/experimental/utilities/tuple/tuple.apply/extended_types.pass.cpp @@ -22,6 +22,10 @@ #include <utility> #include <cassert> +// 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 count = 0; struct A_int_0 diff --git a/libcxx/test/std/experimental/utilities/tuple/tuple.apply/types.pass.cpp b/libcxx/test/std/experimental/utilities/tuple/tuple.apply/types.pass.cpp index 5d3d564c26f..52eec276394 100644 --- a/libcxx/test/std/experimental/utilities/tuple/tuple.apply/types.pass.cpp +++ b/libcxx/test/std/experimental/utilities/tuple/tuple.apply/types.pass.cpp @@ -20,6 +20,10 @@ #include <utility> #include <cassert> +// 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" + namespace ex = std::experimental; int count = 0; diff --git a/libcxx/test/std/containers/sequences/array/suppress_array_warnings.h b/libcxx/test/support/disable_missing_braces_warning.h index 1dde3d3141f..967a87ab3a2 100644 --- a/libcxx/test/std/containers/sequences/array/suppress_array_warnings.h +++ b/libcxx/test/support/disable_missing_braces_warning.h @@ -1,8 +1,8 @@ -#ifndef SUPPRESS_ARRAY_WARNINGS_H -#define SUPPRESS_ARRAY_WARNINGS_H +#ifndef SUPPORT_DISABLE_MISSING_BRACES_WARNING_H +#define SUPPORT_DISABLE_MISSING_BRACES_WARNING_H // std::array is explicitly allowed to be initialized with A a = { init-list };. // Disable the missing braces warning for this reason. #pragma GCC diagnostic ignored "-Wmissing-braces" -#endif // SUPPRESS_ARRAY_WARNINGS +#endif // SUPPORT_DISABLE_MISSING_BRACES_WARNING_H |
