[PATCH] Remove C++14-isms from C++11 tests
Jonathan Wakely
jwakely@redhat.com
Thu Aug 23 08:26:00 GMT 2018
* 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.
Tested x86_64-linux, committed to trunk.
-------------- next part --------------
commit 7125051d44c2f4e52641658b7a35a26379f2db17
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Thu Aug 23 09:23:16 2018 +0100
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.
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<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 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<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
More information about the Libstdc++
mailing list