[committed] libstdc++: Ignore -Wignored-qualifiers warning in <variant>

Message ID 20221102125631.634887-1-jwakely@redhat.com
State Repeat Merge
Headers
Series [committed] libstdc++: Ignore -Wignored-qualifiers warning in <variant> |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Jonathan Wakely Nov. 2, 2022, 12:56 p.m. UTC
  Tested powerpc64le-linux. Pushed to trunk.

-- >8 --

The warning is wrong here, the qualifier serves a purpose and is not
ignored (c.f. PR c++/107492).

libstdc++-v3/ChangeLog:

	* include/std/variant (__variant::_Multi_array::__untag_result):
	Use pragma to suppress warning.
---
 libstdc++-v3/include/std/variant | 3 +++
 1 file changed, 3 insertions(+)
  

Patch

diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant
index c234b54421e..ba8492b6985 100644
--- a/libstdc++-v3/include/std/variant
+++ b/libstdc++-v3/include/std/variant
@@ -831,10 +831,13 @@  namespace __variant
 	: false_type
 	{ using element_type = _Tp; };
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-qualifiers"
       template <typename... _Args>
 	struct __untag_result<const void(*)(_Args...)>
 	: false_type
 	{ using element_type = void(*)(_Args...); };
+#pragma GCC diagnostic pop
 
       template <typename... _Args>
 	struct __untag_result<__variant_cookie(*)(_Args...)>