diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2019-06-06 16:34:45 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-06-06 16:34:45 +0100 |
| commit | d561a18ee6b0a8e8b565bff7f32a7fc45a78b3cc (patch) | |
| tree | 1613feaa91f3a6aeffa570a25aefe27cccd012c2 /libstdc++-v3 | |
| parent | 268d509d67efac45f01b356602036e1dc7c6935e (diff) | |
| download | gcc-d561a18ee6b0a8e8b565bff7f32a7fc45a78b3cc.zip gcc-d561a18ee6b0a8e8b565bff7f32a7fc45a78b3cc.tar.gz gcc-d561a18ee6b0a8e8b565bff7f32a7fc45a78b3cc.tar.bz2 | |
Fix more tests that fail in C++2a mode
* 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.
From-SVN: r272009
Diffstat (limited to 'libstdc++-v3')
3 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index afb41cb..47dee9e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 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. + * testsuite/23_containers/deque/requirements/explicit_instantiation/ 1_c++0x.cc: Remove redundant test. * testsuite/23_containers/deque/requirements/explicit_instantiation/ 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 d6afae9..9038028 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 5daa456..b7a63c5 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> |