From 9bc5bea1f3f0ce3927fd86ce728641d087f3d3b5 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 4 Feb 2020 13:30:57 +0000 Subject: [PATCH] libstdc++: Fix name of macro in #undef directive The macro that is defined is _GLIBCXX_NOT_FN_CALL_OP but the macro that was named in the #undef directive was _GLIBCXX_NOT_FN_CALL. This fixes the #undef. * include/std/functional (_GLIBCXX_NOT_FN_CALL_OP): Un-define after use. --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/std/functional | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bb1c3ab1745..d925a0b3de8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2020-02-04 Jonathan Wakely + * include/std/functional (_GLIBCXX_NOT_FN_CALL_OP): Un-define after + use. + PR libstdc++/93562 * include/bits/unique_ptr.h (__uniq_ptr_impl::swap): Define. (unique_ptr::swap, unique_ptr::swap): Call it. diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 88cffd5a9ce..faa7e85c114 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -953,7 +953,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_NOT_FN_CALL_OP( const & ) _GLIBCXX_NOT_FN_CALL_OP( && ) _GLIBCXX_NOT_FN_CALL_OP( const && ) -#undef _GLIBCXX_NOT_FN_CALL +#undef _GLIBCXX_NOT_FN_CALL_OP private: _Fn _M_fn; -- 2.30.2