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

Fix Clang warnings: struct declared as class

Browse source 
warning: 'RsMsgMetaData' defined as a struct here but previously
declared as a class [-Wmismatched-tags]
struct RsMsgMetaData
^
This commit is contained in:
Phenom 2017-03-15 20:41:39 +01:00 • committed by csoler
parent 105840ab98
commit cf963c0c73
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libretroshare/src/gxs/rsgxsdata.h
View file

@ -34,8 +34,8 @@
#include "serialiser/rstlvkeys.h" #include "serialiser/rstlvkeys.h"
#include "serialiser/rsgxsitems.h" #include "serialiser/rsgxsitems.h"
class RsGroupMetaData; struct RsGroupMetaData;
class RsMsgMetaData; struct RsMsgMetaData;
static const uint32_t RS_GXS_GRP_META_DATA_VERSION_ID_0001 = 0x0000 ; // change this, and keep old values if the content changes static const uint32_t RS_GXS_GRP_META_DATA_VERSION_ID_0001 = 0x0000 ; // change this, and keep old values if the content changes
static const uint32_t RS_GXS_GRP_META_DATA_VERSION_ID_0002 = 0xaf01 ; // current API static const uint32_t RS_GXS_GRP_META_DATA_VERSION_ID_0002 = 0xaf01 ; // current API
@ -56,22 +56,22 @@ public:
void clear(); void clear();
void operator =(const RsGroupMetaData& rMeta); void operator =(const RsGroupMetaData& rMeta);
//Sort data in same order than serialiser and deserializer //Sort data in same order than serialiser and deserializer
RsGxsGroupId mGroupId; RsGxsGroupId mGroupId;
RsGxsGroupId mOrigGrpId; RsGxsGroupId mOrigGrpId;
RsGxsGroupId mParentGrpId; RsGxsGroupId mParentGrpId;
std::string mGroupName; std::string mGroupName;
uint32_t mGroupFlags; // GXS_SERV::FLAG_PRIVACY_RESTRICTED | GXS_SERV::FLAG_PRIVACY_PRIVATE | GXS_SERV::FLAG_PRIVACY_PUBLIC uint32_t mGroupFlags; // GXS_SERV::FLAG_PRIVACY_RESTRICTED | GXS_SERV::FLAG_PRIVACY_PRIVATE | GXS_SERV::FLAG_PRIVACY_PUBLIC
uint32_t mPublishTs; uint32_t mPublishTs;
uint32_t mCircleType; uint32_t mCircleType;
uint32_t mAuthenFlags; uint32_t mAuthenFlags;
RsGxsId mAuthorId; RsGxsId mAuthorId;
std::string mServiceString; std::string mServiceString;
RsGxsCircleId mCircleId; RsGxsCircleId mCircleId;
RsTlvKeySignatureSet signSet; RsTlvKeySignatureSet signSet;
RsTlvSecurityKeySet keys; RsTlvSecurityKeySet keys;
uint32_t mSignFlags; uint32_t mSignFlags;
// BELOW HERE IS LOCAL DATA, THAT IS NOT FROM MSG. // BELOW HERE IS LOCAL DATA, THAT IS NOT FROM MSG.
@ -103,9 +103,9 @@ public:
void clear(); void clear();
void operator =(const RsMsgMetaData& rMeta); void operator =(const RsMsgMetaData& rMeta);
static int refcount; static int refcount;
//Sort data in same order than serialiser and deserializer //Sort data in same order than serialiser and deserializer
RsGxsGroupId mGroupId; RsGxsGroupId mGroupId;
RsGxsMessageId mMsgId; RsGxsMessageId mMsgId;
RsGxsMessageId mThreadId; RsGxsMessageId mThreadId;
@ -121,7 +121,7 @@ public:
// BELOW HERE IS LOCAL DATA, THAT IS NOT FROM MSG. // BELOW HERE IS LOCAL DATA, THAT IS NOT FROM MSG.
// normally READ / UNREAD flags. LOCAL Data. // normally READ / UNREAD flags. LOCAL Data.
std::string mServiceString; std::string mServiceString;
uint32_t mMsgStatus; uint32_t mMsgStatus;
uint32_t mMsgSize; uint32_t mMsgSize;
time_t mChildTs; time_t mChildTs;

2
libretroshare/src/retroshare/rsgxsifacetypes.h
View file

@ -25,7 +25,7 @@ typedef std::pair<RsGxsGroupId, RsGxsMessageId> RsGxsGrpMsgIdPair;
typedef std::map<RsGxsGrpMsgIdPair, std::vector<RsGxsMessageId> > MsgRelatedIdResult; typedef std::map<RsGxsGrpMsgIdPair, std::vector<RsGxsMessageId> > MsgRelatedIdResult;
typedef std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > GxsMsgReq; typedef std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > GxsMsgReq;
class RsMsgMetaData; struct RsMsgMetaData;
typedef std::map<RsGxsGroupId, std::vector<RsMsgMetaData> > MsgMetaResult; typedef std::map<RsGxsGroupId, std::vector<RsMsgMetaData> > MsgMetaResult;

2
libretroshare/src/retroshare/rsgxsservice.h
View file

@ -5,7 +5,7 @@
#include "retroshare/rsgxsifacetypes.h" #include "retroshare/rsgxsifacetypes.h"
#include "retroshare/rstokenservice.h" #include "retroshare/rstokenservice.h"
class RsMsgMetaData ; struct RsMsgMetaData ;
typedef std::map<RsGxsGroupId, std::vector<RsMsgMetaData> > GxsMsgMetaMap; typedef std::map<RsGxsGroupId, std::vector<RsMsgMetaData> > GxsMsgMetaMap;
typedef std::map<RsGxsGrpMsgIdPair, std::vector<RsMsgMetaData> > GxsMsgRelatedMetaMap; typedef std::map<RsGxsGrpMsgIdPair, std::vector<RsMsgMetaData> > GxsMsgRelatedMetaMap;