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

Fix compilation on Android arm64

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2020-04-03 13:00:44 +02:00
parent 7d1efa7ed9
commit 8cb46e5937
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,9 @@
* * * *
*******************************************************************************/ *******************************************************************************/
#include <algorithm>
#include <iostream>
#include "crypto/chacha20.h" #include "crypto/chacha20.h"
//const int ftserverzone = 29539; //const int ftserverzone = 29539;
@ -50,8 +53,6 @@
#include "util/rsdebug.h" #include "util/rsdebug.h"
#include "util/rsdir.h" #include "util/rsdir.h"
#include "util/rsprint.h" #include "util/rsprint.h"
#include <iostream>
#include "util/rstime.h" #include "util/rstime.h"
#ifdef RS_DEEP_FILES_INDEX #ifdef RS_DEEP_FILES_INDEX
@ -1974,15 +1975,17 @@ void ftServer::ftReceiveSearchResult(RsTurtleFTSearchResultItem *item)
hasCallback = true; hasCallback = true;
std::vector<TurtleFileInfoV2> cRes; std::vector<TurtleFileInfoV2> cRes;
for( const auto& tfiold : item->result) std::transform( item->result.begin(), item->result.end(),
cRes.push_back(tfiold); std::back_inserter(cRes),
[](const auto& it){ return TurtleFileInfoV2(it); } );
cbpt->second.first(cRes); cbpt->second.first(cRes);
} }
} // end RS_STACK_MUTEX(mSearchCallbacksMapMutex); } // end RS_STACK_MUTEX(mSearchCallbacksMapMutex);
if(!hasCallback) if(!hasCallback)
RsServer::notify()->notifyTurtleSearchResult(item->PeerId(),item->request_id, item->result ); RsServer::notify()->notifyTurtleSearchResult(
item->PeerId(), item->request_id, item->result );
} }
bool ftServer::receiveSearchRequest( bool ftServer::receiveSearchRequest(