diff options
| author | Pieter Wuille <[email protected]> | 2013-12-12 22:08:18 +0100 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2013-12-12 22:08:18 +0100 |
| commit | ed873a301eeff8c021ba57c78fb702fd2b6f0452 (patch) | |
| tree | 3fb5bcb91b8ceab464a50e63b6fce407eccb17e2 /src/leveldb/util/arena.cc | |
| parent | Merge pull request #3393 from theuni/build-10.6 (diff) | |
| parent | Squashed 'src/leveldb/' changes from 936b461..e991315 (diff) | |
| download | discoin-ed873a301eeff8c021ba57c78fb702fd2b6f0452.tar.xz discoin-ed873a301eeff8c021ba57c78fb702fd2b6f0452.zip | |
Merge src/leveldb changes for LevelDB 1.15
Diffstat (limited to 'src/leveldb/util/arena.cc')
| -rw-r--r-- | src/leveldb/util/arena.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leveldb/util/arena.cc b/src/leveldb/util/arena.cc index 9551d6a3a..9367f7149 100644 --- a/src/leveldb/util/arena.cc +++ b/src/leveldb/util/arena.cc @@ -40,7 +40,7 @@ char* Arena::AllocateFallback(size_t bytes) { } char* Arena::AllocateAligned(size_t bytes) { - const int align = sizeof(void*); // We'll align to pointer size + const int align = (sizeof(void*) > 8) ? sizeof(void*) : 8; assert((align & (align-1)) == 0); // Pointer size should be a power of 2 size_t current_mod = reinterpret_cast<uintptr_t>(alloc_ptr_) & (align-1); size_t slop = (current_mod == 0 ? 0 : align - current_mod); |