Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-19 11:28:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge of branch v0.6-idclean 7180

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libretroshare/src/pqi/pqibin.h
View file

@ -72,7 +72,7 @@ virtual bool cansend(uint32_t /* usec */)
virtual bool bandwidthLimited() { return false; }
//! if HASHing is switched on
virtual std::string gethash();
virtual RsFileHash gethash();
virtual uint64_t bytecount();
protected:
@ -178,7 +178,7 @@ virtual bool cansend(uint32_t /* usec */)
}
virtual bool bandwidthLimited() { return false; }
virtual std::string gethash();
virtual RsFileHash gethash();
virtual uint64_t bytecount();
private:
@ -195,7 +195,7 @@ virtual uint64_t bytecount();
class NetBinDummy: public NetBinInterface
{
public:
NetBinDummy(PQInterface *parent, std::string id, uint32_t t);
NetBinDummy(PQInterface *parent, const RsPeerId& id, uint32_t t);
virtual ~NetBinDummy() { return; }
// Net Interface
@ -227,7 +227,7 @@ virtual bool moretoread(uint32_t usec);
virtual bool cansend(uint32_t usec);
virtual int close();
virtual std::string gethash();
virtual RsFileHash gethash();
private:
uint32_t type;