From da66719b8346328974e08f56ccd175af7ba6e3f4 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Thu, 19 Mar 2020 17:37:24 +0100 Subject: [PATCH] Fix Android compilation --- libretroshare/src/serialiser/rstypeserializer.cc | 4 ++++ libretroshare/src/serialiser/rstypeserializer.h | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libretroshare/src/serialiser/rstypeserializer.cc b/libretroshare/src/serialiser/rstypeserializer.cc index eafc655a6..0144201b4 100644 --- a/libretroshare/src/serialiser/rstypeserializer.cc +++ b/libretroshare/src/serialiser/rstypeserializer.cc @@ -503,6 +503,10 @@ bool RsTypeSerializer::from_JSON( const std::string& /*memberName*/, // Binary blocks // //============================================================================// +/*static*/ /* without this Android compilation breaks */ +constexpr uint32_t RsTypeSerializer::RawMemoryWrapper::MAX_SERIALIZED_CHUNK_SIZE; + +/*static*/ void RsTypeSerializer::RawMemoryWrapper::serial_process( RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext& ctx ) diff --git a/libretroshare/src/serialiser/rstypeserializer.h b/libretroshare/src/serialiser/rstypeserializer.h index 8c0eb9784..52bf255c7 100644 --- a/libretroshare/src/serialiser/rstypeserializer.h +++ b/libretroshare/src/serialiser/rstypeserializer.h @@ -430,8 +430,7 @@ struct RsTypeSerializer if(!yielding) { RsErr() << __PRETTY_FUNCTION__ << " \"" << memberName - << "\" not found in JSON:" << std::endl - << jDoc << std::endl << std::endl; + << "\" not found in JSON" << std::endl; print_stacktrace(); } ctx.mOk = false;