diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2019-10-24 12:54:40 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2019-10-24 12:54:40 +0000 |
| commit | 224b080feab33e45fc10956e617e098ef55f898f (patch) | |
| tree | 23469dd328c94363d7180711560d5e53870a4058 | |
| parent | 14b7b0b9df9bc3608122181cb6055b84176d517b (diff) | |
Fix more tests that fail in C++2a mode
Backport from mainline
2019-06-06 Jonathan Wakely <jwakely@redhat.com>
* testsuite/23_containers/unordered_map/requirements/debug_container.cc:
Do not test allocator rebinding extension for C++2a.
* testsuite/23_containers/unordered_set/allocator/ext_ptr.cc: Change
dg-do directive for C++17 and C++2a.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@277385 138bc75d-0d04-0410-961f-82ee72b054a4
3 files changed, 11 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 256d5d7aa20..ca192d1bd63 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,6 +1,14 @@ 2019-10-24 Jonathan Wakely <jwakely@redhat.com> Backport from mainline + 2019-06-06 Jonathan Wakely <jwakely@redhat.com> + + * testsuite/23_containers/unordered_map/requirements/debug_container.cc: + Do not test allocator rebinding extension for C++2a. + * testsuite/23_containers/unordered_set/allocator/ext_ptr.cc: Change + dg-do directive for C++17 and C++2a. + + Backport from mainline 2019-05-23 Jonathan Wakely <jwakely@redhat.com> * testsuite/20_util/function_objects/invoke/1.cc: Add more tests. diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_container.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_container.cc index d6afae9c2e9..903802878d7 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_container.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/requirements/debug_container.cc @@ -30,7 +30,7 @@ template class __gnu_debug::unordered_map<string, float>; template class __gnu_debug::unordered_map<string, int, hash<string>, equal_to<string>, allocator<pair<const string, int>>>; -#ifndef __STRICT_ANSI__ +#if !defined __STRICT_ANSI__ && __cplusplus <= 201703L template class __gnu_debug::unordered_map<string, float, hash<string>, equal_to<string>, allocator<char>>; diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/ext_ptr.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/ext_ptr.cc index 5daa456e440..b7a63c5e393 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/ext_ptr.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_set/allocator/ext_ptr.cc @@ -15,7 +15,8 @@ // with this library; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. -// { dg-do run { target c++11 } } +// { dg-do run { target { c++11_only || c++14_only } } } +// { dg-do compile { target c++17 } } #include <unordered_set> #include <memory> |