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

Fix CppCheck duplInheritedMember warning in RsItem

Browse source 
/libretroshare/src/rsitems/rsitem.h:92: warning:
Cppcheck(duplInheritedMember): The class 'RsPeerNetItem' defines member
variable with name 'peerId' also defined in its parent struct 'RsItem'.
/libretroshare/src/rsitems/rsitem.h:92: warning:
Cppcheck(duplInheritedMember): The class 'RsHistoryMsgItem' defines
member variable with name 'peerId' also defined in its parent struct
'RsItem'.
/libretroshare/src/rsitems/rsitem.h:91: warning:
Cppcheck(duplInheritedMember): The class 'RsBanListConfigItem' defines
member variable with name 'type' also defined in its parent struct
'RsItem'.
/libretroshare/src/rsitems/rsitem.h:92: warning:
Cppcheck(duplInheritedMember): The class 'RsBanListConfigItem' defines
member variable with name 'peerId' also defined in its parent struct
'RsItem'.
This commit is contained in:
Phenom 2018-05-07 17:29:11 +02:00
parent 38ac234862
commit f39fd069b5
10 changed files with 74 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/unittests/libretroshare/serialiser/rsconfigitem_test.cc
View file

@ -29,7 +29,7 @@
RsSerialType* init_item(RsPeerNetItem& rpn)
{
randString(SHORT_STR, rpn.dyndns);
rpn.peerId.random();
rpn.nodePeerId.random();
rpn.pgpId.random();
randString(SHORT_STR, rpn.location);
@ -165,7 +165,7 @@ bool operator==(const RsPeerNetItem& left, const RsPeerNetItem& right)
if(left.dyndns != right.dyndns) return false;
if(left.pgpId != right.pgpId) return false;
if(left.location != right.location) return false;
if(left.peerId != right.peerId) return false;
if(left.nodePeerId != right.nodePeerId) return false;
if(left.lastContact != right.lastContact) return false;
if(left.netMode != right.netMode) return false;
if(left.visState != right.visState) return false;