libstdc++: Avoid -Wparentheses warning with debug iterators
authorPatrick Palka <ppalka@redhat.com>
Tue, 13 Sep 2022 14:41:47 +0000 (10:41 -0400)
committerPatrick Palka <ppalka@redhat.com>
Tue, 13 Sep 2022 14:41:47 +0000 (10:41 -0400)
I noticed compiling e.g. std/ranges/adaptors/join.cc with
-D_GLIBCXX_DEBUG -Wsystem-headers -Wall gives the warning:

  gcc/libstdc++-v3/include/debug/safe_iterator.h:477:9: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]

libstdc++-v3/ChangeLog:

* include/debug/safe_iterator.h (_GLIBCXX_DEBUG_VERIFY_OPERANDS):
Add parentheses to avoid -Wparentheses warning.

libstdc++-v3/include/debug/safe_iterator.h

index 33f7a86..117dc93 100644 (file)
@@ -40,7 +40,7 @@
 #endif
 
 #define _GLIBCXX_DEBUG_VERIFY_OPERANDS(_Lhs, _Rhs, _BadMsgId, _DiffMsgId) \
-  _GLIBCXX_DEBUG_VERIFY(!_Lhs._M_singular() && !_Rhs._M_singular()     \
+  _GLIBCXX_DEBUG_VERIFY((!_Lhs._M_singular() && !_Rhs._M_singular())   \
                        || (_Lhs._M_value_initialized()                 \
                            && _Rhs._M_value_initialized()),            \
                        _M_message(_BadMsgId)                           \