From da0ced6eb890fbb1cbe1da7bc620dc6ef9f13246 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 10 Mar 2017 15:29:49 +0000 Subject: [PATCH] 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 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/testsuite/17_intro/names.cc | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a6ae03da067..ee0ae99b4d9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2017-03-10 Jonathan Wakely + * 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 a7d9a6bced3..c5258615663 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 -- 2.30.2