diff --git a/deps/ox/src/ox/ser/desctypes.hpp b/deps/ox/src/ox/ser/desctypes.hpp index e2ae3779..6aba5939 100644 --- a/deps/ox/src/ox/ser/desctypes.hpp +++ b/deps/ox/src/ox/ser/desctypes.hpp @@ -8,6 +8,7 @@ #pragma once +#include #include #include #include @@ -116,8 +117,8 @@ struct DescriptorType { template -int ioOp(T *io, DescriptorType *type) { - int32_t err = 0; +Error ioOp(T *io, DescriptorType *type) { + Error err = 0; io->setTypeInfo("ox::DescriptorType", 4); err |= io->op("typeName", &type->typeName); err |= io->op("primitiveType", &type->primitiveType); @@ -127,8 +128,8 @@ int ioOp(T *io, DescriptorType *type) { } template -int ioOpWrite(T *io, DescriptorField *field) { - int32_t err = 0; +Error ioOpWrite(T *io, DescriptorField *field) { + Error err = 0; io->setTypeInfo("ox::DescriptorField", 4); if (field->ownsType) { err |= io->op("typeName", ""); @@ -145,8 +146,8 @@ int ioOpWrite(T *io, DescriptorField *field) { } template -int ioOpRead(T *io, DescriptorField *field) { - int32_t err = 0; +Error ioOpRead(T *io, DescriptorField *field) { + Error err = 0; auto &typeStore = io->typeStore(); io->setTypeInfo("ox::DescriptorField", 4); err |= io->op("typeName", &field->typeName); diff --git a/deps/ox/src/ox/ser/optype.hpp b/deps/ox/src/ox/ser/optype.hpp index 19ec49df..45b68119 100644 --- a/deps/ox/src/ox/ser/optype.hpp +++ b/deps/ox/src/ox/ser/optype.hpp @@ -37,11 +37,11 @@ ox::Error ioOpWriteDefinition(T*, O*) { template ox::Error ioOp(T *io, O *obj) { - if constexpr (T::opType() == ox::OpType::Read) { + if constexpr(T::opType() == ox::OpType::Read) { return ioOpRead(io, obj); - } else if constexpr (T::opType() == ox::OpType::Write) { + } else if constexpr(T::opType() == ox::OpType::Write) { return ioOpWrite(io, obj); - } else if constexpr (T::opType() == ox::OpType::WriteDefinition) { + } else if constexpr(T::opType() == ox::OpType::WriteDefinition) { return ioOpWriteDefinition(io, obj); } return OxError(1);