Skip to content

Commit 3ab6107

Browse files
jkczyzMichael Polzer
authored and
Michael Polzer
committed
Fix compilation errors in support/lockedpool.cpp
Changes in bitcoin#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
1 parent 2be590c commit 3ab6107

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/support/lockedpool.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
#endif
2424

2525
#include <algorithm>
26+
#ifdef ARENA_DEBUG
27+
#include <iomanip>
28+
#include <iostream>
29+
#endif
2630

2731
LockedPoolManager* LockedPoolManager::_instance = nullptr;
2832
std::once_flag LockedPoolManager::init_flag;
@@ -149,7 +153,7 @@ void Arena::walk() const
149153
printchunk(chunk.first, chunk.second, true);
150154
std::cout << std::endl;
151155
for (const auto& chunk: chunks_free)
152-
printchunk(chunk.first, chunk.second, false);
156+
printchunk(chunk.first, chunk.second->first, false);
153157
std::cout << std::endl;
154158
}
155159
#endif

0 commit comments

Comments
 (0)