OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix libstdc++ testsuite failures in C++98 and C++11 mode 

* testsuite/23_containers/list/operations/78389.cc: Fix for C++11
	mode.
	* testsuite/23_containers/priority_queue/requirements/constructible.cc:
	Mark as unsupported in C++98 mode.
	* testsuite/23_containers/queue/requirements/constructible.cc:
	Likewise.
	* testsuite/23_containers/stack/requirements/constructible.cc:
	Likewise.
	* testsuite/25_algorithms/make_heap/movable.cc: Fix for C++11 mode.

From-SVN: r244950
This commit is contained in:
Jonathan Wakely 2017-01-26 19:39:53 +00:00 committed by Jonathan Wakely
parent 905d2812e7
commit 881191e865
6 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,15 @@
2017-01-26 Jonathan Wakely <jwakely@redhat.com>
* testsuite/23_containers/list/operations/78389.cc: Fix for C++11
mode.
* testsuite/23_containers/priority_queue/requirements/constructible.cc:
Mark as unsupported in C++98 mode.
* testsuite/23_containers/queue/requirements/constructible.cc:
Likewise.
* testsuite/23_containers/stack/requirements/constructible.cc:
Likewise.
* testsuite/25_algorithms/make_heap/movable.cc: Fix for C++11 mode.
PR libstdc++/79243
* include/bits/c++config (literals::string_view_literals::__7): Add.
Only declare versioned namespaces for the relevant C++ dialects.

10
libstdc++-v3/testsuite/23_containers/list/operations/78389.cc
View File

@ -19,19 +19,19 @@
// 23.2.2.4 list operations [lib.list.ops]
#include <testsuite_hooks.h>
#include <list>
#include <testsuite_hooks.h>
struct ThrowingComparator
{
unsigned int throw_after = 0;
unsigned int count = 0;
ThrowingComparator(unsigned n) : throw_after(n), count(0) { }
unsigned int throw_after;
unsigned int count;
bool operator()(int, int) {
if (++count >= throw_after) {
throw 666;
}
return true;
return false;
}
};

2
libstdc++-v3/testsuite/23_containers/priority_queue/requirements/constructible.cc
View File

@ -1,4 +1,4 @@
// { dg-do compile }
// { dg-do compile { target c++11 } }
// Copyright (C) 2017 Free Software Foundation, Inc.
//

2
libstdc++-v3/testsuite/23_containers/queue/requirements/constructible.cc
View File

@ -1,4 +1,4 @@
// { dg-do compile }
// { dg-do compile { target c++11 } }
// Copyright (C) 2017 Free Software Foundation, Inc.
//

2
libstdc++-v3/testsuite/23_containers/stack/requirements/constructible.cc
View File

@ -1,4 +1,4 @@
// { dg-do compile }
// { dg-do compile { target c++11 } }
// Copyright (C) 2017 Free Software Foundation, Inc.
//

2
libstdc++-v3/testsuite/25_algorithms/make_heap/movable.cc
View File

@ -25,7 +25,7 @@ void
test01()
{
int i[] = { 1, 2, 3, 4 };
std::function<bool(int, int)> f = std::less<>{};
std::function<bool(int, int)> f = std::less<int>{};
// If this uses a moved-from std::function we'll get an exception:
std::make_heap(std::begin(i), std::end(i), f);
std::sort_heap(std::begin(i), std::end(i), f);