diff --git a/extra/boost_unordered.natvis b/extra/boost_unordered.natvis index d4dbc186..ff5e5640 100644 --- a/extra/boost_unordered.natvis +++ b/extra/boost_unordered.natvis @@ -347,9 +347,9 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) {{ size={table_.size_ctrl.size} }} - *reinterpret_cast<hasher*>(static_cast<table_type::super::base1*>(&table_)) - *reinterpret_cast<key_equal*>(static_cast<table_type::super::base2*>(&table_)) - *reinterpret_cast<allocator_type*>(static_cast<table_type::super::base3*>(&table_)) + *reinterpret_cast<hasher*>(static_cast<table_type::super::hash_base*>(&table_)) + *reinterpret_cast<key_equal*>(static_cast<table_type::super::pred_base*>(&table_)) + *reinterpret_cast<allocator_type*>(static_cast<table_type::super::allocator_base*>(&table_)) table_ @@ -359,9 +359,9 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) {{ size={table_.size_ctrl.size} }} - *reinterpret_cast<hasher*>(static_cast<table_type::super::base1*>(&table_)) - *reinterpret_cast<key_equal*>(static_cast<table_type::super::base2*>(&table_)) - *reinterpret_cast<allocator_type*>(static_cast<table_type::super::base3*>(&table_)) + *reinterpret_cast<hasher*>(static_cast<table_type::super::hash_base*>(&table_)) + *reinterpret_cast<key_equal*>(static_cast<table_type::super::pred_base*>(&table_)) + *reinterpret_cast<allocator_type*>(static_cast<table_type::super::allocator_base*>(&table_)) table_,view(MapHelper) diff --git a/include/boost/unordered/detail/foa/core.hpp b/include/boost/unordered/detail/foa/core.hpp index 513b433d..db73a866 100644 --- a/include/boost/unordered/detail/foa/core.hpp +++ b/include/boost/unordered/detail/foa/core.hpp @@ -1413,12 +1413,6 @@ __declspec(empty_bases) /* activate EBO with multiple inheritance */ table_core:empty_value,empty_value,empty_value { -private: - // These `baseN` aliases are for debugger visualizations, like natvis - using base1=empty_value; - using base2=empty_value; - using base3=empty_value; - public: using type_policy=TypePolicy; using group_type=Group;