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

Fixed up circular #include issue.

Browse Source 
Reenabled RsGxsIdExchange interface.
Compile p3idservice again.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5735 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-10-28 18:40:01 +00:00
parent a5f52e85a1
commit df1a3297e0
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libretroshare/src/gxs/rsgenexchange.h
View File

@ -32,12 +32,10 @@
#include "rsgxs.h" #include "rsgxs.h"
#include "rsgds.h" #include "rsgds.h"
#include "rsnxs.h" #include "rsnxs.h"
#include "rsgixs.h"
#include "rsgxsdataaccess.h" #include "rsgxsdataaccess.h"
#include "rsnxsobserver.h" #include "rsnxsobserver.h"
#include "retroshare/rsgxsservice.h" #include "retroshare/rsgxsservice.h"
#include "serialiser/rsnxsitems.h" #include "serialiser/rsnxsitems.h"
//#include "rsgixs.h"
typedef std::map<RsGxsGroupId, std::vector<RsGxsMsgItem*> > GxsMsgDataMap; typedef std::map<RsGxsGroupId, std::vector<RsGxsMsgItem*> > GxsMsgDataMap;
typedef std::map<RsGxsGroupId, RsGxsGrpItem*> GxsGroupDataMap; typedef std::map<RsGxsGroupId, RsGxsGrpItem*> GxsGroupDataMap;
@ -63,6 +61,9 @@ typedef std::map<RsGxsGroupId, std::vector<RsMsgMetaData> > GxsMsgMetaMap;
* Also notifications are made here on receipt of new data from \n * Also notifications are made here on receipt of new data from \n
* connected peers * connected peers
*/ */
class RsGixs;
class RsGenExchange : public RsGxsService, public RsNxsObserver class RsGenExchange : public RsGxsService, public RsNxsObserver
{ {
public: public:

17
libretroshare/src/gxs/rsgixs.h
View File

@ -180,14 +180,17 @@ public:
/*** This Class pulls all the GXS Interfaces together ****/ /*** This Class pulls all the GXS Interfaces together ****/
//class RsGxsIdExchange: public RsGenExchange, public RsGixsReputation, public RsGixs class RsGxsIdExchange:
//{ public RsGenExchange,
//public: public RsGixsReputation,
// RsGxsIdExchange(RsGeneralDataService* gds, RsNetworkExchangeService* ns, RsSerialType* serviceSerialiser, uint16_t mServType) public RsGixs
// :RsGenExchange(gds,ns,serviceSerialiser,mServType) { return; } {
//virtual ~RsGxsIdExchange() { return; } public:
RsGxsIdExchange(RsGeneralDataService* gds, RsNetworkExchangeService* ns, RsSerialType* serviceSerialiser, uint16_t mServType)
:RsGenExchange(gds,ns,serviceSerialiser,mServType, this) { return; }
virtual ~RsGxsIdExchange() { return; }
//}; };

2
libretroshare/src/libretroshare.pro
View File

@ -638,7 +638,7 @@ HEADERS += retroshare/rsgame.h \
services/p3idservice.h \ services/p3idservice.h \
serialiser/rsgxsiditems.h serialiser/rsgxsiditems.h
#SOURCES += services/p3idservice.cc SOURCES += services/p3idservice.cc
# serialiser/rsgxsiditems.cc \ # serialiser/rsgxsiditems.cc \
# Wiki Service # Wiki Service