diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-01-04 21:57:16 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-01-05 13:47:02 +0000 |
| commit | 76a45931ab7c831e32cebf13a6317e5e142f8151 (patch) | |
| tree | 479fcc4b670f4de5a7bb6450fbb01c85f217c93b | |
| parent | 917c7b136e8b556b0027223058006a6caeb56871 (diff) | |
| download | gcc-76a45931ab7c831e32cebf13a6317e5e142f8151.zip gcc-76a45931ab7c831e32cebf13a6317e5e142f8151.tar.gz gcc-76a45931ab7c831e32cebf13a6317e5e142f8151.tar.bz2 | |
libstdc++: Avoid -Wzero-as-null-pointer-constant warning [PR103848]
libstdc++-v3/ChangeLog:
PR libstdc++/103848
* include/bits/stl_deque.h (operator-): Do not use 0 as null
pointer constant.
| -rw-r--r-- | libstdc++-v3/include/bits/stl_deque.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h index e4c53d5..7fa9b0b 100644 --- a/libstdc++-v3/include/bits/stl_deque.h +++ b/libstdc++-v3/include/bits/stl_deque.h @@ -370,7 +370,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER operator-(const _Self& __x, const _Self& __y) _GLIBCXX_NOEXCEPT { return difference_type(_S_buffer_size()) - * (__x._M_node - __y._M_node - int(__x._M_node != 0)) + * (__x._M_node - __y._M_node - bool(__x._M_node)) + (__x._M_cur - __x._M_first) + (__y._M_last - __y._M_cur); } @@ -383,10 +383,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_NODISCARD friend difference_type operator-(const _Self& __x, - const _Deque_iterator<_Tp, _RefR, _PtrR>& __y) _GLIBCXX_NOEXCEPT + const _Deque_iterator<_Tp, _RefR, _PtrR>& __y) + _GLIBCXX_NOEXCEPT { return difference_type(_S_buffer_size()) - * (__x._M_node - __y._M_node - int(__x._M_node != 0)) + * (__x._M_node - __y._M_node - bool(__x._M_node)) + (__x._M_cur - __x._M_first) + (__y._M_last - __y._M_cur); } |