From c61255e2d8c4b060b7c8be7c95137f500185271c Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 27 Sep 2024 15:51:56 +0100 Subject: [PATCH] libstdc++: Fix -Wsign-compare warning in std::string::resize_for_overwrite libstdc++-v3/ChangeLog: * include/bits/basic_string.tcc (resize_for_overwrite): Fix -Wsign-compare warning. * include/bits/cow_string.h (resize_for_overwrite): Likewise. (cherry picked from commit 7040c207baa6b5d5f6065a47dd3559f3d3974a1b) --- libstdc++-v3/include/bits/basic_string.tcc | 2 +- libstdc++-v3/include/bits/cow_string.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index e458c1880b2e..b7a68dd7a486 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -606,7 +606,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static_assert(__gnu_cxx::__is_integer_nonstrict::__value, "resize_and_overwrite operation must return an integer"); #endif - _GLIBCXX_DEBUG_ASSERT(__r >= 0 && __r <= __n); + _GLIBCXX_DEBUG_ASSERT(__r >= 0 && size_type(__r) <= __n); __term._M_r = size_type(__r); if (__term._M_r > __n) __builtin_unreachable(); diff --git a/libstdc++-v3/include/bits/cow_string.h b/libstdc++-v3/include/bits/cow_string.h index 36599a204235..313f235b6e6f 100644 --- a/libstdc++-v3/include/bits/cow_string.h +++ b/libstdc++-v3/include/bits/cow_string.h @@ -3790,7 +3790,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static_assert(__gnu_cxx::__is_integer_nonstrict::__value, "resize_and_overwrite operation must return an integer"); #endif - _GLIBCXX_DEBUG_ASSERT(__r >= 0 && __r <= __n); + _GLIBCXX_DEBUG_ASSERT(__r >= 0 && size_type(__r) <= __n); __term._M_r = size_type(__r); if (__term._M_r > __n) __builtin_unreachable(); -- 2.47.2