From 8a430faf4c908f12c772ea6e0ea502d64fd11319 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 12 Aug 2025 22:57:13 -0500 Subject: [PATCH] [keel] Cleanup --- src/olympic/keel/include/keel/asset.hpp | 10 ++++----- .../keel/include/keel/assetmanager.hpp | 10 ++++----- src/olympic/keel/include/keel/context.hpp | 4 ++-- src/olympic/keel/include/keel/media.hpp | 22 +++++++++---------- src/olympic/keel/include/keel/module.hpp | 2 +- src/olympic/keel/include/keel/pack.hpp | 8 +++---- src/olympic/keel/include/keel/typeconv.hpp | 14 ++++++------ src/olympic/keel/include/keel/typestore.hpp | 2 +- src/olympic/keel/src/asset.cpp | 14 +++++------- src/olympic/keel/src/keel.cpp | 2 +- src/olympic/keel/src/media.cpp | 16 +++++++------- src/olympic/keel/src/module.cpp | 4 ++-- src/olympic/keel/src/pack-applib.cpp | 2 +- src/olympic/keel/src/pack.cpp | 4 ++-- src/olympic/keel/src/typeconv.cpp | 14 ++++++------ src/olympic/keel/src/typestore.cpp | 2 +- src/olympic/keel/test/tests.cpp | 2 +- 17 files changed, 65 insertions(+), 67 deletions(-) diff --git a/src/olympic/keel/include/keel/asset.hpp b/src/olympic/keel/include/keel/asset.hpp index 1dd05489..eccdf4b6 100644 --- a/src/olympic/keel/include/keel/asset.hpp +++ b/src/olympic/keel/include/keel/asset.hpp @@ -13,11 +13,11 @@ namespace keel { constexpr auto K1HdrSz = 40; -ox::Result readUuidHeader(ox::BufferView buff) noexcept; +ox::Result readUuidHeader(ox::BufferView const &buff) noexcept; ox::Result regenerateUuidHeader(ox::Buffer &buff) noexcept; -ox::Error writeUuidHeader(ox::Writer_c auto &writer, ox::UUID const&uuid) noexcept { +ox::Error writeUuidHeader(ox::Writer_c auto &writer, ox::UUID const &uuid) noexcept { OX_RETURN_ERROR(write(writer, "K1;")); OX_RETURN_ERROR(uuid.toString(writer)); return writer.put(';'); @@ -35,15 +35,15 @@ ox::Result readAsset(ox::BufferView buff) noexcept { return out; } -ox::Result readAsset(ox::TypeStore &ts, ox::BufferView buff) noexcept; +ox::Result readAsset(ox::TypeStore &ts, ox::BufferView const &buff) noexcept; struct AssetHdr { ox::UUID uuid; ox::ClawHeader clawHdr; }; -ox::Result readAssetTypeId(ox::BufferView buff) noexcept; +ox::Result readAssetTypeId(ox::BufferView const &buff) noexcept; -ox::Result readAssetHeader(ox::BufferView buff) noexcept; +ox::Result readAssetHeader(ox::BufferView const &buff) noexcept; } diff --git a/src/olympic/keel/include/keel/assetmanager.hpp b/src/olympic/keel/include/keel/assetmanager.hpp index 2719e455..d462e123 100644 --- a/src/olympic/keel/include/keel/assetmanager.hpp +++ b/src/olympic/keel/include/keel/assetmanager.hpp @@ -351,23 +351,23 @@ class AssetManager { template class AssetRef { private: - T const* m_obj = nullptr; + T const *m_obj = nullptr; public: constexpr AssetRef() noexcept = default; - explicit constexpr AssetRef(T const*obj) noexcept: m_obj(obj) { + explicit constexpr AssetRef(T const *obj) noexcept: m_obj(obj) { } - constexpr T const*get() const noexcept { + constexpr T const *get() const noexcept { return m_obj; } - constexpr T const&operator*() const & noexcept { + constexpr T const &operator*() const & noexcept { return *m_obj; } - constexpr T const*operator->() const noexcept { + constexpr T const *operator->() const noexcept { return m_obj; } diff --git a/src/olympic/keel/include/keel/context.hpp b/src/olympic/keel/include/keel/context.hpp index 1b3202c0..75839f10 100644 --- a/src/olympic/keel/include/keel/context.hpp +++ b/src/olympic/keel/include/keel/context.hpp @@ -35,7 +35,7 @@ class Context { }; constexpr ox::SpanView packTransforms( - [[maybe_unused]] Context const&ctx) noexcept { + [[maybe_unused]] Context const &ctx) noexcept { #ifndef OX_BARE_METAL return ctx.packTransforms; #else @@ -44,7 +44,7 @@ constexpr ox::SpanView packTransforms( } constexpr ox::SpanView converters( - [[maybe_unused]] Context const&ctx) noexcept { + [[maybe_unused]] Context const &ctx) noexcept { #ifndef OX_BARE_METAL return ctx.converters; #else diff --git a/src/olympic/keel/include/keel/media.hpp b/src/olympic/keel/include/keel/media.hpp index 4f6fd200..e53bcef5 100644 --- a/src/olympic/keel/include/keel/media.hpp +++ b/src/olympic/keel/include/keel/media.hpp @@ -29,22 +29,22 @@ OX_MODEL_BEGIN(PreloadPtr) OX_MODEL_FIELD(preloadAddr) OX_MODEL_END() -ox::Result getPreloadAddr(Context &ctx, ox::FileAddress const&addr) noexcept; +ox::Result getPreloadAddr(Context &ctx, ox::FileAddress const &addr) noexcept; ox::Result getPreloadAddr(Context &ctx, ox::StringViewCR path) noexcept; -void createUuidMapping(Context &ctx, ox::StringViewCR filePath, ox::UUID const&uuid) noexcept; +void createUuidMapping(Context &ctx, ox::StringViewCR filePath, ox::UUID const &uuid) noexcept; // map of UUIDs to paths using DuplicateSet = ox::HashMap>; ox::Result pathToUuid(Context &ctx, ox::StringViewCR path) noexcept; -ox::Result getUuid(Context &ctx, ox::FileAddress const&fileAddr) noexcept; +ox::Result getUuid(Context &ctx, ox::FileAddress const &fileAddr) noexcept; ox::Result getUuid(Context &ctx, ox::StringViewCR path) noexcept; -ox::Result getPath(Context &ctx, ox::FileAddress const&fileAddr) noexcept; +ox::Result getPath(Context &ctx, ox::FileAddress const &fileAddr) noexcept; ox::Result getPath(Context &ctx, ox::CStringViewCR fileId) noexcept; @@ -58,7 +58,7 @@ ox::Result uuidUrlToPath(Context &ctx, ox::StringViewCR uuid) n ox::Result uuidToPath(Context &ctx, ox::StringViewCR uuid) noexcept; -ox::Result uuidToPath(Context &ctx, ox::UUID const&uuid) noexcept; +ox::Result uuidToPath(Context &ctx, ox::UUID const &uuid) noexcept; [[nodiscard]] constexpr bool isUuidUrl(ox::StringViewCR path) noexcept { @@ -147,7 +147,7 @@ template ox::Result> readObj( Context &ctx, ox::StringViewCR assetId, - [[maybe_unused]] bool forceLoad = false) noexcept { + [[maybe_unused]] bool const forceLoad = false) noexcept { #ifndef OX_BARE_METAL return readObjFile(ctx, assetId, forceLoad); #else @@ -158,8 +158,8 @@ ox::Result> readObj( template ox::Result> readObj( Context &ctx, - ox::FileAddress const&file, - [[maybe_unused]] bool forceLoad = false) noexcept { + ox::FileAddress const &file, + [[maybe_unused]] bool const forceLoad = false) noexcept { #ifndef OX_BARE_METAL OX_REQUIRE(assetId, file.getPath()); return readObj(ctx, ox::StringView(assetId), forceLoad); @@ -176,9 +176,9 @@ ox::Result> readObj( template ox::Error writeObj( Context &ctx, - ox::FileAddress const&file, - T const&obj, - ox::ClawFormat fmt = ox::ClawFormat::Metal) noexcept { + ox::FileAddress const &file, + T const &obj, + ox::ClawFormat const fmt = ox::ClawFormat::Metal) noexcept { OX_REQUIRE(objBuff, ox::writeClaw(obj, fmt)); return ctx.rom->write(file, objBuff.data(), objBuff.size()); } diff --git a/src/olympic/keel/include/keel/module.hpp b/src/olympic/keel/include/keel/module.hpp index f0ce8bf6..0053e803 100644 --- a/src/olympic/keel/include/keel/module.hpp +++ b/src/olympic/keel/include/keel/module.hpp @@ -40,6 +40,6 @@ class Module { void registerModule(Module const*mod) noexcept; [[nodiscard]] -ox::Vector const&modules() noexcept; +ox::Vector const &modules() noexcept; } diff --git a/src/olympic/keel/include/keel/pack.hpp b/src/olympic/keel/include/keel/pack.hpp index 97f19c00..33f3e824 100644 --- a/src/olympic/keel/include/keel/pack.hpp +++ b/src/olympic/keel/include/keel/pack.hpp @@ -125,7 +125,7 @@ ox::Error preloadObj( OX_RETURN_ERROR(err); keel::PreloadPtr const p{.preloadAddr = a}; OX_RETURN_ERROR(ox::writeMC(p).moveTo(buff)); - auto const&pbufSz = pl.buff().size(); + auto const &pbufSz = pl.buff().size(); oxOutf("preloaded {} as a {} @ {} to {} / {}, total size: {}\n", path, obj.type()->typeName, a, a + size, pbufSz - 1, pbufSz - a); } else { @@ -148,7 +148,7 @@ ox::Error preloadDir( // copy oxTracef("pack.preload", "path: {}", path); OX_REQUIRE(fileList, romFs.ls(path)); - for (auto const&name : fileList) { + for (auto const &name : fileList) { auto const filePath = ox::sfmt("{}{}", path, name); OX_REQUIRE(stat, romFs.stat(filePath)); if (stat.fileType == ox::FileType::Directory) { @@ -169,7 +169,7 @@ ox::Error preloadDir( } template -ox::Error appendBinary(ox::Buffer &binBuff, ox::SpanView const&fsBuff, ox::Preloader &pl) noexcept { +ox::Error appendBinary(ox::Buffer &binBuff, ox::SpanView const &fsBuff, ox::Preloader &pl) noexcept { constexpr auto padbin = [](ox::BufferWriter &w, unsigned factor) noexcept -> ox::Error { return w.write(nullptr, factor - w.buff().size() % factor); }; @@ -185,7 +185,7 @@ ox::Error appendBinary(ox::Buffer &binBuff, ox::SpanView const&fsBuff, ox: OX_RETURN_ERROR(padbin(w, hdrSize)); OX_RETURN_ERROR(w.write(preloadHdr.data(), preloadHdr.bytes())); OX_RETURN_ERROR(pl.offsetPtrs(binBuff.size())); - auto const&plBuff = pl.buff(); + auto const &plBuff = pl.buff(); OX_RETURN_ERROR(w.write(plBuff.data(), plBuff.size())); return {}; } diff --git a/src/olympic/keel/include/keel/typeconv.hpp b/src/olympic/keel/include/keel/typeconv.hpp index 62fc0752..df3232fb 100644 --- a/src/olympic/keel/include/keel/typeconv.hpp +++ b/src/olympic/keel/include/keel/typeconv.hpp @@ -122,7 +122,7 @@ class BaseConverter { virtual ox::Result> convertPtrToPtr(keel::Context &ctx, Wrap &src) const noexcept = 0; virtual ox::Result> convertBuffToPtr( - Context &ctx, ox::BufferView const&srcBuff) const noexcept = 0; + Context &ctx, ox::BufferView const &srcBuff) const noexcept = 0; [[nodiscard]] constexpr bool matches( @@ -187,7 +187,7 @@ class ConverterFunc final: public BaseConverter { } ox::Result> convertBuffToPtr( - Context &ctx, ox::BufferView const&srcBuff) const noexcept override { + Context &ctx, ox::BufferView const &srcBuff) const noexcept override { OX_REQUIRE_M(src, readAsset(srcBuff)); ox::Result> dst{makeWrap()}; OX_RETURN_ERROR(convert(ctx, src, wrapCast(*dst.value))); @@ -220,7 +220,7 @@ class Converter { ox::Result> convert( Context &ctx, - ox::BufferView const&srcBuffer, + ox::BufferView const &srcBuffer, ox::StringViewCR dstTypeName, int dstTypeVersion) noexcept; @@ -241,7 +241,7 @@ ox::Result> convert( ox::Result> convert( Context &ctx, - auto const&src, + auto const &src, ox::StringViewCR dstTypeName, int const dstTypeVersion) noexcept { auto srcCpy = src; @@ -258,13 +258,13 @@ ox::Result convertObjToObj( } template -ox::Result convert(Context &ctx, ox::BufferView const&src) noexcept { +ox::Result convert(Context &ctx, ox::BufferView const &src) noexcept { OX_REQUIRE(out, convert(ctx, src, ox::ModelTypeName_v, ox::ModelTypeVersion_v)); return std::move(wrapCast(*out)); } template -ox::Error convert(Context &ctx, ox::BufferView const&buff, DstType &outObj) noexcept { +ox::Error convert(Context &ctx, ox::BufferView const &buff, DstType &outObj) noexcept { OX_REQUIRE(out, convert(ctx, buff, ox::ModelTypeName_v, ox::ModelTypeVersion_v)); outObj = std::move(wrapCast(*out)); return {}; @@ -279,7 +279,7 @@ ox::Error convertObjToObj(Context &ctx, auto &src, DstType &outObj) noexcept { template ox::Result convertBuffToBuff( - Context &ctx, ox::BufferView const&src, ox::ClawFormat const fmt) noexcept { + Context &ctx, ox::BufferView const &src, ox::ClawFormat const fmt) noexcept { OX_REQUIRE(out, convert(ctx, src, ox::ModelTypeName_v, ox::ModelTypeVersion_v)); return ox::writeClaw(wrapCast(*out), fmt); } diff --git a/src/olympic/keel/include/keel/typestore.hpp b/src/olympic/keel/include/keel/typestore.hpp index 106b91b0..00538b25 100644 --- a/src/olympic/keel/include/keel/typestore.hpp +++ b/src/olympic/keel/include/keel/typestore.hpp @@ -16,7 +16,7 @@ class TypeStore: public ox::TypeStore { ox::String m_descPath; public: - explicit TypeStore(ox::FileSystem &fs, ox::StringView descPath) noexcept; + explicit TypeStore(ox::FileSystem &fs, ox::StringViewCR descPath) noexcept; protected: ox::Result> loadDescriptor(ox::StringView typeId) noexcept override; diff --git a/src/olympic/keel/src/asset.cpp b/src/olympic/keel/src/asset.cpp index bbe9cb90..3cf8d7e1 100644 --- a/src/olympic/keel/src/asset.cpp +++ b/src/olympic/keel/src/asset.cpp @@ -6,7 +6,7 @@ namespace keel { -ox::Result readUuidHeader(ox::BufferView buff) noexcept { +ox::Result readUuidHeader(ox::BufferView const &buff) noexcept { if (buff.size() < K1HdrSz) [[unlikely]] { return ox::Error{1, "Insufficient data to contain complete Keel header"}; } @@ -27,16 +27,15 @@ ox::Result regenerateUuidHeader(ox::Buffer &buff) noexcept { return id; } -ox::Result readAsset(ox::TypeStore &ts, ox::BufferView buff) noexcept { +ox::Result readAsset(ox::TypeStore &ts, ox::BufferView const &buff) noexcept { std::size_t offset = 0; if (!readUuidHeader(buff).error) { offset = K1HdrSz; } - buff += offset; - return ox::readClaw(ts, buff); + return ox::readClaw(ts, buff + offset); } -ox::Result readAssetTypeId(ox::BufferView const buff) noexcept { +ox::Result readAssetTypeId(ox::BufferView const &buff) noexcept { auto const err = readUuidHeader(buff).error; auto const offset = err ? 0u : K1HdrSz; if (offset >= buff.size()) [[unlikely]] { @@ -45,15 +44,14 @@ ox::Result readAssetTypeId(ox::BufferView const buff) noexcept { return ox::readClawTypeId(buff + offset); } -ox::Result readAssetHeader(ox::BufferView buff) noexcept { +ox::Result readAssetHeader(ox::BufferView const &buff) noexcept { ox::Result out; auto const err = readUuidHeader(buff).moveTo(out.value.uuid); auto const offset = err ? 0u : K1HdrSz; if (offset >= buff.size()) [[unlikely]] { return ox::Error(1, "Buffer too small for expected data"); } - buff += offset; - OX_RETURN_ERROR(ox::readClawHeader(buff).moveTo(out.value.clawHdr)); + OX_RETURN_ERROR(ox::readClawHeader(buff + offset).moveTo(out.value.clawHdr)); return out; } diff --git a/src/olympic/keel/src/keel.cpp b/src/olympic/keel/src/keel.cpp index a6b07f94..e31d2c66 100644 --- a/src/olympic/keel/src/keel.cpp +++ b/src/olympic/keel/src/keel.cpp @@ -16,7 +16,7 @@ static ox::Error init( setRomFs(ctx, std::move(fs), *duplicateSet) : setRomFs(ctx, std::move(fs)); #ifndef OX_BARE_METAL - auto const&mods = modules(); + auto const &mods = modules(); for (auto &mod : mods) { // register type converters for (auto const c : mod->converters()) { diff --git a/src/olympic/keel/src/media.cpp b/src/olympic/keel/src/media.cpp index 24c2ccb5..a8f44ef2 100644 --- a/src/olympic/keel/src/media.cpp +++ b/src/olympic/keel/src/media.cpp @@ -24,10 +24,10 @@ ox::Result loadRom(ox::StringViewCR path) noexcept { auto buff = new char[static_cast(size)]; file.read(buff, size); return buff; - } catch (std::ios_base::failure const&e) { + } catch (std::ios_base::failure const &e) { oxErrorf("Could not read ROM file due to file IO failure: {}", e.what()); return ox::Error(2, "Could not read ROM file"); - } catch (std::bad_alloc const&e) { + } catch (std::bad_alloc const &e) { oxErrorf("Could not read ROM file due to new failure: {}", e.what()); return ox::Error(2, "Could not allocate memory for ROM file"); } @@ -42,14 +42,14 @@ static void clearUuidMap(Context &ctx) noexcept { ctx.pathToUuid.clear(); } -void createUuidMapping(Context &ctx, ox::StringViewCR filePath, ox::UUID const&uuid) noexcept { +void createUuidMapping(Context &ctx, ox::StringViewCR filePath, ox::UUID const &uuid) noexcept { ctx.pathToUuid[filePath] = uuid; ctx.uuidToPath[uuid.toString()] = filePath; } static ox::Error buildUuidMap(Context &ctx, ox::StringViewCR path, DuplicateSet *duplicates) noexcept { OX_REQUIRE(files, ctx.rom->ls(path)); - for (auto const&f : files) { + for (auto const &f : files) { OX_REQUIRE_M(filePath, ox::join("/", ox::Array{path, f})); OX_REQUIRE(stat, ctx.rom->stat(filePath)); if (stat.fileType == ox::FileType::NormalFile) { @@ -97,7 +97,7 @@ ox::Result pathToUuid(Context &ctx, ox::StringViewCR path) noexcept { #endif } -ox::Result getUuid(Context &ctx, ox::FileAddress const&fileAddr) noexcept { +ox::Result getUuid(Context &ctx, ox::FileAddress const &fileAddr) noexcept { OX_REQUIRE(path, fileAddr.getPath()); return getUuid(ctx, path); } @@ -111,7 +111,7 @@ ox::Result getUuid(Context &ctx, ox::StringViewCR path) noexcept { } } -ox::Result getPath(Context &ctx, ox::FileAddress const&fileAddr) noexcept { +ox::Result getPath(Context &ctx, ox::FileAddress const &fileAddr) noexcept { OX_REQUIRE(path, fileAddr.getPath()); if (beginsWith(path, "uuid://")) { auto const uuid = substr(path, 7); @@ -173,7 +173,7 @@ ox::Result uuidToPath(Context &ctx, ox::StringViewCR uuid) noex #endif } -ox::Result uuidToPath(Context &ctx, ox::UUID const&uuid) noexcept { +ox::Result uuidToPath(Context &ctx, ox::UUID const &uuid) noexcept { #ifndef OX_BARE_METAL OX_REQUIRE_M(out, ctx.uuidToPath.at(uuid.toString())); return ox::CStringView(*out); @@ -240,7 +240,7 @@ ox::Result getPreloadAddr(keel::Context &ctx, ox::StringViewCR path return static_cast(p.preloadAddr) + ctx.preloadSectionOffset; } -ox::Result getPreloadAddr(keel::Context &ctx, ox::FileAddress const&addr) noexcept { +ox::Result getPreloadAddr(keel::Context &ctx, ox::FileAddress const &addr) noexcept { OX_REQUIRE(stat, ctx.rom->stat(addr)); OX_REQUIRE(buff, static_cast(*ctx.rom).directAccess(addr)); PreloadPtr p; diff --git a/src/olympic/keel/src/module.cpp b/src/olympic/keel/src/module.cpp index 38ba4ec7..d66828a7 100644 --- a/src/olympic/keel/src/module.cpp +++ b/src/olympic/keel/src/module.cpp @@ -8,14 +8,14 @@ namespace keel { static ox::Vector mods; -void registerModule(Module const*mod) noexcept { +void registerModule(Module const *mod) noexcept { if (mod) { mods.emplace_back(mod); } } [[nodiscard]] -ox::Vector const&modules() noexcept { +ox::Vector const &modules() noexcept { return mods; } diff --git a/src/olympic/keel/src/pack-applib.cpp b/src/olympic/keel/src/pack-applib.cpp index 953230b2..a76da0bb 100644 --- a/src/olympic/keel/src/pack-applib.cpp +++ b/src/olympic/keel/src/pack-applib.cpp @@ -32,7 +32,7 @@ static ox::Result readFileBuff(ox::StringViewCR path) noexcept { file.seekg(0, std::ios::beg); file.read(buff.data(), static_cast(buff.size())); return buff; - } catch (std::ios_base::failure const&e) { + } catch (std::ios_base::failure const &e) { oxErrorf("Could not read OxFS file: {}", e.what()); return ox::Error(2, "Could not read OxFS file"); } diff --git a/src/olympic/keel/src/pack.cpp b/src/olympic/keel/src/pack.cpp index 5017626a..54c06d97 100644 --- a/src/olympic/keel/src/pack.cpp +++ b/src/olympic/keel/src/pack.cpp @@ -144,7 +144,7 @@ static ox::Error transformClaw( // copy oxTracef("pack.transformClaw", "path: {}", path); OX_REQUIRE(fileList, dest.ls(path)); - for (auto const&name : fileList) { + for (auto const &name : fileList) { auto const filePath = ox::sfmt("{}{}", path, name); OX_REQUIRE(stat, dest.stat(filePath)); if (stat.fileType == ox::FileType::Directory) { @@ -171,7 +171,7 @@ static ox::Error copy( auto const childLogPrefix = ox::sfmt("{}\t", logPrefix); // copy OX_REQUIRE(fileList, src.ls(path)); - for (auto const&name : fileList) { + for (auto const &name : fileList) { auto const currentFile = ox::sfmt("{}{}", path, name); if (beginsWith(name, ".")) { continue; diff --git a/src/olympic/keel/src/typeconv.cpp b/src/olympic/keel/src/typeconv.cpp index 07db4ece..aa4f3dcd 100644 --- a/src/olympic/keel/src/typeconv.cpp +++ b/src/olympic/keel/src/typeconv.cpp @@ -9,12 +9,12 @@ namespace keel { static ox::Result findConverter( - ox::SpanView const&converters, + ox::SpanView const &converters, ox::StringViewCR srcTypeName, int const srcTypeVersion, ox::StringViewCR dstTypeName, int const dstTypeVersion) noexcept { - for (auto const&c : converters) { + for (auto const &c : converters) { if (c.converter().matches(srcTypeName, srcTypeVersion, dstTypeName, dstTypeVersion)) { return &c.converter(); } @@ -22,17 +22,17 @@ static ox::Result findConverter( return ox::Error{1, "Could not find converter"}; }; -static ox::Result> convert(BaseConverter const&c, Context &ctx, ox::BufferView const&src) noexcept { +static ox::Result> convert(BaseConverter const &c, Context &ctx, ox::BufferView const &src) noexcept { return c.convertBuffToPtr(ctx, src); } -static ox::Result> convert(BaseConverter const&c, Context &ctx, Wrap &src) noexcept { +static ox::Result> convert(BaseConverter const &c, Context &ctx, Wrap &src) noexcept { return c.convertPtrToPtr(ctx, src); } static ox::Result> convert( Context &ctx, - ox::SpanView const&converters, + ox::SpanView const &converters, auto &src, ox::StringViewCR srcTypeName, int const srcTypeVersion, @@ -45,7 +45,7 @@ static ox::Result> convert( return convert(*c, ctx, src); } // try to chain multiple converters - for (auto const&subConverter : converters) { + for (auto const &subConverter : converters) { if (!subConverter.converter().dstMatches(dstTypeName, dstTypeVersion)) { continue; } @@ -61,7 +61,7 @@ static ox::Result> convert( ox::Result> convert( Context &ctx, - ox::BufferView const&srcBuffer, + ox::BufferView const &srcBuffer, ox::StringViewCR dstTypeName, int const dstTypeVersion) noexcept { OX_REQUIRE(hdr, readAssetHeader(srcBuffer)); diff --git a/src/olympic/keel/src/typestore.cpp b/src/olympic/keel/src/typestore.cpp index fb7970a5..c14653f1 100644 --- a/src/olympic/keel/src/typestore.cpp +++ b/src/olympic/keel/src/typestore.cpp @@ -6,7 +6,7 @@ namespace keel { -TypeStore::TypeStore(ox::FileSystem &fs, ox::StringView descPath) noexcept: +TypeStore::TypeStore(ox::FileSystem &fs, ox::StringViewCR descPath) noexcept: m_fs(fs), m_descPath(descPath) { } diff --git a/src/olympic/keel/test/tests.cpp b/src/olympic/keel/test/tests.cpp index e78280d7..52dfc7c6 100644 --- a/src/olympic/keel/test/tests.cpp +++ b/src/olympic/keel/test/tests.cpp @@ -25,7 +25,7 @@ static std::map tests = { }, }; -int main(int argc, char const **argv) { +int main(int const argc, char const **argv) { int retval = -1; if (argc > 0) { auto const args = ox::Span{argv, static_cast(argc)};