From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id C9D213896C12; Mon, 12 Apr 2021 11:30:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C9D213896C12 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-8129] libstdc++: Fix some tests that fail in C++20 mode X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: a694a02125f181afe2ae461dd8f35c6f5f54ad22 X-Git-Newrev: 91dd7954c44b201aa3b16e66b18d7a5df00fded9 Message-Id: <20210412113035.C9D213896C12@sourceware.org> Date: Mon, 12 Apr 2021 11:30:35 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 11:30:35 -0000 https://gcc.gnu.org/g:91dd7954c44b201aa3b16e66b18d7a5df00fded9 commit r11-8129-g91dd7954c44b201aa3b16e66b18d7a5df00fded9 Author: Jonathan Wakely Date: Mon Apr 12 11:45:21 2021 +0100 libstdc++: Fix some tests that fail in C++20 mode The linear_congruential_engine negative tests fail with a different error in C++20 mode, because double is no longer an invalid type for NTTP. Adjust the expected errors. libstdc++-v3/ChangeLog: * testsuite/26_numerics/random/linear_congruential_engine/requirements/non_uint_neg.cc: Adjust expected error for C++20 mode. * testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc: Likewise. Diff: --- .../random/linear_congruential_engine/requirements/non_uint_neg.cc | 4 +++- .../random/linear_congruential/requirements/non_uint_neg.cc | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/testsuite/26_numerics/random/linear_congruential_engine/requirements/non_uint_neg.cc b/libstdc++-v3/testsuite/26_numerics/random/linear_congruential_engine/requirements/non_uint_neg.cc index e04e8ca6972..a36d63c6c7b 100644 --- a/libstdc++-v3/testsuite/26_numerics/random/linear_congruential_engine/requirements/non_uint_neg.cc +++ b/libstdc++-v3/testsuite/26_numerics/random/linear_congruential_engine/requirements/non_uint_neg.cc @@ -20,10 +20,12 @@ // { dg-do compile { target c++11 } } // { dg-require-cstdint "" } +// { dg-error "not a valid type" "" { target { ! c++20 } } 31 } +// { dg-error "from 'int' to 'double'" "" { target c++20 } 31 } // 26.4.3.1 class template linear_congruential_engine [rand.eng.lcong] // 26.4.2.2 Concept RandomNumberEngine [rand.concept.eng] #include -std::linear_congruential_engine x; // { dg-error "not a valid type" } +std::linear_congruential_engine x; diff --git a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc index 5ad82db1def..53b15f32516 100644 --- a/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc +++ b/libstdc++-v3/testsuite/tr1/5_numerical_facilities/random/linear_congruential/requirements/non_uint_neg.cc @@ -19,7 +19,8 @@ // { dg-do compile } // { dg-options "-D_GLIBCXX_CONCEPT_CHECKS" } -// { dg-error "not a valid type" "" { target *-*-* } 29 } +// { dg-error "not a valid type" "" { target { ! c++20 } } 30 } +// { dg-error "from 'int' to 'double'" "" { target c++20 } 30 } // 5.1.4.1 class template linear_congruential [tr.rand.eng.lcong] // 5.1.4.1 [4]