From 68d5877cf976c21c07a3a89cbf8befc8ff9092f8 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Wed, 17 Oct 2018 13:41:31 +0200 Subject: [PATCH] Fix absl::container on VS2017 v15.8 (#192) --- absl/container/internal/raw_hash_map.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/absl/container/internal/raw_hash_map.h b/absl/container/internal/raw_hash_map.h index 1edc0071e7d..05270ef34c6 100644 --- a/absl/container/internal/raw_hash_map.h +++ b/absl/container/internal/raw_hash_map.h @@ -39,11 +39,14 @@ class raw_hash_map : public raw_hash_set { using MappedConstReference = decltype(P::value( std::addressof(std::declval()))); + using KeyArgImpl = container_internal::KeyArg::value && + IsTransparent::value>; + public: using key_type = typename Policy::key_type; using mapped_type = typename Policy::mapped_type; - template - using key_arg = typename raw_hash_map::raw_hash_set::template key_arg; + template + using key_arg = typename KeyArgImpl::template type; static_assert(!std::is_reference::value, ""); // TODO(alkis): remove this assertion and verify that reference mapped_type is