drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[ox/mc] Switch Vector detection over to isVector_v

Browse Source
This commit is contained in:
Gary Talent
2021-05-03 13:13:40 -04:00
parent e2e62a235a
commit 704b94f471
2 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
deps/ox/src/ox/mc/write.hpp vendored
View File

@@ -56,9 +56,6 @@ class MetalClawWriter {
template<typename T>
Error field(const char*, T *val, std::size_t len);
template<typename T>
Error field(const char*, Vector<T> *val);
template<typename T>
Error field(const char*, HashMap<String, T> *val);
@@ -95,18 +92,22 @@ Error MetalClawWriter::field(const char *name, ox::BString<L> *val) noexcept {
template<typename T>
Error MetalClawWriter::field(const char*, T *val) {
bool fieldSet = false;
if (val && (m_unionIdx == -1 || m_unionIdx == m_field)) {
MetalClawWriter writer(m_buff + m_buffIt, m_buffLen - m_buffIt);
oxReturnError(model(&writer, val));
if (static_cast<std::size_t>(writer.m_fieldPresence.getMaxLen()) < writer.m_buffIt) {
m_buffIt += writer.m_buffIt;
fieldSet = true;
if constexpr(isVector_v<T>) {
return field(nullptr, val->data(), val->size());
} else {
bool fieldSet = false;
if (val && (m_unionIdx == -1 || m_unionIdx == m_field)) {
MetalClawWriter writer(m_buff + m_buffIt, m_buffLen - m_buffIt);
oxReturnError(model(&writer, val));
if (static_cast<std::size_t>(writer.m_fieldPresence.getMaxLen()) < writer.m_buffIt) {
m_buffIt += writer.m_buffIt;
fieldSet = true;
}
}
oxReturnError(m_fieldPresence.set(m_field, fieldSet));
m_field++;
return OxError(0);
}
oxReturnError(m_fieldPresence.set(m_field, fieldSet));
m_field++;
return OxError(0);
}
template<typename U>
@@ -156,11 +157,6 @@ Error MetalClawWriter::field(const char*, T *val, std::size_t len) {
return OxError(0);
}
template<typename T>
Error MetalClawWriter::field(const char*, Vector<T> *val) {
return field(nullptr, val->data(), val->size());
}
template<typename T>
Error MetalClawWriter::field(const char*, HashMap<String, T> *val) {
auto &keys = val->keys();