diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-02-04 13:30:57 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2020-02-04 13:30:57 +0000 |
| commit | 9bc5bea1f3f0ce3927fd86ce728641d087f3d3b5 (patch) | |
| tree | 8afc0e0a8ec943c5b18aae17ef1a103882393af8 | |
| parent | 9962493ca2f71d3f3dd06b0e9cd19fcf849e3e4b (diff) | |
| download | gcc-9bc5bea1f3f0ce3927fd86ce728641d087f3d3b5.zip gcc-9bc5bea1f3f0ce3927fd86ce728641d087f3d3b5.tar.gz gcc-9bc5bea1f3f0ce3927fd86ce728641d087f3d3b5.tar.bz2 | |
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.
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/functional | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bb1c3ab..d925a0b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2020-02-04 Jonathan Wakely <jwakely@redhat.com> + * 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<T[], D>::swap): Call it. diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 88cffd5..faa7e85 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; |