Fix libstdc++ reserved names test to pass on AIX

	* testsuite/17_intro/names.cc: Undefine macros that clash with
	identifiers in AIX system headers.

From-SVN: r246143

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 50af6a14a50e447d0e3149cc52096aede1726772..01446915800a7ec6dd142fa765c84696c4d74c61 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-14  Jonathan Wakely  <jwakely@redhat.com>
+
+       * testsuite/17_intro/names.cc: Undefine macros that clash with
+       identifiers in AIX system headers.
+
 2017-03-13  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
        PR libstdc++/80034

diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index a7d9a6bced3495d6413ddff684fb2422a11576ff..c52586156630d13cb24ece70a7568c52503a8f1a 100644 (file)
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -98,4 +98,13 @@
 #define x (
 #define y (
 #define z (
+
+#ifdef _AIX
+// See https://gcc.gnu.org/ml/libstdc++/2017-03/msg00015.html
+#undef f
+#undef r
+#undef x
+#undef y
+#endif
+
 #include <bits/stdc++.h>