diff --git a/deps/ox/src/ox/claw/read.hpp b/deps/ox/src/ox/claw/read.hpp index c72e542b..24f45c89 100644 --- a/deps/ox/src/ox/claw/read.hpp +++ b/deps/ox/src/ox/claw/read.hpp @@ -37,18 +37,17 @@ Result> stripClawHeader(const char *buff, std::size_t buffLen) noex template Error readClaw(const char *buff, std::size_t buffLen, T *val) { - auto header = detail::readHeader(buff, buffLen); - oxReturnError(header); - switch (header.value.fmt) { + oxRequire(header, detail::readHeader(buff, buffLen)); + switch (header.fmt) { case ClawFormat::Metal: { - MetalClawReader reader(bit_cast(header.value.data), buffLen); + MetalClawReader reader(bit_cast(header.data), buffLen); return model(&reader, val); } #ifdef OX_USE_STDLIB case ClawFormat::Organic: { - OrganicClawReader reader(bit_cast(header.value.data), buffLen); + OrganicClawReader reader(bit_cast(header.data), buffLen); return model(&reader, val); } #endif