From 6d09493725b4689335b8e8f33085fe6101da59f6 Mon Sep 17 00:00:00 2001 From: csoler Date: Wed, 14 Nov 2018 20:20:27 +0100 Subject: [PATCH] fixed overloading names for functions that are not supposed to be overloading in turtleClientService and ftServer --- libretroshare/src/ft/ftserver.cc | 2 +- libretroshare/src/ft/ftserver.h | 2 +- libretroshare/src/turtle/p3turtle.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libretroshare/src/ft/ftserver.cc b/libretroshare/src/ft/ftserver.cc index 4ea44ab6f..906bae6f1 100644 --- a/libretroshare/src/ft/ftserver.cc +++ b/libretroshare/src/ft/ftserver.cc @@ -1827,7 +1827,7 @@ int ftServer::handleIncoming() ********************************** *********************************/ -void ftServer::receiveSearchResult(RsTurtleFTSearchResultItem *item) +void ftServer::ftReceiveSearchResult(RsTurtleFTSearchResultItem *item) { bool hasCallback = false; diff --git a/libretroshare/src/ft/ftserver.h b/libretroshare/src/ft/ftserver.h index d93341035..2094459a1 100644 --- a/libretroshare/src/ft/ftserver.h +++ b/libretroshare/src/ft/ftserver.h @@ -98,7 +98,7 @@ public: uint16_t serviceId() const { return RS_SERVICE_TYPE_FILE_TRANSFER ; } 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 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 RsServiceSerializer *serializer() { return this ; } diff --git a/libretroshare/src/turtle/p3turtle.cc b/libretroshare/src/turtle/p3turtle.cc index 2e4b5a635..3e5cbb3db 100644 --- a/libretroshare/src/turtle/p3turtle.cc +++ b/libretroshare/src/turtle/p3turtle.cc @@ -1220,7 +1220,7 @@ void p3turtle::handleSearchResult(RsTurtleSearchResultItem *item) } //RsServer::notify()->notifyTurtleSearchResult(ftsr->request_id,ftsr->result) ; - client->receiveSearchResult(ftsr); + client->ftReceiveSearchResult(ftsr); continue ; }