partial bitcoin#23438: Use spans of std::byte in serialize

kwvg · PastaPastaPasta · commit de54b8784ca5 · 2023-09-24T09:50:50.000-05:00
includes: - fa65bbf
diff --git a/src/span.h b/src/span.h
@@ -237,16 +237,21 @@ T& SpanPopBack(Span<T>& span)
     return back;
 }
 
+//! Convert a data pointer to a std::byte data pointer.
+//! Where possible, please use the safer AsBytes helpers.
+inline const std::byte* BytePtr(const void* data) { return reinterpret_cast<const std::byte*>(data); }
+inline std::byte* BytePtr(void* data) { return reinterpret_cast<std::byte*>(data); }
+
 // From C++20 as_bytes and as_writeable_bytes
 template <typename T>
 Span<const std::byte> AsBytes(Span<T> s) noexcept
 {
-    return {reinterpret_cast<const std::byte*>(s.data()), s.size_bytes()};
+    return {BytePtr(s.data()), s.size_bytes()};
 }
 template <typename T>
 Span<std::byte> AsWritableBytes(Span<T> s) noexcept
 {
-    return {reinterpret_cast<std::byte*>(s.data()), s.size_bytes()};
+    return {BytePtr(s.data()), s.size_bytes()};
 }
 
 template <typename V>

Original file line number	Diff line number	Diff line change
`@@ -237,16 +237,21 @@ T& SpanPopBack(Span<T>& span)`
`237`	`237`	`return back;`
`238`	`238`	`}`
`239`	`239`
	`240`	`+//! Convert a data pointer to a std::byte data pointer.`
	`241`	`+//! Where possible, please use the safer AsBytes helpers.`
	`242`	`+inline const std::byte* BytePtr(const void* data) { return reinterpret_cast<const std::byte*>(data); }`
	`243`	`+inline std::byte* BytePtr(void* data) { return reinterpret_cast<std::byte*>(data); }`
	`244`	`+`
`240`	`245`	`// From C++20 as_bytes and as_writeable_bytes`
`241`	`246`	`template <typename T>`
`242`	`247`	`Span<const std::byte> AsBytes(Span<T> s) noexcept`
`243`	`248`	`{`
`244`		`- return {reinterpret_cast<const std::byte*>(s.data()), s.size_bytes()};`
	`249`	`+ return {BytePtr(s.data()), s.size_bytes()};`
`245`	`250`	`}`
`246`	`251`	`template <typename T>`
`247`	`252`	`Span<std::byte> AsWritableBytes(Span<T> s) noexcept`
`248`	`253`	`{`
`249`		`- return {reinterpret_cast<std::byte*>(s.data()), s.size_bytes()};`
	`254`	`+ return {BytePtr(s.data()), s.size_bytes()};`
`250`	`255`	`}`
`251`	`256`
`252`	`257`	`template <typename V>`