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 // . -// { 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 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 // . -// { 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)); }