From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 45F5B385840C; Thu, 7 Dec 2023 20:57:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 45F5B385840C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1701982627; bh=jAp7T26iU3/OHI3HqBk/raJCELf31hKSjCcar6p6rr4=; h=From:To:Subject:Date:From; b=h/mP9HHA+LE8OmxXF4bCfhi8TcyCydDeDFIJ7P2aQ6Rl25NW7J4+0ikFnF2nS8ijm dS4HI1m00LXFdcPWEoWxOHqxOyHSobIYkd5R8uN1RpZTl0rm2/F8NiIKgnfcv1hDob IQGG6VQ9NCK8YdoCSGchRsaE2lEizDrrmWxBsua0= 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 r14-6293] libstdc++: Fix misleading typedef name in X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 2f512f6fcdd55296daff3e01a250d866491014e6 X-Git-Newrev: cab0083dc72dfd22a1b2016b068f9313beb7f091 Message-Id: <20231207205707.45F5B385840C@sourceware.org> Date: Thu, 7 Dec 2023 20:57:07 +0000 (GMT) List-Id: https://gcc.gnu.org/g:cab0083dc72dfd22a1b2016b068f9313beb7f091 commit r14-6293-gcab0083dc72dfd22a1b2016b068f9313beb7f091 Author: Jonathan Wakely Date: Thu Dec 7 12:40:18 2023 +0000 libstdc++: Fix misleading typedef name in This local typedef for uintptr_t was accidentally named uint64_t, probably from a careless code completion shortcut. We don't need the typedef at all since it's only used once. Just use __UINTPTR_TYPE__ directly instead. libstdc++-v3/ChangeLog: * include/std/format (_Iter_sink): Remove uint64_t local type. Diff: --- libstdc++-v3/include/std/format | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index 01f0a58392a..04d03e0ceb7 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -2809,7 +2809,6 @@ namespace __format requires same_as, _CharT> class _Iter_sink<_CharT, _OutIter> : public _Sink<_CharT> { - using uint64_t = __UINTPTR_TYPE__; _OutIter _M_first; iter_difference_t<_OutIter> _M_max = -1; protected: @@ -2883,7 +2882,7 @@ namespace __format return {__ptr, __bytes / sizeof(_CharT)}; #endif // Avoid forming a pointer to a different memory page. - uint64_t __off = reinterpret_cast(__ptr) % 1024; + const auto __off = reinterpret_cast<__UINTPTR_TYPE__>(__ptr) % 1024; __n = (1024 - __off) / sizeof(_CharT); if (__n > 0) [[likely]] return {__ptr, static_cast(__n)};