From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed] libstdc++: Remove dg-options "-std=c++98" from TR1 tests
Date: Mon, 4 Sep 2023 17:29:27 +0100 [thread overview]
Message-ID: <20230904162931.515957-1-jwakely@redhat.com> (raw)
Tested x86_64-linux. Pushed to trunk.
-- >8 --
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.
---
.../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 4d4dcdb7a02..904b38c2b64 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
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=c++98" }
-
// tr1 additions to pair
#include <tr1/utility>
@@ -42,15 +40,14 @@ main()
tuple_element<1, pair<int ,blank_class> >::type
blank3 __attribute__((unused)) = blank;
pair<int,int> 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<int,int> 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 bc89ab2f6fe..63891bf4ba0 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
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=c++98" }
-
#include <cmath>
using std::pow;
#include <tr1/cmath>
@@ -30,6 +28,11 @@ test01()
using namespace __gnu_test;
float x = 2080703.375F;
+#if __cplusplus < 201103L
check_ret_type<float>(std::pow(x, 2));
+#else
+ // LWG 550 What should the return type of pow(float,int) be?
+ check_ret_type<double>(std::pow(x, 2));
+#endif
check_ret_type<double>(std::tr1::pow(x, 2));
}
--
2.41.0
reply other threads:[~2023-09-04 16:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230904162931.515957-1-jwakely@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).