[committed] libstdc++: Fix misleading typedef name in <format>

Message ID 20231207205720.950537-1-jwakely@redhat.com
State Committed
Commit cab0083dc72dfd22a1b2016b068f9313beb7f091
Headers
Series [committed] libstdc++: Fix misleading typedef name in <format> |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 warning Patch is already merged
linaro-tcwg-bot/tcwg_gcc_build--master-arm warning Patch is already merged

Commit Message

Jonathan Wakely Dec. 7, 2023, 8:57 p.m. UTC
  Tested x86_64-linux. Pushed to trunk.

-- >8 --

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<charT, contiguous_iterator>):
	Remove uint64_t local type.
---
 libstdc++-v3/include/std/format | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
  

Patch

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<iter_value_t<_OutIter>, _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<uint64_t>(__ptr) % 1024;
+	const auto __off = reinterpret_cast<__UINTPTR_TYPE__>(__ptr) % 1024;
 	__n = (1024 - __off) / sizeof(_CharT);
 	if (__n > 0) [[likely]]
 	  return {__ptr, static_cast<size_t>(__n)};