Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-06 16:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into topic/matthias/bloom-filter

Browse source 
Conflicts:
	src/probabilistic/Hasher.h
This commit is contained in:
Matthias Vallentin 2013-07-30 12:12:27 +02:00
commit 9ad7121fed
250 changed files with 12762 additions and 5361 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/probabilistic/Hasher.h
View file

@ -78,6 +78,14 @@ protected:
Hasher() { }
/**
* Constructor.
*
* @param k the number of hash functions.
*
* @param name A name for the hasher. Hashers with the same name
* should provide consistent results.
*/
Hasher(size_t k, const std::string& name);
private: