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 d9dc75e6942ada0fcc49b7dfcc9cbafc11fd3512..cbe0fc5daa89496b1615af699cd9fdcf028c513c 100644 (file)
--- 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 c52586156630d13cb24ece70a7568c52503a8f1a..1873deb6936a41f65975e22296b9fe44abc66860 100644 (file)
--- 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>