From 250fa8c732c5c53e32c39c146a8eab1c6bf85df9 Mon Sep 17 00:00:00 2001
From: Max Kellermann <mk@cm4all.com>
Date: Thu, 3 Aug 2023 09:48:52 +0200
Subject: [PATCH] util/IntrusiveHashSet: rename remove_and_dispose() to
 remove_and_dispose_key()

---
 src/util/IntrusiveHashSet.hxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/util/IntrusiveHashSet.hxx b/src/util/IntrusiveHashSet.hxx
index ab2f433d5..69929c95b 100644
--- a/src/util/IntrusiveHashSet.hxx
+++ b/src/util/IntrusiveHashSet.hxx
@@ -200,16 +200,16 @@ public:
 	/**
 	 * Remove and dispose all items with the specified key.
 	 */
-	constexpr void remove_and_dispose(const auto &key,
-					  Disposer<value_type> auto disposer) noexcept {
+	constexpr void remove_and_dispose_key(const auto &key,
+					      Disposer<value_type> auto disposer) noexcept {
 		auto &bucket = GetBucket(key);
 		counter -= bucket.remove_and_dispose_if([this, &key](const auto &item){
 			return ops.equal(key, item);
 		}, disposer);
 	}
 
-	constexpr void remove_and_dispose_if(const auto &key,
-					     std::predicate<const_reference> auto pred,
+	constexpr void remove_and_dispose_key_if(const auto &key,
+						 std::predicate<const_reference> auto pred,
 					     Disposer<value_type> auto disposer) noexcept {
 		auto &bucket = GetBucket(key);
 		counter -= bucket.remove_and_dispose_if([this, &key, &pred](const auto &item){