diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/17_intro/names.cc | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1b17da2..ddba9e2 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 c525861..1873deb 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> |