oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/SpanCast: swap the CopyConst template parameters

Browse Source
This commit is contained in:
Max Kellermann 2022-06-08 21:03:44 +02:00 committed by Max Kellermann
parent 7ad5a5efec
commit 86be7938f1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/SpanCast.hxx
View File

@ -34,7 +34,7 @@
#include <span> #include <span>
#include <string_view> #include <string_view>
template<typename From, typename To> template<typename To, typename From>
using CopyConst = std::conditional_t<std::is_const_v<From>, const To, To>; using CopyConst = std::conditional_t<std::is_const_v<From>, const To, To>;
/** /**
@ -43,7 +43,7 @@ using CopyConst = std::conditional_t<std::is_const_v<From>, const To, To>;
*/ */
template<typename T> template<typename T>
constexpr std::span<T> constexpr std::span<T>
FromBytesFloor(std::span<CopyConst<T, std::byte>> other) noexcept FromBytesFloor(std::span<CopyConst<std::byte, T>> other) noexcept
{ {
static_assert(sizeof(T) > 0, "Empty base type"); static_assert(sizeof(T) > 0, "Empty base type");
@ -51,7 +51,7 @@ FromBytesFloor(std::span<CopyConst<T, std::byte>> other) noexcept
warnings, but should we really suppress them? */ warnings, but should we really suppress them? */
return { return {
reinterpret_cast<T *>(reinterpret_cast<CopyConst<T, void> *>(other.data())), reinterpret_cast<T *>(reinterpret_cast<CopyConst<void, T> *>(other.data())),
other.size() / sizeof(T), other.size() / sizeof(T),
}; };
} }
@ -61,7 +61,7 @@ FromBytesFloor(std::span<CopyConst<T, std::byte>> other) noexcept
*/ */
template<typename T> template<typename T>
constexpr std::span<T> constexpr std::span<T>
FromBytesStrict(std::span<CopyConst<T, std::byte>> other) noexcept FromBytesStrict(std::span<CopyConst<std::byte, T>> other) noexcept
{ {
assert(other.size() % sizeof(T) == 0); assert(other.size() % sizeof(T) == 0);