Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-28 16:17:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Android compilation

Browse source
This commit is contained in:
Gioacchino Mazzurco 2020-03-19 17:37:24 +01:00
parent a509098a79
commit da66719b83
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/serialiser/rstypeserializer.cc
View file

@ -503,6 +503,10 @@ bool RsTypeSerializer::from_JSON( const std::string& /*memberName*/,
// Binary blocks // // Binary blocks //
//============================================================================// //============================================================================//
/*static*/ /* without this Android compilation breaks */
constexpr uint32_t RsTypeSerializer::RawMemoryWrapper::MAX_SERIALIZED_CHUNK_SIZE;
/*static*/
void RsTypeSerializer::RawMemoryWrapper::serial_process( void RsTypeSerializer::RawMemoryWrapper::serial_process(
RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx ) RsGenericSerializer::SerializeContext& ctx )

3
libretroshare/src/serialiser/rstypeserializer.h
View file

@ -430,8 +430,7 @@ struct RsTypeSerializer
if(!yielding) if(!yielding)
{ {
RsErr() << __PRETTY_FUNCTION__ << " \"" << memberName RsErr() << __PRETTY_FUNCTION__ << " \"" << memberName
<< "\" not found in JSON:" << std::endl << "\" not found in JSON" << std::endl;
<< jDoc << std::endl << std::endl;
print_stacktrace(); print_stacktrace();
} }
ctx.mOk = false; ctx.mOk = false;