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

Merge pull request #1363 from G10h4ck/jsonapi

Browse source 
New cross-platform target retroshare-service
This commit is contained in:
G10h4ck 2018-10-16 16:06:09 +02:00 • committed by GitHub
commit 03cdd6c7b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 2758 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -655,11 +655,11 @@ struct RsTypeSerializer
break;
case RsGenericSerializer::FROM_JSON:
{
uint32_t f;
uint32_t f = 0;
ctx.mOk &=
(ctx.mOk || ctx.mFlags & RsGenericSerializer::SERIALIZATION_FLAG_YIELDING)
&& from_JSON(memberName, f, ctx.mJson);
v = t_RsFlags32<N>(f);
&& from_JSON(memberName, f, ctx.mJson)
&& (v = t_RsFlags32<N>(f), true);
break;
}
default: break;