From 1c6c085127170fe2ad7ac4c285938873ba7d0e20 Mon Sep 17 00:00:00 2001
From: Christian Mazakas <christian.mazakas@gmail.com>
Date: Tue, 21 Dec 2021 09:26:27 -0800
Subject: [PATCH] Update `unordered_map` to use singular type trait for
 `erase()` / `extract()` SFINAE

---
 include/boost/unordered/unordered_map.hpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/boost/unordered/unordered_map.hpp b/include/boost/unordered/unordered_map.hpp
index 82cb7f80..2271ef7a 100644
--- a/include/boost/unordered/unordered_map.hpp
+++ b/include/boost/unordered/unordered_map.hpp
@@ -18,7 +18,6 @@
 #include <boost/functional/hash.hpp>
 #include <boost/move/move.hpp>
 #include <boost/type_traits/is_constructible.hpp>
-#include <boost/type_traits/is_convertible.hpp>
 #include <boost/unordered/detail/map.hpp>
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
@@ -432,9 +431,7 @@ namespace boost {
 
       template <class Key>
       typename boost::enable_if_c<
-        detail::are_transparent<Key, H, P>::value &&
-          !boost::is_convertible<Key, iterator>::value &&
-          !boost::is_convertible<Key, const_iterator>::value,
+        detail::transparent_non_iterable<Key, unordered_map>::value,
         node_type>::type
       extract(BOOST_FWD_REF(Key) k)
       {
@@ -724,9 +721,7 @@ namespace boost {
 
       template <class Key>
       typename boost::enable_if_c<
-        detail::are_transparent<Key, H, P>::value &&
-          !boost::is_convertible<Key, iterator>::value &&
-          !boost::is_convertible<Key, const_iterator>::value,
+        detail::transparent_non_iterable<Key, unordered_map>::value,
         size_type>::type
       erase(BOOST_FWD_REF(Key) k)
       {