drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[ox/model] Cleanup template style

Browse Source
This commit is contained in:
Gary Talent 2022-02-26 22:47:19 -06:00
parent 9762a38a44
commit 329ecb3266
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/ox/src/ox/model/def.hpp vendored
View File

@ -8,8 +8,8 @@
#pragma once #pragma once
#define oxModelBegin(modelName) template<typename T> constexpr ox::Error model(T *io, modelName *o) noexcept { io->template setTypeInfo<modelName>(); #define oxModelBegin(modelName) constexpr ox::Error model(auto *io, modelName *o) noexcept { io->template setTypeInfo<modelName>();
#define oxModelEnd() return OxError(0); } #define oxModelEnd() return OxError(0); }
#define oxModelField(fieldName) oxReturnError(io->field(#fieldName, &o->fieldName)); #define oxModelField(fieldName) oxReturnError(io->field(#fieldName, &o->fieldName));
#define oxModelFieldRename(serFieldName, objFieldName) oxReturnError(io->field(#serFieldName, &o->objFieldName)); #define oxModelFieldRename(serFieldName, objFieldName) oxReturnError(io->field(#serFieldName, &o->objFieldName));
#define oxModelFriend(modelName) template<typename T> friend constexpr ox::Error model(T*, modelName*) noexcept #define oxModelFriend(modelName) friend constexpr ox::Error model(auto*, modelName*) noexcept

2
deps/ox/src/ox/model/desctypes.hpp vendored
View File

@ -50,7 +50,7 @@ struct DescriptorField {
/** /**
* Allow for explicit copying. * Allow for explicit copying.
*/ */
constexpr explicit DescriptorField(const DescriptorField &other) noexcept { constexpr DescriptorField(const DescriptorField &other) noexcept {
type = other.type; type = other.type;
fieldName = other.fieldName; fieldName = other.fieldName;
subscriptLevels = other.subscriptLevels; subscriptLevels = other.subscriptLevels;

6
deps/ox/src/ox/model/descwrite.hpp vendored
View File

@ -206,14 +206,12 @@ Result<UniquePtr<DescriptorType>> buildTypeDef(T *val) noexcept {
return UniquePtr<DescriptorType>{writer.definition()}; return UniquePtr<DescriptorType>{writer.definition()};
} }
template<typename T> Error writeTypeDef(uint8_t *buff, std::size_t buffLen, auto *val, std::size_t *sizeOut = nullptr) noexcept {
Error writeTypeDef(uint8_t *buff, std::size_t buffLen, T *val, std::size_t *sizeOut = nullptr) noexcept {
oxRequire(def, buildTypeDef(val)); oxRequire(def, buildTypeDef(val));
return writeType(buff, buffLen, def.get(), sizeOut); return writeType(buff, buffLen, def.get(), sizeOut);
} }
template<typename T> Result<Buffer> writeTypeDef(auto *val) noexcept {
Result<Buffer> writeTypeDef(T *val) noexcept {
Buffer buff(units::MB); Buffer buff(units::MB);
oxReturnError(writeTypeDef(buff.data(), buff.size(), val)); oxReturnError(writeTypeDef(buff.data(), buff.size(), val));
return std::move(buff); return std::move(buff);