diff --git a/include/boost/unordered/detail/unique.hpp b/include/boost/unordered/detail/unique.hpp index e27a0e7d..8628591e 100644 --- a/include/boost/unordered/detail/unique.hpp +++ b/include/boost/unordered/detail/unique.hpp @@ -18,27 +18,27 @@ namespace boost { namespace unordered { namespace detail { - template struct node; + template struct unique_node; template struct ptr_node; template struct table_impl; template - struct node : + struct unique_node : boost::unordered::detail::node_base< typename ::boost::unordered::detail::rebind_wrap< - A, node >::type::pointer + A, unique_node >::type::pointer >, boost::unordered::detail::value_base { typedef typename ::boost::unordered::detail::rebind_wrap< - A, node >::type::pointer link_pointer; + A, unique_node >::type::pointer link_pointer; typedef boost::unordered::detail::node_base node_base; std::size_t hash_; #if BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT template - node(BOOST_UNORDERED_EMPLACE_ARGS) : + unique_node(BOOST_UNORDERED_EMPLACE_ARGS) : node_base(), hash_(0) { @@ -46,11 +46,11 @@ namespace boost { namespace unordered { namespace detail { this->value_ptr(), BOOST_UNORDERED_EMPLACE_FORWARD); } - ~node() { + ~unique_node() { boost::unordered::detail::destroy(this->value_ptr()); } #else - node() : + unique_node() : node_base(), hash_(0) {} @@ -103,7 +103,7 @@ namespace boost { namespace unordered { namespace detail { template struct pick_node2 { - typedef boost::unordered::detail::node node; + typedef boost::unordered::detail::unique_node node; typedef typename boost::unordered::detail::allocator_traits< typename boost::unordered::detail::rebind_wrap::type