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

[ox/claw] Fix TypeVersion writing

Browse Source
This commit is contained in:
Gary Talent 2020-05-16 22:35:33 -05:00
parent f37515707f
commit faaddd1234
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deps/ox/src/ox/claw/CMakeLists.txt vendored
View File

@ -2,6 +2,7 @@
add_library( add_library(
OxClaw OxClaw
read.cpp read.cpp
write.cpp
) )
target_link_libraries( target_link_libraries(

14
deps/ox/src/ox/claw/write.hpp vendored
View File

@ -43,6 +43,16 @@ template<typename T>
return -1; return -1;
} }
template<typename T, typename = int>
struct type_version {
static constexpr auto value = -1;
};
template<typename T>
struct type_version<T, decltype((void) T::TypeVersion, -1)> {
static constexpr auto value = T::TypeVersion;
};
template<typename T> template<typename T>
constexpr const char *getTypeName(T *t) noexcept { constexpr const char *getTypeName(T *t) noexcept {
TypeInfoCatcher tnc; TypeInfoCatcher tnc;
@ -65,7 +75,7 @@ ValErr<String> writeClawHeader(T *t, ClawFormat fmt) noexcept {
} }
out += detail::getTypeName(t); out += detail::getTypeName(t);
out += ";"; out += ";";
const auto tn = detail::getTypeVersion(t); const auto tn = detail::type_version<T>::value;
if (tn > -1) { if (tn > -1) {
out += tn; out += tn;
} }
@ -76,7 +86,7 @@ ValErr<String> writeClawHeader(T *t, ClawFormat fmt) noexcept {
} }
template<typename T> template<typename T>
constexpr ValErr<Vector<char>> writeClaw(T *t, ClawFormat fmt) { ValErr<Vector<char>> writeClaw(T *t, ClawFormat fmt) {
auto [header, headerErr] = detail::writeClawHeader(t, fmt); auto [header, headerErr] = detail::writeClawHeader(t, fmt);
oxReturnError(headerErr); oxReturnError(headerErr);
const auto [data, dataErr] = fmt == ClawFormat::Metal ? writeMC(t) : writeOC(t); const auto [data, dataErr] = fmt == ClawFormat::Metal ? writeMC(t) : writeOC(t);