From 55d42d0830798511e3c50b225aec070c4ab90b9e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 14 Oct 2016 16:48:52 -0400 Subject: [PATCH] include/mempool: define additional pair factory for unordered_map This fixes build on debian jessie, libstdc++-4.9-dev:amd64 4.9.2-10. Signed-off-by: Sage Weil --- src/include/mempool.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/include/mempool.h b/src/include/mempool.h index 8612db0fb8c23..e1761160a6fd0 100644 --- a/src/include/mempool.h +++ b/src/include/mempool.h @@ -520,13 +520,17 @@ DEFINE_MEMORY_POOLS_HELPER(P) // for std::unordered_map #define MEMPOOL_DEFINE_UNORDERED_MAP_FACTORY(k, v, cached, factoryname, pool) \ - typedef std::pair _factory_type_##factoryname##pair_t; \ - typedef std::__detail::_Hash_node<_factory_type_##factoryname##pair_t, \ + typedef std::pair _factory_type_##factoryname##pair_t; \ + typedef std::pair _factory_type_##factoryname##cpair_t; \ + typedef std::__detail::_Hash_node<_factory_type_##factoryname##cpair_t, \ cached> \ _factory_type_##factoryname##type; \ MEMPOOL_DEFINE_FACTORY( \ _factory_type_##factoryname##type, \ - factoryname##_unordered_hash_node, pool); + factoryname##_unordered_hash_node, pool); \ + MEMPOOL_DEFINE_FACTORY( \ + _factory_type_##factoryname##pair_t, \ + factoryname##_unordered_hash_pair, pool); #define MEMPOOL_DEFINE_UNORDERED_MAP_BASE_FACTORY(pool) \ MEMPOOL_DEFINE_FACTORY(std::__detail::_Hash_node_base*, \ -- 2.39.5