From 541a9b104b6e842a81326f9d671b19b8ae69cd05 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 13 May 2016 15:47:46 +0100
Subject: [PATCH] libstdc++/71073 add system_header pragma to Debug Mode
 headers

	PR libstdc++/71073
	* include/debug/bitset: Add #pragma GCC system_header.
	* include/debug/deque: Likewise.
	* include/debug/list: Likewise.
	* include/debug/map: Likewise.
	* include/debug/set: Likewise.
	* include/debug/string: Likewise.
	* include/debug/unordered_map: Likewise.
	* include/debug/unordered_set: Likewise.
	* include/debug/vector: Likewise.
	* include/debug/functions.h: Adjust whitespace.

From-SVN: r236211
---
 libstdc++-v3/ChangeLog                   | 14 ++++++++++++++
 libstdc++-v3/include/debug/bitset        |  2 ++
 libstdc++-v3/include/debug/deque         |  2 ++
 libstdc++-v3/include/debug/functions.h   |  7 +++----
 libstdc++-v3/include/debug/list          |  2 ++
 libstdc++-v3/include/debug/map           |  2 ++
 libstdc++-v3/include/debug/set           |  2 ++
 libstdc++-v3/include/debug/string        |  2 ++
 libstdc++-v3/include/debug/unordered_map |  2 ++
 libstdc++-v3/include/debug/unordered_set |  2 ++
 libstdc++-v3/include/debug/vector        |  2 ++
 11 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 015a02e20f7..fb48cec2701 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,17 @@
+2016-05-13  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR libstdc++/71073
+	* include/debug/bitset: Add #pragma GCC system_header.
+	* include/debug/deque: Likewise.
+	* include/debug/list: Likewise.
+	* include/debug/map: Likewise.
+	* include/debug/set: Likewise.
+	* include/debug/string: Likewise.
+	* include/debug/unordered_map: Likewise.
+	* include/debug/unordered_set: Likewise.
+	* include/debug/vector: Likewise.
+	* include/debug/functions.h: Adjust whitespace.
+
 2016-05-12  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/71081
diff --git a/libstdc++-v3/include/debug/bitset b/libstdc++-v3/include/debug/bitset
index 706a7b7681e..1353aa38074 100644
--- a/libstdc++-v3/include/debug/bitset
+++ b/libstdc++-v3/include/debug/bitset
@@ -29,6 +29,8 @@
 #ifndef _GLIBCXX_DEBUG_BITSET
 #define _GLIBCXX_DEBUG_BITSET
 
+#pragma GCC system_header
+
 #include <bitset>
 #include <debug/safe_sequence.h>
 #include <debug/safe_iterator.h>
diff --git a/libstdc++-v3/include/debug/deque b/libstdc++-v3/include/debug/deque
index 72b65368396..f15faadbb7b 100644
--- a/libstdc++-v3/include/debug/deque
+++ b/libstdc++-v3/include/debug/deque
@@ -29,6 +29,8 @@
 #ifndef _GLIBCXX_DEBUG_DEQUE
 #define _GLIBCXX_DEBUG_DEQUE 1
 
+#pragma GCC system_header
+
 #include <deque>
 #include <debug/safe_sequence.h>
 #include <debug/safe_container.h>
diff --git a/libstdc++-v3/include/debug/functions.h b/libstdc++-v3/include/debug/functions.h
index 547ec5cc127..35e7ae8395a 100644
--- a/libstdc++-v3/include/debug/functions.h
+++ b/libstdc++-v3/include/debug/functions.h
@@ -29,11 +29,10 @@
 #ifndef _GLIBCXX_DEBUG_FUNCTIONS_H
 #define _GLIBCXX_DEBUG_FUNCTIONS_H 1
 
-#include <bits/move.h>				// for __addressof
-#include <bits/stl_function.h>			// for less
+#include <bits/move.h>		// for __addressof
+#include <bits/stl_function.h>	// for less
 #if __cplusplus >= 201103L
-# include <type_traits>				// for is_lvalue_reference and
-						// conditional.
+# include <type_traits>		// for is_lvalue_reference and conditional.
 #endif
 
 #include <debug/helper_functions.h>
diff --git a/libstdc++-v3/include/debug/list b/libstdc++-v3/include/debug/list
index f1bfe35e032..09df483e8c1 100644
--- a/libstdc++-v3/include/debug/list
+++ b/libstdc++-v3/include/debug/list
@@ -29,6 +29,8 @@
 #ifndef _GLIBCXX_DEBUG_LIST
 #define _GLIBCXX_DEBUG_LIST 1
 
+#pragma GCC system_header
+
 #include <list>
 #include <debug/safe_sequence.h>
 #include <debug/safe_container.h>
diff --git a/libstdc++-v3/include/debug/map b/libstdc++-v3/include/debug/map
index 3fa961d2ded..2cce7c0c4bc 100644
--- a/libstdc++-v3/include/debug/map
+++ b/libstdc++-v3/include/debug/map
@@ -29,6 +29,8 @@
 #ifndef _GLIBCXX_DEBUG_MAP
 #define _GLIBCXX_DEBUG_MAP 1
 
+#pragma GCC system_header
+
 #include <map>
 #include <debug/map.h>
 #include <debug/multimap.h>
diff --git a/libstdc++-v3/include/debug/set b/libstdc++-v3/include/debug/set
index bfe1d36d1e3..82e39003050 100644
--- a/libstdc++-v3/include/debug/set
+++ b/libstdc++-v3/include/debug/set
@@ -29,6 +29,8 @@
 #ifndef _GLIBCXX_DEBUG_SET
 #define _GLIBCXX_DEBUG_SET 1
 
+#pragma GCC system_header
+
 #include <set>
 #include <debug/set.h>
 #include <debug/multiset.h>
diff --git a/libstdc++-v3/include/debug/string b/libstdc++-v3/include/debug/string
index 7edc6658c0c..137974d724f 100644
--- a/libstdc++-v3/include/debug/string
+++ b/libstdc++-v3/include/debug/string
@@ -29,6 +29,8 @@
 #ifndef _GLIBCXX_DEBUG_STRING
 #define _GLIBCXX_DEBUG_STRING 1
 
+#pragma GCC system_header
+
 #include <string>
 #include <debug/safe_sequence.h>
 #include <debug/safe_container.h>
diff --git a/libstdc++-v3/include/debug/unordered_map b/libstdc++-v3/include/debug/unordered_map
index cf6c8d44be3..873f36a3499 100644
--- a/libstdc++-v3/include/debug/unordered_map
+++ b/libstdc++-v3/include/debug/unordered_map
@@ -29,6 +29,8 @@
 #ifndef _GLIBCXX_DEBUG_UNORDERED_MAP
 #define _GLIBCXX_DEBUG_UNORDERED_MAP 1
 
+#pragma GCC system_header
+
 #if __cplusplus < 201103L
 # include <bits/c++0x_warning.h>
 #else
diff --git a/libstdc++-v3/include/debug/unordered_set b/libstdc++-v3/include/debug/unordered_set
index 203900aa278..6a4dba6475d 100644
--- a/libstdc++-v3/include/debug/unordered_set
+++ b/libstdc++-v3/include/debug/unordered_set
@@ -29,6 +29,8 @@
 #ifndef _GLIBCXX_DEBUG_UNORDERED_SET
 #define _GLIBCXX_DEBUG_UNORDERED_SET 1
 
+#pragma GCC system_header
+
 #if __cplusplus < 201103L
 # include <bits/c++0x_warning.h>
 #else
diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector
index d2cd74f0877..9bcda733a70 100644
--- a/libstdc++-v3/include/debug/vector
+++ b/libstdc++-v3/include/debug/vector
@@ -29,6 +29,8 @@
 #ifndef _GLIBCXX_DEBUG_VECTOR
 #define _GLIBCXX_DEBUG_VECTOR 1
 
+#pragma GCC system_header
+
 #include <vector>
 #include <utility>
 #include <debug/safe_sequence.h>
-- 
2.30.2