diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2018-08-23 09:26:22 +0100 |
---|---|---|
committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-08-23 09:26:22 +0100 |
commit | 0aa2934aaa0e22917cfb32a8478c3d973eff8969 (patch) | |
tree | 55194c43370f7b22d20d2942d0c864e5052572e4 | |
parent | 75224273c35ab421e0e7d93de387a00414c28050 (diff) | |
download | gcc-0aa2934aaa0e22917cfb32a8478c3d973eff8969.zip gcc-0aa2934aaa0e22917cfb32a8478c3d973eff8969.tar.gz gcc-0aa2934aaa0e22917cfb32a8478c3d973eff8969.tar.bz2 |
Remove C++14-isms from C++11 tests
* testsuite/20_util/reference_wrapper/lwg2993.cc: Fix C++11 test to
not use C++14 feature.
* testsuite/23_containers/list/68222_neg.cc: Likewise.
From-SVN: r263801
-rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/20_util/reference_wrapper/lwg2993.cc | 2 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/23_containers/list/68222_neg.cc | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5c7cbdb..25218bf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2018-08-23 Jonathan Wakely <jwakely@redhat.com> + * testsuite/20_util/reference_wrapper/lwg2993.cc: Fix C++11 test to + not use C++14 feature. + * testsuite/23_containers/list/68222_neg.cc: Likewise. + * testsuite/21_strings/basic_string/init-list.cc: Require cxx11-abi. * testsuite/experimental/polymorphic_allocator/pmr_typedefs_match.cc: diff --git a/libstdc++-v3/testsuite/20_util/reference_wrapper/lwg2993.cc b/libstdc++-v3/testsuite/20_util/reference_wrapper/lwg2993.cc index 0a33948..fa7cc72 100644 --- a/libstdc++-v3/testsuite/20_util/reference_wrapper/lwg2993.cc +++ b/libstdc++-v3/testsuite/20_util/reference_wrapper/lwg2993.cc @@ -51,5 +51,5 @@ test02() // error: no member 'type' because the conditional // expression is ill-formed - using t = std::common_type_t<std::reference_wrapper<int>, int>; + using t = typename std::common_type<std::reference_wrapper<int>, int>::type; } diff --git a/libstdc++-v3/testsuite/23_containers/list/68222_neg.cc b/libstdc++-v3/testsuite/23_containers/list/68222_neg.cc index d969b6a..cd33762 100644 --- a/libstdc++-v3/testsuite/23_containers/list/68222_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/list/68222_neg.cc @@ -26,10 +26,10 @@ test01() const std::list<int> nums = { 1, 2, 3, 4 }; // Grab the iterator type. - using list_itr_type = decltype( std::cbegin( nums ) ); + using list_itr_type = decltype( std::begin( nums ) ); // Confirm cend returns the same type. - static_assert( std::is_same< decltype( std::cend( nums ) ), list_itr_type >::value, "" ); + static_assert( std::is_same< decltype( std::end( nums ) ), list_itr_type >::value, "" ); // The list's iterator type provides a well-formed non-member operator-() with valid return type (long int) using substraction_type |