From 1dce029ca153a2fcd8adeff0233f8aa190a91be1 Mon Sep 17 00:00:00 2001 From: redi Date: Thu, 23 Aug 2018 08:26:22 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@263801 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/testsuite/20_util/reference_wrapper/lwg2993.cc | 2 +- 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 5c7cbdbcaa1..25218bf4fcf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2018-08-23 Jonathan Wakely + * 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 0a339486ef8..fa7cc728abe 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, int>; + using t = typename std::common_type, 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 d969b6a9c52..cd33762e01a 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 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 -- 2.11.4.GIT