diff --git a/deps/ox/src/ox/claw/write.hpp b/deps/ox/src/ox/claw/write.hpp index 94347f91..6234dc61 100644 --- a/deps/ox/src/ox/claw/write.hpp +++ b/deps/ox/src/ox/claw/write.hpp @@ -77,7 +77,7 @@ Result writeClawHeader(T *t, ClawFormat fmt) noexcept { out += tn; } out += ";"; - return std::move(out); + return out; } } @@ -89,7 +89,7 @@ Result writeClaw(T *t, ClawFormat fmt) { Buffer out(header.len() + data.size()); memcpy(out.data(), header.data(), header.len()); memcpy(out.data() + header.len(), data.data(), data.size()); - return std::move(out); + return out; } } diff --git a/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp b/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp index 6a8f3d49..d6e75e6b 100644 --- a/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp +++ b/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp @@ -103,7 +103,7 @@ Result> PassThroughFS::ls(const char *dir) noexcept { const auto u8p = p.path().filename().u8string(); out.emplace_back(reinterpret_cast(u8p.c_str())); } - return std::move(out); + return out; } Error PassThroughFS::remove(const char *path, bool recursive) noexcept { diff --git a/deps/ox/src/ox/mc/write.hpp b/deps/ox/src/ox/mc/write.hpp index 49116006..9ef700d1 100644 --- a/deps/ox/src/ox/mc/write.hpp +++ b/deps/ox/src/ox/mc/write.hpp @@ -231,7 +231,7 @@ Result writeMC(T *val) noexcept { MetalClawWriter writer(reinterpret_cast(buff.data()), buff.size()); oxReturnError(model(&writer, val)); buff.resize(writer.size()); - return std::move(buff); + return buff; } template diff --git a/deps/ox/src/ox/model/metadata.hpp b/deps/ox/src/ox/model/metadata.hpp index f7fd6158..f6549561 100644 --- a/deps/ox/src/ox/model/metadata.hpp +++ b/deps/ox/src/ox/model/metadata.hpp @@ -22,16 +22,14 @@ #include "typenamecatcher.hpp" #include "types.hpp" -namespace ox { - -namespace detail { +namespace ox::detail { template struct BoolWrapper { }; template> -struct preloadable : false_type { +struct preloadable: false_type { }; template @@ -58,6 +56,4 @@ struct preloadable> { // static constexpr const char *value = T::TypeName; //}; -} - } \ No newline at end of file diff --git a/deps/ox/src/ox/oc/read.hpp b/deps/ox/src/ox/oc/read.hpp index cdebd5ed..736cf192 100644 --- a/deps/ox/src/ox/oc/read.hpp +++ b/deps/ox/src/ox/oc/read.hpp @@ -228,7 +228,7 @@ template Result readOC(const char *json, std::size_t jsonLen) noexcept { T val; oxReturnError(readOC(json, jsonLen, &val)); - return std::move(val); + return val; } template diff --git a/deps/ox/src/ox/oc/write.hpp b/deps/ox/src/ox/oc/write.hpp index c7799abd..9e13621c 100644 --- a/deps/ox/src/ox/oc/write.hpp +++ b/deps/ox/src/ox/oc/write.hpp @@ -154,7 +154,7 @@ Result writeOC(T *val) noexcept { const auto str = Json::writeString(jsonBuilder, writer.m_json); Buffer buff(str.size() + 1); memcpy(buff.data(), str.c_str(), str.size() + 1); - return std::move(buff); + return buff; } }