Move RequireUsableKey and IsDecomposable to container_memory.h. This is a behavior-preserving refactor to share RequireUsableKey and IsDecomposable alongside DecomposePair and DecomposeValue so other containers can reuse them. PiperOrigin-RevId: 1023940649
diff --git a/absl/container/internal/container_memory.h b/absl/container/internal/container_memory.h index e09b880..54cde80 100644 --- a/absl/container/internal/container_memory.h +++ b/absl/container/internal/container_memory.h
@@ -318,6 +318,30 @@ return std::forward<F>(f)(key, std::forward<Arg>(arg)); } +// SFINAE probe checking that `PassedKey` can be hashed and compared against +// `ContainerKey`. +template <class ContainerKey, class Hash, class Eq> +struct RequireUsableKey { + template <class PassedKey, class... Args> + std::pair< + decltype(std::declval<const Hash&>()(std::declval<const PassedKey&>())), + decltype(std::declval<const Eq&>()(std::declval<const ContainerKey&>(), + std::declval<const PassedKey&>()))>* + operator()(const PassedKey&, const Args&...) const; +}; + +// True if `Policy::apply` can extract a key from `Ts...` that satisfies +// `RequireUsableKey<Policy::key_type, Hash, Eq>`. +template <class E, class Policy, class Hash, class Eq, class... Ts> +struct IsDecomposable : std::false_type {}; + +template <class Policy, class Hash, class Eq, class... Ts> +struct IsDecomposable< + std::void_t<decltype(Policy::apply( + RequireUsableKey<typename Policy::key_type, Hash, Eq>(), + std::declval<Ts>()...))>, + Policy, Hash, Eq, Ts...> : std::true_type {}; + // Helper functions for asan and msan. inline void SanitizerPoisonMemoryRegion(const void* m, size_t s) { #ifdef ABSL_HAVE_ADDRESS_SANITIZER
diff --git a/absl/container/internal/raw_hash_set.h b/absl/container/internal/raw_hash_set.h index e9cdee5..94bbfd1 100644 --- a/absl/container/internal/raw_hash_set.h +++ b/absl/container/internal/raw_hash_set.h
@@ -378,26 +378,6 @@ template <typename AllocType> void CopyAlloc(AllocType&, AllocType&, std::false_type /* propagate_alloc */) {} -template <class ContainerKey, class Hash, class Eq> -struct RequireUsableKey { - template <class PassedKey, class... Args> - std::pair< - decltype(std::declval<const Hash&>()(std::declval<const PassedKey&>())), - decltype(std::declval<const Eq&>()(std::declval<const ContainerKey&>(), - std::declval<const PassedKey&>()))>* - operator()(const PassedKey&, const Args&...) const; -}; - -template <class E, class Policy, class Hash, class Eq, class... Ts> -struct IsDecomposable : std::false_type {}; - -template <class Policy, class Hash, class Eq, class... Ts> -struct IsDecomposable< - std::void_t<decltype(Policy::apply( - RequireUsableKey<typename Policy::key_type, Hash, Eq>(), - std::declval<Ts>()...))>, - Policy, Hash, Eq, Ts...> : std::true_type {}; - template <typename T, template <typename...> class Template> struct is_instance_of : std::false_type {}; template <template <typename...> class Template, typename... Args>