diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2023-09-04 14:55:51 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2023-09-04 16:24:35 +0100 |
| commit | 455907564c2d5890e98c7e572944456b10e8e42e (patch) | |
| tree | e05f1432cf3d8872ee556d935757ea980cd1c76b | |
| parent | 678834e9ff541f4a5b1065357e94e863b6f34913 (diff) | |
| download | gcc-455907564c2d5890e98c7e572944456b10e8e42e.zip gcc-455907564c2d5890e98c7e572944456b10e8e42e.tar.gz gcc-455907564c2d5890e98c7e572944456b10e8e42e.tar.bz2 | |
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.
| -rw-r--r-- | libstdc++-v3/testsuite/tr1/6_containers/utility/pair.cc | 19 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/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 4d4dcdb..904b38c 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 bc89ab2..63891bf 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)); } |