tycho: make it actually compile (also fuck std::byte actually)
parent
a79f814d3c
commit
004989ab58
|
@ -38,6 +38,8 @@ enum class ProjectType
|
||||||
Map,
|
Map,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
using byte = std::uint8_t;
|
||||||
|
|
||||||
// Interfaces ----------------------------------------------------------------|
|
// Interfaces ----------------------------------------------------------------|
|
||||||
|
|
||||||
class ProjectModel
|
class ProjectModel
|
||||||
|
@ -182,9 +184,12 @@ void dbgPrint([[maybe_unused]] char const *fmt, [[maybe_unused]] VA &&...va)
|
||||||
#define dbgPrintFunc() dbgPrint("%s", __func__)
|
#define dbgPrintFunc() dbgPrint("%s", __func__)
|
||||||
|
|
||||||
constexpr
|
constexpr
|
||||||
std::uint32_t fourCC(std::byte a, std::byte b, std::byte c, std::byte d)
|
std::uint32_t fourCC(byte a, byte b, byte c, byte d)
|
||||||
{
|
{
|
||||||
return (a << 24) | (b << 16) | (c << 8) | d;
|
return (static_cast<std::uint32_t>(a) << 24) |
|
||||||
|
(static_cast<std::uint32_t>(b) << 16) |
|
||||||
|
(static_cast<std::uint32_t>(c) << 8) |
|
||||||
|
static_cast<std::uint32_t>(d);
|
||||||
}
|
}
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
Loading…
Reference in New Issue