Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some warnings

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2018-01-22 14:50:07 +01:00
parent 04d32d2f44
commit 9c68bcbca4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/retroshare/rsidentity.h
View File

@ -42,7 +42,7 @@
#include "util/rsdeprecate.h" #include "util/rsdeprecate.h"
/* The Main Interface Class - for information about your Peers */ /* The Main Interface Class - for information about your Peers */
class RsIdentity; struct RsIdentity;
extern RsIdentity *rsIdentity; extern RsIdentity *rsIdentity;
@ -287,7 +287,7 @@ struct RsIdentityUsage : RsSerializable
RS_PROCESS_SERIAL_MEMBER(mHash); RS_PROCESS_SERIAL_MEMBER(mHash);
} }
friend class RsTypeSerializer; friend struct RsTypeSerializer;
private: private:
/** Accessible only to friend class RsTypeSerializer needed for /** Accessible only to friend class RsTypeSerializer needed for
* deserialization */ * deserialization */

10
libretroshare/src/serialiser/rstypeserializer.h
View File

@ -332,8 +332,8 @@ struct RsTypeSerializer
nullptr, 0, RsGenericSerializer::FORMAT_BINARY, nullptr, 0, RsGenericSerializer::FORMAT_BINARY,
RsGenericSerializer::SERIALIZATION_FLAG_NONE, RsGenericSerializer::SERIALIZATION_FLAG_NONE,
&allocator ); &allocator );
ok && (kCtx.mJson. if(ok)
AddMember("key", kvEl["key"], allocator), true); kCtx.mJson.AddMember("key", kvEl["key"], allocator);
T key; T key;
ok = ok && (serial_process(j, kCtx, key, "key"), kCtx.mOk); ok = ok && (serial_process(j, kCtx, key, "key"), kCtx.mOk);
@ -342,8 +342,8 @@ struct RsTypeSerializer
nullptr, 0, RsGenericSerializer::FORMAT_BINARY, nullptr, 0, RsGenericSerializer::FORMAT_BINARY,
RsGenericSerializer::SERIALIZATION_FLAG_NONE, RsGenericSerializer::SERIALIZATION_FLAG_NONE,
&allocator ); &allocator );
ok && (vCtx.mJson. if(ok)
AddMember("value", kvEl["value"], allocator), true); vCtx.mJson.AddMember("value", kvEl["value"], allocator);
U value; U value;
ok = ok && ( serial_process(j, vCtx, value, "value"), ok = ok && ( serial_process(j, vCtx, value, "value"),
@ -752,7 +752,7 @@ bool RsTypeSerializer::from_JSON( const std::string& membername,
{ {
rapidjson::Value& v = jVal[mName]; rapidjson::Value& v = jVal[mName];
ret = ret && v.IsString(); ret = ret && v.IsString();
ret && (member = t_RsGenericIdType<ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER>(std::string(v.GetString())), false); if(ret) member = t_RsGenericIdType<ID_SIZE_IN_BYTES,UPPER_CASE,UNIQUE_IDENTIFIER>(std::string(v.GetString()));
} }
return ret; return ret;
} }