From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id D73DE3857838; Sat, 19 Nov 2022 15:08:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D73DE3857838 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668870496; bh=+tJTVK3cHhtgJ7AzxJWlFUtdrOMp5n6T2IvP03SPc/g=; h=From:To:Subject:Date:From; b=uSQAWxdqv6a6H+6pTVxIz0ExcLsdm+1a8g7KYIahi2Ft/n9a8/rRCmfFq8wgqkAIs Zu06OznDnTGMyZziCQlO8q7QgntKJ21llmQqOhs3cZJoB8u317P/gywmRhtaHKAMWP cqnlRsmHvbToC7S5AFKVC/D1gQZmV8SITT7JvUm8= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-4169] libstdc++: Fix -Wsign-compare warnings in std::format X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: fca0f50b145048afda17f0f10ac968afe6be0fad X-Git-Newrev: 18169e8eee1887cdd200897c30ac26bec8721729 Message-Id: <20221119150816.D73DE3857838@sourceware.org> Date: Sat, 19 Nov 2022 15:08:16 +0000 (GMT) List-Id: https://gcc.gnu.org/g:18169e8eee1887cdd200897c30ac26bec8721729 commit r13-4169-g18169e8eee1887cdd200897c30ac26bec8721729 Author: Jonathan Wakely Date: Fri Nov 18 21:06:18 2022 +0000 libstdc++: Fix -Wsign-compare warnings in std::format libstdc++-v3/ChangeLog: * include/std/format: Fix -Wsign-compare warnings. Diff: --- libstdc++-v3/include/std/format | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index f4fc85a16d2..561ae161d16 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -291,7 +291,7 @@ namespace __format } else { - constexpr size_t __n = 32; + constexpr int __n = 32; char __buf[__n]{}; for (int __i = 0; __i < __n && __first != __last; ++__i) __buf[__i] = __first[__i]; @@ -1544,7 +1544,7 @@ namespace __format if (size_t __extras = int(__d == __p) + __z) { - if (__dynbuf.empty() && __extras <= (__end - __res.ptr)) + if (__dynbuf.empty() && __extras <= size_t(__end - __res.ptr)) { // Move exponent to make space for extra chars. __builtin_memmove(__start + __p + __extras, @@ -2357,7 +2357,7 @@ namespace __format _M_write(_CharT __c) { *_M_next++ = __c; - if (_M_next - _M_span.begin() == _M_span.size()) [[unlikely]] + if (_M_next - _M_span.begin() == std::ssize(_M_span)) [[unlikely]] _M_overflow(); } @@ -2469,7 +2469,7 @@ namespace __format auto __used = this->_M_used(); if (_M_max < 0) // No maximum. _M_out = ranges::copy(__used, std::move(_M_out)).out; - else if (_M_count < _M_max) + else if (_M_count < size_t(_M_max)) { auto __max = _M_max - _M_count; span<_CharT> __first;