From 8fc1bb41ef44284ba2fa2b4ac60f0fcacd3939d6 Mon Sep 17 00:00:00 2001
From: greg <greg7mdp@gmail.com>
Date: Sun, 12 May 2019 11:36:49 -0400
Subject: [PATCH] fix compilation warnings with vs2017+, std=c++17

---
 parallel_hashmap/phmap_base.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/parallel_hashmap/phmap_base.h b/parallel_hashmap/phmap_base.h
index 4f0479a..ed546c9 100644
--- a/parallel_hashmap/phmap_base.h
+++ b/parallel_hashmap/phmap_base.h
@@ -1417,11 +1417,12 @@ struct RebindAlloc {
   using type = typename RebindFirstArg<T, U>::type;
 };
 
-template <typename T, typename U>
-struct RebindAlloc<T, U, true> {
-  using type = typename T::template rebind<U>::other;
+template <typename A, typename U>
+struct RebindAlloc<A, U, true> {
+    using type = typename std::allocator_traits<A>::template rebind_alloc<U>;
 };
 
+
 }  // namespace memory_internal
 
 template <typename Ptr>
@@ -1632,7 +1633,7 @@ private:
     static auto construct_impl(int, A& a,  // NOLINT(runtime/references)
                                Args&&... args)
         -> decltype(a.construct(std::forward<Args>(args)...)) {
-        a.construct(std::forward<Args>(args)...);
+        std::allocator_traits<A>::construct(a, std::forward<Args>(args)...);
     }
 
     template <typename T, typename... Args>
@@ -1643,7 +1644,7 @@ private:
     template <typename A, typename T>
     static auto destroy_impl(int, A& a,  // NOLINT(runtime/references)
                              T* p) -> decltype(a.destroy(p)) {
-        a.destroy(p);
+        std::allocator_traits<A>::destroy(a, p);
     }
     template <typename T>
     static void destroy_impl(char, Alloc&, T* p) {