From 14fe0c99bb226e111f6a3ddf0b70d911505871ff Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Sun, 1 Mar 2015 19:51:58 -0800
Subject: Fix hash_map type parameter to add Alloc for other platforms.

Change-Id: Idc5fb65a2cc469d55aff6f2cde0b51b326be0963
---
 src/google/protobuf/stubs/hash.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/google/protobuf/stubs/hash.h')

diff --git a/src/google/protobuf/stubs/hash.h b/src/google/protobuf/stubs/hash.h
index 33b7b91a..96f74a67 100644
--- a/src/google/protobuf/stubs/hash.h
+++ b/src/google/protobuf/stubs/hash.h
@@ -89,8 +89,9 @@ struct hash<const char*> {
 
 template <typename Key, typename Data,
           typename HashFcn = hash<Key>,
-          typename EqualKey = int >
-class hash_map : public std::map<Key, Data, HashFcn> {
+          typename EqualKey = int,
+          typename Alloc = std::allocator< std::pair<const Key, Data> > >
+class hash_map : public std::map<Key, Data, HashFcn, Alloc> {
  public:
   hash_map(int = 0) {}
 };
@@ -125,9 +126,10 @@ struct hash<const char*>
 
 template <typename Key, typename Data,
           typename HashFcn = hash<Key>,
-          typename EqualKey = int >
+          typename EqualKey = int,
+          typename Alloc = std::allocator< std::pair<const Key, Data> > >
 class hash_map : public GOOGLE_PROTOBUF_HASH_NAMESPACE::hash_map<
-    Key, Data, HashFcn> {
+    Key, Data, HashFcn, Alloc> {
  public:
   hash_map(int = 0) {}
 };
-- 
cgit v1.2.3