diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-05-09 18:23:34 +0200 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-05-09 18:23:34 +0200 |
commit | aca47d2a24e39e6a05d85055ce3c6cbcabd8d50b (patch) | |
tree | 13b439a32f0486c910f59be32a009066193cb208 /src/leveldb/include/leveldb/slice.h | |
parent | 605d5b55582f00ea8a089fe632cd8a52e951126b (diff) | |
parent | 938b68984668445035b2505e1b7ec07649dd2bbc (diff) | |
download | bitcoin-aca47d2a24e39e6a05d85055ce3c6cbcabd8d50b.tar.xz |
Merge src/leveldb changes for LevelDB 1.17.
Diffstat (limited to 'src/leveldb/include/leveldb/slice.h')
-rw-r--r-- | src/leveldb/include/leveldb/slice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leveldb/include/leveldb/slice.h b/src/leveldb/include/leveldb/slice.h index 74ea8fa49a..bc367986f7 100644 --- a/src/leveldb/include/leveldb/slice.h +++ b/src/leveldb/include/leveldb/slice.h @@ -94,7 +94,7 @@ inline bool operator!=(const Slice& x, const Slice& y) { } inline int Slice::compare(const Slice& b) const { - const int min_len = (size_ < b.size_) ? size_ : b.size_; + const size_t min_len = (size_ < b.size_) ? size_ : b.size_; int r = memcmp(data_, b.data_, min_len); if (r == 0) { if (size_ < b.size_) r = -1; |