From f2ee751da8551c9d1a84c337239b0e52211fd1aa Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 10 Jun 2019 18:18:52 +0200
Subject: [PATCH] re PR testsuite/90772 (g++.dg/cpp1y/feat-cxx14.C and several
 others fails starting with r272011)

	PR testsuite/90772
	* g++.dg/cpp1y/feat-cxx14.C: Use std::size_t instead of size_t.
	* g++.dg/cpp1z/feat-cxx1z.C: Likewise.
	* g++.dg/cpp2a/feat-cxx2a.C: Likewise.
	* g++.dg/cpp1z/pr85569.C: Include <functional>.
	* g++.dg/tree-ssa/pr80293.C: Include <cstdint>.
	* g++.dg/tree-ssa/pr69336.C: Include <stdexcept>.

From-SVN: r272122
---
 gcc/testsuite/ChangeLog                 | 10 ++++++++++
 gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C |  4 ++--
 gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C |  4 ++--
 gcc/testsuite/g++.dg/cpp1z/pr85569.C    |  1 +
 gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C |  4 ++--
 gcc/testsuite/g++.dg/tree-ssa/pr69336.C |  1 +
 gcc/testsuite/g++.dg/tree-ssa/pr80293.C |  1 +
 7 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ede0ec50a31..6a1967f8211 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2019-06-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR testsuite/90772
+	* g++.dg/cpp1y/feat-cxx14.C: Use std::size_t instead of size_t.
+	* g++.dg/cpp1z/feat-cxx1z.C: Likewise.
+	* g++.dg/cpp2a/feat-cxx2a.C: Likewise.
+	* g++.dg/cpp1z/pr85569.C: Include <functional>.
+	* g++.dg/tree-ssa/pr80293.C: Include <cstdint>.
+	* g++.dg/tree-ssa/pr69336.C: Include <stdexcept>.
+
 2019-06-10  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR other/90695
diff --git a/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C b/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C
index 412b9a33b8f..a2a93f437b3 100644
--- a/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C
+++ b/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C
@@ -303,11 +303,11 @@
 #if __has_include(<array>)
 #  define STD_ARRAY 1
 #  include <array>
-  template<typename _Tp, size_t _Num>
+  template<typename _Tp, std::size_t _Num>
     using array = std::array<_Tp, _Num>;
 #elif __has_include(<tr1/array>)
 #  define TR1_ARRAY 1
 #  include <tr1/array>
-  template<typename _Tp, size_t _Num>
+  template<typename _Tp, std::size_t _Num>
     typedef std::tr1::array<_Tp, _Num> array;
 #endif
diff --git a/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C b/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C
index da372dca8cb..a5d94462c87 100644
--- a/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C
+++ b/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C
@@ -292,12 +292,12 @@
 #if __has_include(<array>)
 #  define STD_ARRAY 1
 #  include <array>
-  template<typename _Tp, size_t _Num>
+  template<typename _Tp, std::size_t _Num>
     using array = std::array<_Tp, _Num>;
 #elif __has_include(<tr1/array>)
 #  define TR1_ARRAY 1
 #  include <tr1/array>
-  template<typename _Tp, size_t _Num>
+  template<typename _Tp, std::size_t _Num>
     typedef std::tr1::array<_Tp, _Num> array;
 #endif
 
diff --git a/gcc/testsuite/g++.dg/cpp1z/pr85569.C b/gcc/testsuite/g++.dg/cpp1z/pr85569.C
index aec543041a0..fae13d8ff22 100644
--- a/gcc/testsuite/g++.dg/cpp1z/pr85569.C
+++ b/gcc/testsuite/g++.dg/cpp1z/pr85569.C
@@ -2,6 +2,7 @@
 
 #include <utility>
 #include <tuple>
+#include <functional>
 
 #define LIFT_FWD(x) std::forward<decltype(x)>(x)
 
diff --git a/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C b/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C
index 8ee7b82914b..086109adbf2 100644
--- a/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C
+++ b/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C
@@ -291,12 +291,12 @@
 #if __has_include(<array>)
 #  define STD_ARRAY 1
 #  include <array>
-  template<typename _Tp, size_t _Num>
+  template<typename _Tp, std::size_t _Num>
     using array = std::array<_Tp, _Num>;
 #elif __has_include(<tr1/array>)
 #  define TR1_ARRAY 1
 #  include <tr1/array>
-  template<typename _Tp, size_t _Num>
+  template<typename _Tp, std::size_t _Num>
     typedef std::tr1::array<_Tp, _Num> array;
 #endif
 
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr69336.C b/gcc/testsuite/g++.dg/tree-ssa/pr69336.C
index 3bddba13157..c946176bfda 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/pr69336.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr69336.C
@@ -3,6 +3,7 @@
 
 #include <array>
 #include <utility>
+#include <stdexcept>
 
 
 template<class Key, class T, size_t N> struct static_map
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr80293.C b/gcc/testsuite/g++.dg/tree-ssa/pr80293.C
index 7faf35ae983..cfdea084c9f 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/pr80293.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr80293.C
@@ -2,6 +2,7 @@
 // { dg-options "-O2 -std=gnu++11 -fdump-tree-optimized" } */
 
 #include <array>
+#include <cstdint>
 
 // Return a copy of the underlying memory of an arbitrary value.
 template <
-- 
2.30.2