From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id E4A5B3858D39; Wed, 13 Dec 2023 12:36:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E4A5B3858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1702471009; bh=juuU0r06Z1BbFXOsbxw1POa31vzeTR7vJthd5TWNHqU=; h=From:To:Subject:Date:From; b=hRmdN/ARkgByJGNkZI2rE67UyjOmylvUrKYDjj7LFymLAARcsUCw7tJUrhZ3ql4ct ttsMng8CLjNGzU4CD5BL0rB/m8Xh9nW0DgWE9YPoxZrZXBklxW6qV8R8a93Ye0Pyz+ 8/p9njR8BJgL36kVNcuMw//W593uWPvefULOrapg= 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-8153] libstdc++: Fix regression in std::format output of %Y for negative years X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: 3b23038aed019734569ca7d27b3e2c89d0dd0a9a X-Git-Newrev: 3f484839f9768ba4071dcd9d6a0f7ba41319fbab Message-Id: <20231213123649.E4A5B3858D39@sourceware.org> Date: Wed, 13 Dec 2023 12:36:49 +0000 (GMT) List-Id: https://gcc.gnu.org/g:3f484839f9768ba4071dcd9d6a0f7ba41319fbab commit r13-8153-g3f484839f9768ba4071dcd9d6a0f7ba41319fbab Author: Jonathan Wakely Date: Wed Dec 13 12:00:45 2023 +0000 libstdc++: Fix regression in std::format output of %Y for negative years The change in r14-6468-ga01462ae8bafa8 was only supposed to apply to %C formats, not %Y. libstdc++-v3/ChangeLog: * include/bits/chrono_io.h (__formatter_chrono::_M_C_y_Y): Do not round century down for %Y formats. (cherry picked from commit ad537ccd525fd3af759febd6c0936f82de808a70) Diff: --- libstdc++-v3/include/bits/chrono_io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/chrono_io.h b/libstdc++-v3/include/bits/chrono_io.h index c422435f7f3..c94adff3cec 100644 --- a/libstdc++-v3/include/bits/chrono_io.h +++ b/libstdc++-v3/include/bits/chrono_io.h @@ -831,7 +831,7 @@ namespace __format { __s.assign(1, _S_plus_minus[1]); // For floored division -123//100 is -2 and -100//100 is -1 - if ((__ci * 100) != __yi) + if (__conv == 'C' && (__ci * 100) != __yi) ++__ci; } if (__ci >= 100) [[unlikely]]