diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-12-01 16:14:45 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-12-01 16:14:45 -0800 |
| commit | 605d701471c3ee84682b0c149e41142d7cea95e7 (patch) | |
| tree | 7a6af0e78ee2202f510686e9a3561c28829b8a4b /src/leveldb/table/filter_block.cc | |
| parent | dc6dee41f7cf2ba93fcd0fea7c157e4b2775d439 (diff) | |
| parent | 634ad517037b319147816f1d112b066528e1724a (diff) | |
| download | bitcoin-605d701471c3ee84682b0c149e41142d7cea95e7.tar.xz | |
Merge in LevelDB 1.19 changes
Diffstat (limited to 'src/leveldb/table/filter_block.cc')
| -rw-r--r-- | src/leveldb/table/filter_block.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leveldb/table/filter_block.cc b/src/leveldb/table/filter_block.cc index 203e15c8bc..4e78b954f8 100644 --- a/src/leveldb/table/filter_block.cc +++ b/src/leveldb/table/filter_block.cc @@ -68,7 +68,7 @@ void FilterBlockBuilder::GenerateFilter() { // Generate filter for current set of keys and append to result_. filter_offsets_.push_back(result_.size()); - policy_->CreateFilter(&tmp_keys_[0], num_keys, &result_); + policy_->CreateFilter(&tmp_keys_[0], static_cast<int>(num_keys), &result_); tmp_keys_.clear(); keys_.clear(); @@ -97,7 +97,7 @@ bool FilterBlockReader::KeyMayMatch(uint64_t block_offset, const Slice& key) { if (index < num_) { uint32_t start = DecodeFixed32(offset_ + index*4); uint32_t limit = DecodeFixed32(offset_ + index*4 + 4); - if (start <= limit && limit <= (offset_ - data_)) { + if (start <= limit && limit <= static_cast<size_t>(offset_ - data_)) { Slice filter = Slice(data_ + start, limit - start); return policy_->KeyMayMatch(key, filter); } else if (start == limit) { |