diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2019-06-17 09:18:17 +0100 |
---|---|---|
committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-06-17 09:18:17 +0100 |
commit | 9a9c7a625d3813d062a6b17d071bd8cc9fe5cb8b (patch) | |
tree | aa317d58a6f20f203c9bfbd20061d1dc039ddd9e | |
parent | 61efadedfdc723491bc13cc33bf80bd262465cca (diff) | |
download | gcc-9a9c7a625d3813d062a6b17d071bd8cc9fe5cb8b.zip gcc-9a9c7a625d3813d062a6b17d071bd8cc9fe5cb8b.tar.gz gcc-9a9c7a625d3813d062a6b17d071bd8cc9fe5cb8b.tar.bz2 |
Fix tests that fail without PCH
The recent change to stop transitively including <string> broke some
tests, but only when the library is configured without PCH, because
otherwise the <string> header still gets included via the precompiled
<bits/stdc++.h> header.
* testsuite/20_util/bad_function_call/what.cc: Include <string> header
for std::string.
* testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc: Likewise.
* testsuite/20_util/tuple/cons/allocator_with_any.cc: Include <memory>
header for std::allocator.
* testsuite/23_containers/array/tuple_interface/tuple_element.cc: Add
using-declaration for std::size_t.
* testsuite/23_containers/array/tuple_interface/tuple_size.cc:
Likewise.
* testsuite/23_containers/deque/cons/55977.cc: Include <istream> for
std::istream.
* testsuite/23_containers/vector/cons/55977.cc: Likewise.
* testsuite/experimental/map/erasure.cc: Include <string> for
std::string.
* testsuite/experimental/unordered_map/erasure.cc: Likewise.
From-SVN: r272376
10 files changed, 27 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9eb70fc..542c937 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,21 @@ +2019-06-17 Jonathan Wakely <jwakely@redhat.com> + + * testsuite/20_util/bad_function_call/what.cc: Include <string> header + for std::string. + * testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc: Likewise. + * testsuite/20_util/tuple/cons/allocator_with_any.cc: Include <memory> + header for std::allocator. + * testsuite/23_containers/array/tuple_interface/tuple_element.cc: Add + using-declaration for std::size_t. + * testsuite/23_containers/array/tuple_interface/tuple_size.cc: + Likewise. + * testsuite/23_containers/deque/cons/55977.cc: Include <istream> for + std::istream. + * testsuite/23_containers/vector/cons/55977.cc: Likewise. + * testsuite/experimental/map/erasure.cc: Include <string> for + std::string. + * testsuite/experimental/unordered_map/erasure.cc: Likewise. + 2019-06-14 Jonathan Wakely <jwakely@redhat.com> * include/experimental/type_traits (experimental::nonesuch): Use diff --git a/libstdc++-v3/testsuite/20_util/bad_function_call/what.cc b/libstdc++-v3/testsuite/20_util/bad_function_call/what.cc index e17b42f..229c7ef 100644 --- a/libstdc++-v3/testsuite/20_util/bad_function_call/what.cc +++ b/libstdc++-v3/testsuite/20_util/bad_function_call/what.cc @@ -18,6 +18,7 @@ // <http://www.gnu.org/licenses/>. #include <functional> +#include <string> #include <testsuite_hooks.h> int main() diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc index f9c44cd..a32a5c9 100644 --- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/weak_ptr_expired.cc @@ -20,6 +20,7 @@ // 20.6.6.2 Template class shared_ptr [util.smartptr.shared] #include <memory> +#include <string> #include <testsuite_hooks.h> struct A { }; diff --git a/libstdc++-v3/testsuite/20_util/tuple/cons/allocator_with_any.cc b/libstdc++-v3/testsuite/20_util/tuple/cons/allocator_with_any.cc index 655b532..154ec91 100644 --- a/libstdc++-v3/testsuite/20_util/tuple/cons/allocator_with_any.cc +++ b/libstdc++-v3/testsuite/20_util/tuple/cons/allocator_with_any.cc @@ -23,6 +23,7 @@ // this test may begin to fail. #include <tuple> +#include <memory> #include <experimental/any> #include <testsuite_hooks.h> diff --git a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element.cc b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element.cc index b6fda44..e8b6bc12 100644 --- a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element.cc +++ b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element.cc @@ -29,7 +29,7 @@ test01() // This relies on the fact that <utility> includes <type_traits>: using std::is_same; - const size_t len = 3; + const std::size_t len = 3; typedef array<int, len> array_type; static_assert(is_same<tuple_element<0, array_type>::type, int>::value, "" ); diff --git a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_size.cc b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_size.cc index aedd5fc..740c42a 100644 --- a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_size.cc +++ b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_size.cc @@ -26,6 +26,7 @@ test01() { using std::array; using std::tuple_size; + using std::size_t; // This relies on the fact that <utility> includes <type_traits>: using std::is_same; diff --git a/libstdc++-v3/testsuite/23_containers/deque/cons/55977.cc b/libstdc++-v3/testsuite/23_containers/deque/cons/55977.cc index 492aedf..5ab516a 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/cons/55977.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/cons/55977.cc @@ -21,6 +21,7 @@ #include <utility> #include <deque> #include <iterator> +#include <istream> template <class T> struct MyAllocator diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/55977.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/55977.cc index f776792..efa03b1 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/cons/55977.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/cons/55977.cc @@ -21,6 +21,7 @@ #include <utility> #include <vector> #include <iterator> +#include <istream> template <class T> struct MyAllocator diff --git a/libstdc++-v3/testsuite/experimental/map/erasure.cc b/libstdc++-v3/testsuite/experimental/map/erasure.cc index c636fcb..aa3d42d 100644 --- a/libstdc++-v3/testsuite/experimental/map/erasure.cc +++ b/libstdc++-v3/testsuite/experimental/map/erasure.cc @@ -18,6 +18,7 @@ // <http://www.gnu.org/licenses/>. #include <experimental/map> +#include <string> #include <testsuite_hooks.h> auto is_odd_pair = [](const std::pair<const int, std::string>& p) diff --git a/libstdc++-v3/testsuite/experimental/unordered_map/erasure.cc b/libstdc++-v3/testsuite/experimental/unordered_map/erasure.cc index c08fa31..79a42ff 100644 --- a/libstdc++-v3/testsuite/experimental/unordered_map/erasure.cc +++ b/libstdc++-v3/testsuite/experimental/unordered_map/erasure.cc @@ -18,6 +18,7 @@ // <http://www.gnu.org/licenses/>. #include <experimental/unordered_map> +#include <string> #include <testsuite_hooks.h> auto is_odd_pair = [](const std::pair<const int, std::string>& p) |