From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 41A6A385843E; Mon, 4 Sep 2023 16:29:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 41A6A385843E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1693844954; bh=HwyXz31dMPGTzJDtytuqPK8l11RcmMo3ryh/hUdBZ/o=; h=From:To:Subject:Date:From; b=duzF2REnzcMCRq6KxI0CGqDjfylt2+n+1j1Frb09g9AhdsQvCe4XHrK+5hNe0K3Xc Ny7NlfHZG70e/douu4Afpk0h+HLfsrESYkT8L3vtV2FM9ssxBFPn51lYaZinZa9aEx hmQGrAWHzxVm0Suo3eyP7nVsVQ0nWvlGiXOi2jHY= 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 r14-3656] libstdc++: Remove dg-options "-std=c++98" from TR1 tests X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 678834e9ff541f4a5b1065357e94e863b6f34913 X-Git-Newrev: 455907564c2d5890e98c7e572944456b10e8e42e Message-Id: <20230904162914.41A6A385843E@sourceware.org> Date: Mon, 4 Sep 2023 16:29:14 +0000 (GMT) List-Id: https://gcc.gnu.org/g:455907564c2d5890e98c7e572944456b10e8e42e commit r14-3656-g455907564c2d5890e98c7e572944456b10e8e42e Author: Jonathan Wakely Date: Mon Sep 4 14:55:51 2023 +0100 libstdc++: Remove dg-options "-std=c++98" from TR1 tests These tests need slight adjustments to be valid in C++11 and later, but there's no reason that can't be done, so that we test them in more modes. libstdc++-v3/ChangeLog: * testsuite/tr1/6_containers/utility/pair.cc: Remove dg-options and qualify ambiguous calls to get. * testsuite/tr1/8_c_compatibility/cmath/pow_cmath.cc: Adjust expected result for std::pow(float, int) as per DR 550. Diff: --- .../testsuite/tr1/6_containers/utility/pair.cc | 19 ++++++++----------- .../tr1/8_c_compatibility/cmath/pow_cmath.cc | 7 +++++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libstdc++-v3/testsuite/tr1/6_containers/utility/pair.cc b/libstdc++-v3/testsuite/tr1/6_containers/utility/pair.cc index 4d4dcdb7a02b..904b38c2b647 100644 --- a/libstdc++-v3/testsuite/tr1/6_containers/utility/pair.cc +++ b/libstdc++-v3/testsuite/tr1/6_containers/utility/pair.cc @@ -17,8 +17,6 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=c++98" } - // tr1 additions to pair #include @@ -42,15 +40,14 @@ main() tuple_element<1, pair >::type blank3 __attribute__((unused)) = blank; pair test_pair(1, 2); - VERIFY(get<0>(test_pair) == 1); - VERIFY(get<1>(test_pair) == 2); - get<0>(test_pair) = 3; - get<1>(test_pair) = 4; - VERIFY(get<0>(test_pair) == 3); - VERIFY(get<1>(test_pair) == 4); + VERIFY(std::tr1::get<0>(test_pair) == 1); + VERIFY(std::tr1::get<1>(test_pair) == 2); + std::tr1::get<0>(test_pair) = 3; + std::tr1::get<1>(test_pair) = 4; + VERIFY(std::tr1::get<0>(test_pair) == 3); + VERIFY(std::tr1::get<1>(test_pair) == 4); const pair test_pair2(1,2); - VERIFY(get<0>(test_pair2) == 1); - VERIFY(get<1>(test_pair2) == 2); + VERIFY(std::tr1::get<0>(test_pair2) == 1); + VERIFY(std::tr1::get<1>(test_pair2) == 2); } - diff --git a/libstdc++-v3/testsuite/tr1/8_c_compatibility/cmath/pow_cmath.cc b/libstdc++-v3/testsuite/tr1/8_c_compatibility/cmath/pow_cmath.cc index bc89ab2f6fe0..63891bf4ba07 100644 --- a/libstdc++-v3/testsuite/tr1/8_c_compatibility/cmath/pow_cmath.cc +++ b/libstdc++-v3/testsuite/tr1/8_c_compatibility/cmath/pow_cmath.cc @@ -17,8 +17,6 @@ // with this library; see the file COPYING3. If not see // . -// { dg-options "-std=c++98" } - #include using std::pow; #include @@ -30,6 +28,11 @@ test01() using namespace __gnu_test; float x = 2080703.375F; +#if __cplusplus < 201103L check_ret_type(std::pow(x, 2)); +#else + // LWG 550 What should the return type of pow(float,int) be? + check_ret_type(std::pow(x, 2)); +#endif check_ret_type(std::tr1::pow(x, 2)); }