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

fixed overloading names for functions that are not supposed to be overloading in turtleClientService and ftServer

Browse Source
This commit is contained in:
csoler 2018-11-14 20:20:27 +01:00
parent d3e690b0d6
commit 6d09493725
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/ft/ftserver.cc
View File

@ -1827,7 +1827,7 @@ int ftServer::handleIncoming()
********************************** **********************************
*********************************/ *********************************/
void ftServer::receiveSearchResult(RsTurtleFTSearchResultItem *item) void ftServer::ftReceiveSearchResult(RsTurtleFTSearchResultItem *item)
{ {
bool hasCallback = false; bool hasCallback = false;

2
libretroshare/src/ft/ftserver.h
View File

@ -98,7 +98,7 @@ public:
uint16_t serviceId() const { return RS_SERVICE_TYPE_FILE_TRANSFER ; } uint16_t serviceId() const { return RS_SERVICE_TYPE_FILE_TRANSFER ; }
virtual bool handleTunnelRequest(const RsFileHash& hash,const RsPeerId& peer_id) ; virtual bool handleTunnelRequest(const RsFileHash& hash,const RsPeerId& peer_id) ;
virtual void receiveTurtleData(const RsTurtleGenericTunnelItem *item,const RsFileHash& hash,const RsPeerId& virtual_peer_id,RsTurtleGenericTunnelItem::Direction direction) ; virtual void receiveTurtleData(const RsTurtleGenericTunnelItem *item,const RsFileHash& hash,const RsPeerId& virtual_peer_id,RsTurtleGenericTunnelItem::Direction direction) ;
virtual void receiveSearchResult(RsTurtleFTSearchResultItem *item); virtual void ftReceiveSearchResult(RsTurtleFTSearchResultItem *item); // We dont use TurtleClientService::receiveSearchResult() because of backward compatibility.
virtual RsItem *create_item(uint16_t service,uint8_t item_type) const ; virtual RsItem *create_item(uint16_t service,uint8_t item_type) const ;
virtual RsServiceSerializer *serializer() { return this ; } virtual RsServiceSerializer *serializer() { return this ; }

2
libretroshare/src/turtle/p3turtle.cc
View File

@ -1220,7 +1220,7 @@ void p3turtle::handleSearchResult(RsTurtleSearchResultItem *item)
} }
//RsServer::notify()->notifyTurtleSearchResult(ftsr->request_id,ftsr->result) ; //RsServer::notify()->notifyTurtleSearchResult(ftsr->request_id,ftsr->result) ;
client->receiveSearchResult(ftsr); client->ftReceiveSearchResult(ftsr);
continue ; continue ;
} }