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

Compilation fix. Rs compiles now, group and message creation work ok, more testing to do still

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7192 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-20 11:26:53 +00:00
parent 5b472c34e2
commit e2c8c6e141
9 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/rsserver/rsinit.cc
View file

@ -1361,7 +1361,7 @@ int RsServer::StartupRetroShare()
std::string currGxsDir = rsAccounts.PathAccountDirectory() + "/GXS_phase2";
#ifdef GXS_DEV_TESTNET // Different Directory for testing.
currGxsDir += "_TESTNET9";
currGxsDir += "_TESTNET10";
#endif
if(!priorGxsDir.empty())

3
libretroshare/src/serialiser/rsgxsreputationitems.h
View file

@ -31,6 +31,7 @@
#include "serialiser/rsserviceids.h"
#include "serialiser/rsserial.h"
#include "serialiser/rstlvtypes.h"
#include "retroshare/rsgxsifacetypes.h"
#define RS_PKT_SUBTYPE_GXSREPUTATION_CONFIG_ITEM 0x01
#define RS_PKT_SUBTYPE_GXSREPUTATION_SET_ITEM 0x02
@ -96,7 +97,7 @@ virtual ~RsGxsReputationUpdateItem();
virtual void clear();
std::ostream &print(std::ostream &out, uint16_t indent = 0);
std::map<std::string, uint32_t> mOpinions; // GxsId -> Opinion.
std::map<RsGxsId, uint32_t> mOpinions; // GxsId -> Opinion.
uint32_t mLatestUpdate;
};

4
libretroshare/src/services/p3gxsreputation.cc
View file

@ -256,7 +256,7 @@ bool p3GxsReputation::SendReputations(RsGxsReputationRequestItem *request)
continue;
}
std::string gxsId = rit->first.toStdString();
RsGxsId gxsId = rit->first;
pkt->mOpinions[gxsId] = ConvertToSerialised(rit->second.mOwnOpinion, true);
pkt->mLatestUpdate = rit->second.mOwnOpinionTs;
if (pkt->mLatestUpdate == (uint32_t) now)
@ -307,7 +307,7 @@ bool p3GxsReputation::RecvReputations(RsGxsReputationUpdateItem *item)
RsPeerId peerid = item->PeerId();
std::map<std::string, uint32_t>::iterator it;
std::map<RsGxsId, uint32_t>::iterator it;
for(it = item->mOpinions.begin(); it != item->mOpinions.end(); it++)
{
RsStackMutex stack(mReputationMtx); /****** LOCKED MUTEX *******/

1
libretroshare/src/services/p3gxsreputation.h
View file

@ -37,7 +37,6 @@
#include "retroshare/rsidentity.h"
#include "services/p3service.h"
//typedef std::string RsPeerId;
class p3LinkMgr;