aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Czyz <jkczyz@gmail.com>2019-06-06 13:50:17 -0700
committerJeffrey Czyz <jkczyz@gmail.com>2019-11-16 08:44:42 -0800
commitad715488222f2f2ce2e2cff632eae94fd49ea9c5 (patch)
treeb34b5e80a2f2fd74d4325fcca3ae8ddcb4480a6e
parent80fdb6fad132166b10fbeb8615e3c5c591209e0b (diff)
Fix compilation errors in support/lockedpool.cpp
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
-rw-r--r--src/support/lockedpool.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
index 5c2050e4a2..a9541a9cac 100644
--- a/src/support/lockedpool.cpp
+++ b/src/support/lockedpool.cpp
@@ -23,6 +23,10 @@
#endif
#include <algorithm>
+#ifdef ARENA_DEBUG
+#include <iomanip>
+#include <iostream>
+#endif
LockedPoolManager* LockedPoolManager::_instance = nullptr;
std::once_flag LockedPoolManager::init_flag;
@@ -149,7 +153,7 @@ void Arena::walk() const
printchunk(chunk.first, chunk.second, true);
std::cout << std::endl;
for (const auto& chunk: chunks_free)
- printchunk(chunk.first, chunk.second, false);
+ printchunk(chunk.first, chunk.second->first, false);
std::cout << std::endl;
}
#endif