From: John David Anglin <danglin@gcc.gnu.org>
Date: Sun, 20 Aug 2017 18:52:59 +0000 (+0000)
Subject: re PR testsuite/81056 (FAIL: 17_intro/names.cc (test for excess errors))
X-Git-Tag: basepoints/gcc-9~5388
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab7fc02ec120cec4639921db2ca41e2af898f366;p=thirdparty%2Fgcc.git

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

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

From-SVN: r251208
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1b17da249d2c..ddba9e28f739 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+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-08-18  Jonathan Wakely  <jwakely@redhat.com>
 
 	* include/bits/hashtable_policy.h (_ReuseOrAllocNode): Remove
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>