From 4383959047812511798e397511c9f4904eafe23d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Mon, 9 Dec 2019 08:44:15 +0000 Subject: [PATCH] libstdc++: Add C++20 P1032 constexpr to _GLIBCXX_DEBUG array * testsuite/23_containers/array/tuple_interface/get_debug_neg.cc: Fix static_assert line number. * testsuite/23_containers/array/tuple_interface/ tuple_element_debug_neg.cc: Likewise. From-SVN: r279108 --- libstdc++-v3/ChangeLog | 7 +++++++ .../23_containers/array/tuple_interface/get_debug_neg.cc | 6 +++--- .../array/tuple_interface/tuple_element_debug_neg.cc | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0b68e88d1df..357983a7c69 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2019-12-09 François Dumont + + * testsuite/23_containers/array/tuple_interface/get_debug_neg.cc: + Fix static_assert line number. + * testsuite/23_containers/array/tuple_interface/ + tuple_element_debug_neg.cc: Likewise. + 2019-12-07 Andrew Pinski * config/cpu/aarch64/opt/ext/opt_random.h: Wrap around with check diff --git a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/get_debug_neg.cc b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/get_debug_neg.cc index 3c60a435491..a4b199c23e3 100644 --- a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/get_debug_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/get_debug_neg.cc @@ -27,6 +27,6 @@ int n1 = std::get<1>(a); int n2 = std::get<1>(std::move(a)); int n3 = std::get<1>(ca); -// { dg-error "static assertion failed" "" { target *-*-* } 294 } -// { dg-error "static assertion failed" "" { target *-*-* } 303 } -// { dg-error "static assertion failed" "" { target *-*-* } 311 } +// { dg-error "static assertion failed" "" { target *-*-* } 295 } +// { dg-error "static assertion failed" "" { target *-*-* } 304 } +// { dg-error "static assertion failed" "" { target *-*-* } 312 } diff --git a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc index a6b44eb57fe..59e728c4a37 100644 --- a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc @@ -22,4 +22,4 @@ typedef std::tuple_element<1, std::array>::type type; -// { dg-error "static assertion failed" "" { target *-*-* } 376 } +// { dg-error "static assertion failed" "" { target *-*-* } 377 } -- 2.30.2