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 | 938b68984668445035b2505e1b7ec07649dd2bbc (patch) | |
| tree | 0519102b1dcd38143ba6a9be45323ff9e2f256fd /include/leveldb | |
| parent | 060fdb41fc58e962a694021f2883f765e3246748 (diff) | |
| download | bitcoin-938b68984668445035b2505e1b7ec07649dd2bbc.tar.xz | |
Squashed 'src/leveldb/' changes from 9094c7f..7924331
42dcc7e Merge upstream LevelDB 1.17.
e353fbc Release LevelDB 1.17
269fc6c Release LevelDB 1.16
REVERT: 9094c7f Temporarily revert to writing .sst files instead of .ldb
git-subtree-dir: src/leveldb
git-subtree-split: 79243314e40ac31d79c68e5658a1d6a64800d50b
Diffstat (limited to 'include/leveldb')
| -rw-r--r-- | include/leveldb/c.h | 1 | ||||
| -rw-r--r-- | include/leveldb/db.h | 2 | ||||
| -rw-r--r-- | include/leveldb/slice.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/leveldb/c.h b/include/leveldb/c.h index 1fa58866c3..1048fe3b86 100644 --- a/include/leveldb/c.h +++ b/include/leveldb/c.h @@ -9,7 +9,6 @@ Does not support: . getters for the option types . custom comparators that implement key shortening - . capturing post-write-snapshot . custom iter, db, env, cache implementations using just the C bindings Some conventions: diff --git a/include/leveldb/db.h b/include/leveldb/db.h index 5ffb29d526..40851b2aa8 100644 --- a/include/leveldb/db.h +++ b/include/leveldb/db.h @@ -14,7 +14,7 @@ namespace leveldb { // Update Makefile if you change these static const int kMajorVersion = 1; -static const int kMinorVersion = 15; +static const int kMinorVersion = 17; struct Options; struct ReadOptions; diff --git a/include/leveldb/slice.h b/include/leveldb/slice.h index 74ea8fa49a..bc367986f7 100644 --- a/include/leveldb/slice.h +++ b/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; |