diff options
author | peryaudo <peraudo@gmail.com> | 2014-03-20 13:21:23 +0900 |
---|---|---|
committer | peryaudo <peraudo@gmail.com> | 2014-03-20 13:21:23 +0900 |
commit | b1b9c762623c392ac665ecdc315e1d2073eaac43 (patch) | |
tree | 95e2b82540c61200c1a0940538238ca6a8a50baa | |
parent | 98f4c6c49ce42f3c83d21e5b8ae32eda02a79d49 (diff) | |
download | bitcoin-b1b9c762623c392ac665ecdc315e1d2073eaac43.tar.xz |
Fix bloom filter not to use bit_mask
-rw-r--r-- | src/bloom.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/bloom.cpp b/src/bloom.cpp index cbb8cf4a82..1bfcbd406f 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -15,8 +15,6 @@ using namespace std; -static const unsigned char bit_mask[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; - CBloomFilter::CBloomFilter(unsigned int nElements, double nFPRate, unsigned int nTweakIn, unsigned char nFlagsIn) : // The ideal size for a bloom filter with a given number of elements and false positive rate is: // - nElements * log(fp rate) / ln(2)^2 @@ -47,7 +45,7 @@ void CBloomFilter::insert(const vector<unsigned char>& vKey) { unsigned int nIndex = Hash(i, vKey); // Sets bit nIndex of vData - vData[nIndex >> 3] |= bit_mask[7 & nIndex]; + vData[nIndex >> 3] |= (1 << (7 & nIndex)); } isEmpty = false; } @@ -76,7 +74,7 @@ bool CBloomFilter::contains(const vector<unsigned char>& vKey) const { unsigned int nIndex = Hash(i, vKey); // Checks bit nIndex of vData - if (!(vData[nIndex >> 3] & bit_mask[7 & nIndex])) + if (!(vData[nIndex >> 3] & (1 << (7 & nIndex)))) return false; } return true; |