aboutsummaryrefslogtreecommitdiff
path: root/src/leveldb/db
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2017-08-01 12:40:42 -0700
committerPieter Wuille <pieter.wuille@gmail.com>2017-08-01 12:40:42 -0700
commit47f3e8c74d390139967cc40e37cf5b433f0b0f9f (patch)
treef43c285be47ec5bc66a25a7fa1c072d2cd32dc97 /src/leveldb/db
parentf66c59650527022b4f7abd98ff0a1a4e4741bd34 (diff)
parentb13a68e129f51b664e33b1894e33ebb7b94cdcc7 (diff)
Update LevelDB with latest Bitcoin-specific patches
Diffstat (limited to 'src/leveldb/db')
-rw-r--r--src/leveldb/db/memtable.cc2
-rw-r--r--src/leveldb/db/version_set.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/leveldb/db/memtable.cc b/src/leveldb/db/memtable.cc
index bfec0a7e7a..287afdbdcb 100644
--- a/src/leveldb/db/memtable.cc
+++ b/src/leveldb/db/memtable.cc
@@ -101,7 +101,7 @@ void MemTable::Add(SequenceNumber s, ValueType type,
p += 8;
p = EncodeVarint32(p, val_size);
memcpy(p, value.data(), val_size);
- assert((p + val_size) - buf == encoded_len);
+ assert(p + val_size == buf + encoded_len);
table_.Insert(buf);
}
diff --git a/src/leveldb/db/version_set.cc b/src/leveldb/db/version_set.cc
index b1256f90e1..2cb6d80ed3 100644
--- a/src/leveldb/db/version_set.cc
+++ b/src/leveldb/db/version_set.cc
@@ -20,7 +20,7 @@
namespace leveldb {
-static int TargetFileSize(const Options* options) {
+static size_t TargetFileSize(const Options* options) {
return options->max_file_size;
}