diff options
author | fanquake <fanquake@gmail.com> | 2019-11-20 09:36:43 -0500 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2019-11-20 09:54:31 -0500 |
commit | 76e777df83db4fc14d5cf96c67ceaa554a016a3a (patch) | |
tree | d3e41fc3743d17aeb983707aab934c24ad095ab3 /share/pixmaps/bitcoin64.png | |
parent | 26744ae189af3285c5bbf5bfe34691186415f17a (diff) | |
parent | 30fb598737f6efb7802d707a1fa989872e7f8b7b (diff) |
Merge #16161: util: Fix compilation errors in support/lockedpool.cpp
30fb598737f6efb7802d707a1fa989872e7f8b7b Fix segfault in allocator_tests/arena_tests (Jeffrey Czyz)
15c84f53f47bf6e6a9c4c9dfe50c78d98f7ec07f Define ARENA_DEBUG in Travis test runs (Jeffrey Czyz)
ad715488222f2f2ce2e2cff632eae94fd49ea9c5 Fix compilation errors in support/lockedpool.cpp (Jeffrey Czyz)
Pull request description:
Changes in #12048 cause a compilation error in Arena::walk() when
ARENA_DEBUG is defined. Specifically, Arena's chunks_free map was
changed to have a different value type.
Additionally, missing includes cause other compilation errors when
ARENA_DEBUG is defined.
Reproduced with:
make CPPFLAGS=-DARENA_DEBUG
ACKs for top commit:
laanwj:
ACK 30fb598737f6efb7802d707a1fa989872e7f8b7b
fanquake:
ACK 30fb598737f6efb7802d707a1fa989872e7f8b7b - thanks for following up jkczyz.
Tree-SHA512: 4eec368a4e9c67e4e2a27bc05608a807c2892d50c60d06ed21490cd274c0369f9671bc05b3006acc2a193316caf4896454c9c299603bfed29bd488f1987ec446
Diffstat (limited to 'share/pixmaps/bitcoin64.png')
0 files changed, 0 insertions, 0 deletions