diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-02 08:57:38 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-02 09:00:49 +0200 |
| commit | 659c096134080034b5a5cdce4bdd8cae91632f63 (patch) | |
| tree | 7de6630b899844accd600942637099dccb28fda1 /src/leveldb/util/logging.cc | |
| parent | f0579bfea1db3c35bbbea250445fc57c167adfc0 (diff) | |
| parent | 47f3e8c74d390139967cc40e37cf5b433f0b0f9f (diff) | |
Merge #10958: Update to latest Bitcoin patches for LevelDB
b13a68e Squashed 'src/leveldb/' changes from 196962ff0..c521b3ac6 (Pieter Wuille)
Pull request description:
Includes:
* https://github.com/bitcoin-core/leveldb/pull/2: Prefer std::atomic over MemoryBarrier (Pieter Wuille)
* https://github.com/bitcoin-core/leveldb/pull/5: Move helper functions out of sse4.2 object (Cory Fields)
* https://github.com/bitcoin-core/leveldb/pull/6: Fixes typo (Dimitris Tsapakidis)
* https://github.com/bitcoin-core/leveldb/pull/10: Clean up compile-time warnings (gcc 7.1) (Matt Corallo)
* https://github.com/bitcoin-core/leveldb/pull/11: fixup define checks. Cleans up some oopses from #5 (Cory Fields)
Tree-SHA512: 2b88a99a86ed8c74c860de13a123ea7f5424d35d314be564820cf83aaae8308383403f7cd56f17c241cfee4885699796141fed666559c21044eaabaeea073315
Diffstat (limited to 'src/leveldb/util/logging.cc')
| -rw-r--r-- | src/leveldb/util/logging.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leveldb/util/logging.cc b/src/leveldb/util/logging.cc index ca6b324403..db6160c8f1 100644 --- a/src/leveldb/util/logging.cc +++ b/src/leveldb/util/logging.cc @@ -49,7 +49,7 @@ bool ConsumeDecimalNumber(Slice* in, uint64_t* val) { uint64_t v = 0; int digits = 0; while (!in->empty()) { - char c = (*in)[0]; + unsigned char c = (*in)[0]; if (c >= '0' && c <= '9') { ++digits; const int delta = (c - '0'); |