[gcc r10-6432] libstdc++: Fix name of macro in #undef directive

Jonathan Wakely redi@gcc.gnu.org
Tue Feb 4 14:05:00 GMT 2020


https://gcc.gnu.org/g:9bc5bea1f3f0ce3927fd86ce728641d087f3d3b5

commit r10-6432-g9bc5bea1f3f0ce3927fd86ce728641d087f3d3b5
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Feb 4 13:30:57 2020 +0000

    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.

Diff:
---
 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 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;



More information about the Libstdc++-cvs mailing list