From: John David Anglin <danglin@gcc.gnu.org>
Date: Sat, 11 Nov 2017 16:11:50 +0000 (+0000)
Subject: backport: re PR testsuite/81056 (FAIL: 17_intro/names.cc (test for excess errors))
X-Git-Tag: releases/gcc-6.5.0~686
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d8dbcf783c30202ef42eda8b7492d1245c0de3e;p=thirdparty%2Fgcc.git

backport: re PR testsuite/81056 (FAIL: 17_intro/names.cc (test for excess errors))

	Backport from mainline
	2017-08-20  John David Anglin  <danglin@gcc.gnu.org>

	PR testsuite/81056
	* testsuite/17_intro/names.cc: Undef 'd' and 'r' on __hpux__.

From-SVN: r254655
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d9dc75e6942a..cbe0fc5daa89 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2017-11-11  John David Anglin  <danglin@gcc.gnu.org>
+
+	Backport from mainline
+	2017-08-20  John David Anglin  <danglin@gcc.gnu.org>
+
+	PR testsuite/81056
+	* testsuite/17_intro/names.cc: Undef 'd' and 'r' on __hpux__.
+
 2017-10-25  Jonathan Wakely  <jwakely@redhat.com>
 
 	* doc/xml/manual/status_cxx1998.xml: Correct statement about
diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index c52586156630..1873deb6936a 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -107,4 +107,9 @@
 #undef y
 #endif
 
+#ifdef __hpux__
+#undef d
+#undef r
+#endif
+
 #include <bits/stdc++.h>