diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2017-03-10 15:29:49 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2017-03-10 15:29:49 +0000 |
| commit | da0ced6eb890fbb1cbe1da7bc620dc6ef9f13246 (patch) | |
| tree | e46eaaea73f6717863cd6221553032ab445731c1 | |
| parent | 7dcc645ccd085045f628a25760788221cb83c504 (diff) | |
| download | gcc-da0ced6eb890fbb1cbe1da7bc620dc6ef9f13246.zip gcc-da0ced6eb890fbb1cbe1da7bc620dc6ef9f13246.tar.gz gcc-da0ced6eb890fbb1cbe1da7bc620dc6ef9f13246.tar.bz2 | |
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: r246037
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/17_intro/names.cc | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a6ae03d..ee0ae99 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2017-03-10 Jonathan Wakely <jwakely@redhat.com> + * testsuite/17_intro/names.cc: Undefine macros that clash with + identifiers in AIX system headers. + * include/bits/invoke.h (__invoke): Use __invoke_result instead of result_of, and __is_nothrow_invocable instead of __is_nothrow_callable. diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index a7d9a6b..c525861 100644 --- 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> |