From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 4B4A13858C2A; Sat, 9 Dec 2023 22:04:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4B4A13858C2A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1702159490; bh=rXmzttepE1nbzy9G2/k/B8ksOo8EXfKR19XAojs7jg8=; h=From:To:Subject:Date:From; b=AOTwsEK6h9ipFMTeDcTVULc3UE57KeS7fQmy9sIVIz1JUALlRznWnK4ZTh3UD8v8X XllOW2XkUa72ZDqHxsHBDiafhLPA5V847SXnICh7kJsLrwo1im3o/gWSWx3nvOnjBB 7EMrVfmJQ7QWH6B2Ptg37PUweGVe49DLJEKYNslo= 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-8139] libstdc++: Fix misleading typedef name in X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: d62feab6aa7d023f7ba916f1618b8a6137ac5659 X-Git-Newrev: 1f10823731394b19b4d2e466b35cdccd18efba37 Message-Id: <20231209220450.4B4A13858C2A@sourceware.org> Date: Sat, 9 Dec 2023 22:04:50 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1f10823731394b19b4d2e466b35cdccd18efba37 commit r13-8139-g1f10823731394b19b4d2e466b35cdccd18efba37 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. (cherry picked from commit cab0083dc72dfd22a1b2016b068f9313beb7f091) 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 a48bb2e161d..88510ccf60e 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -2587,7 +2587,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: @@ -2646,7 +2645,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)};