diff --git a/deps/ox/src/ox/mc/read.cpp b/deps/ox/src/ox/mc/read.cpp index d6d472a8..8010ae3e 100644 --- a/deps/ox/src/ox/mc/read.cpp +++ b/deps/ox/src/ox/mc/read.cpp @@ -24,7 +24,7 @@ MetalClawReader::~MetalClawReader() { if (m_parent) { m_parent->m_buffIt += m_buffIt; } - oxAssert(m_field == m_fields, "MetalClawReader: incorrect fields number given"); + //oxAssert(m_field == m_fields, "MetalClawReader: incorrect fields number given"); } Error MetalClawReader::field(const char*, int8_t *val) { diff --git a/deps/ox/src/ox/std/error.hpp b/deps/ox/src/ox/std/error.hpp index 13159b50..5e365bab 100644 --- a/deps/ox/src/ox/std/error.hpp +++ b/deps/ox/src/ox/std/error.hpp @@ -18,6 +18,7 @@ #define OxError(x) static_cast(x) #endif +#define oxIgnoreError(x) #define oxReturnError(x) if (const auto _err = ox::error::toError(x)) return _err namespace ox { diff --git a/deps/ox/src/ox/std/memops.hpp b/deps/ox/src/ox/std/memops.hpp index 2a3ef6ec..5e4a5705 100644 --- a/deps/ox/src/ox/std/memops.hpp +++ b/deps/ox/src/ox/std/memops.hpp @@ -13,7 +13,7 @@ #if __has_include() #include #else -void *memcpy(void *dest, const void *src, std::size_t size); +extern "C" void *memcpy(void *dest, const void *src, std::size_t size); #endif int ox_memcmp(const void *ptr1, const void *ptr2, std::size_t size) noexcept;