diff --git a/src/span.h b/src/span.h index 47390a5bb2f..b627b993c27 100644 --- a/src/span.h +++ b/src/span.h @@ -243,16 +243,21 @@ T& SpanPopBack(Span& 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(data); } +inline std::byte* BytePtr(void* data) { return reinterpret_cast(data); } + // From C++20 as_bytes and as_writeable_bytes template Span AsBytes(Span s) noexcept { - return {reinterpret_cast(s.data()), s.size_bytes()}; + return {BytePtr(s.data()), s.size_bytes()}; } template Span AsWritableBytes(Span s) noexcept { - return {reinterpret_cast(s.data()), s.size_bytes()}; + return {BytePtr(s.data()), s.size_bytes()}; } template