Merge fixes to serialization from master branch

This commit is contained in:
Gioacchino Mazzurco 2018-06-29 00:13:07 +02:00
commit 102558afdf
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051

View File

@ -298,8 +298,8 @@ bool RsTypeSerializer::from_JSON( const std::string& memberName,
uint64_t& member, RsJson& jDoc )
{
SAFE_GET_JSON_V();
ret = ret && v.IsUint();
if(ret) member = v.GetUint();
ret = ret && v.IsUint64();
if(ret) member = v.GetUint64();
return ret;
}