From 5986f75d169c54ffdbd164a981163f4d8f34d94a Mon Sep 17 00:00:00 2001 From: Christian Mazakas Date: Sun, 19 Feb 2023 21:13:02 -0800 Subject: [PATCH] Refactor node_handle's clear() member function to reset() --- include/boost/unordered/detail/foa/node_handle.hpp | 6 +++--- include/boost/unordered/unordered_node_map.hpp | 4 ++-- include/boost/unordered/unordered_node_set.hpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/boost/unordered/detail/foa/node_handle.hpp b/include/boost/unordered/detail/foa/node_handle.hpp index 2a238212..a36d2009 100644 --- a/include/boost/unordered/detail/foa/node_handle.hpp +++ b/include/boost/unordered/detail/foa/node_handle.hpp @@ -86,7 +86,7 @@ struct node_handle_base x.p=nullptr; } - void clear() + void reset() { al().~Allocator(); p_=nullptr; @@ -99,7 +99,7 @@ struct node_handle_base { if (!nh.empty()){ emplace(nh.p_,nh.al()); - nh.clear(); + nh.reset(); } } @@ -138,7 +138,7 @@ struct node_handle_base { if(!empty()){ type_policy::destroy(al(),p_); - a_.t_.~Allocator(); + reset(); } } diff --git a/include/boost/unordered/unordered_node_map.hpp b/include/boost/unordered/unordered_node_map.hpp index 48f79243..81493a20 100644 --- a/include/boost/unordered/unordered_node_map.hpp +++ b/include/boost/unordered/unordered_node_map.hpp @@ -403,11 +403,11 @@ namespace boost { BOOST_ASSERT(get_allocator() == nh.get_allocator()); typename map_types::element_type x; - x.p=std::addressof(nh.element()); + x.p = std::addressof(nh.element()); auto itp = table_.insert(std::move(x)); if (itp.second) { - nh.clear(); + nh.reset(); return {itp.first, true, node_type{}}; } else { return {itp.first, false, std::move(nh)}; diff --git a/include/boost/unordered/unordered_node_set.hpp b/include/boost/unordered/unordered_node_set.hpp index 93f26773..2fcd4f8b 100644 --- a/include/boost/unordered/unordered_node_set.hpp +++ b/include/boost/unordered/unordered_node_set.hpp @@ -395,7 +395,7 @@ namespace boost { auto itp = table_.insert(std::move(x)); if (itp.second) { - nh.clear(); + nh.reset(); return {itp.first, true, node_type{}}; } else { return {itp.first, false, std::move(nh)};