diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-08-14 10:57:11 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-08-14 10:58:44 +0200 |
| commit | db3cb5c5a686279b220cac13c17b367aa0e4af99 (patch) | |
| tree | 410a082149ca9d18c0f5b0aa0a0cd48b35e9723b | |
| parent | 2be8206a67f099ca3d9e50a80614dbf40fb69665 (diff) | |
| parent | 265bd50884ac1984c08f0e5916256d5f12e655f5 (diff) | |
| download | bitcoin-db3cb5c5a686279b220cac13c17b367aa0e4af99.tar.xz | |
Merge #13948: trivial: Removes unsed `CBloomFilter` constructor.
265bd50884ac1984c08f0e5916256d5f12e655f5 Removes unsed `CBloomFilter` constructor. (251)
Pull request description:
This pull request removes the `CBloomFilter::CBloomFilter(const unsigned int, const double, const unsigned int)` constructor, which became obsolete with 086ee67.
Tree-SHA512: 46742f178e219661e82609a9bf6b644ebc58ab3efc2d1865c5562980e84f16a5fa286be9813738196ad7a27e639dee926062538eb44cadd67ab87ad5e9a266ba
| -rw-r--r-- | src/bloom.cpp | 11 | ||||
| -rw-r--r-- | src/bloom.h | 4 |
2 files changed, 0 insertions, 15 deletions
diff --git a/src/bloom.cpp b/src/bloom.cpp index 24eebe2e3e..94aae742f1 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -38,17 +38,6 @@ CBloomFilter::CBloomFilter(const unsigned int nElements, const double nFPRate, c { } -// Private constructor used by CRollingBloomFilter -CBloomFilter::CBloomFilter(const unsigned int nElements, const double nFPRate, const unsigned int nTweakIn) : - vData((unsigned int)(-1 / LN2SQUARED * nElements * log(nFPRate)) / 8), - isFull(false), - isEmpty(true), - nHashFuncs((unsigned int)(vData.size() * 8 / nElements * LN2)), - nTweak(nTweakIn), - nFlags(BLOOM_UPDATE_NONE) -{ -} - inline unsigned int CBloomFilter::Hash(unsigned int nHashNum, const std::vector<unsigned char>& vDataToHash) const { // 0xFBA4C795 chosen as it guarantees a reasonable bit difference between nHashNum values. diff --git a/src/bloom.h b/src/bloom.h index e136fcebfc..7d3aa878b0 100644 --- a/src/bloom.h +++ b/src/bloom.h @@ -53,10 +53,6 @@ private: unsigned int Hash(unsigned int nHashNum, const std::vector<unsigned char>& vDataToHash) const; - // Private constructor for CRollingBloomFilter, no restrictions on size - CBloomFilter(const unsigned int nElements, const double nFPRate, const unsigned int nTweak); - friend class CRollingBloomFilter; - public: /** * Creates a new bloom filter which will provide the given fp rate when filled with the given number of elements |