Commit 14fe0c99 authored by Jisi Liu's avatar Jisi Liu

Fix hash_map type parameter to add Alloc for other platforms.

Change-Id: Idc5fb65a2cc469d55aff6f2cde0b51b326be0963
parent 0a25cfe6
...@@ -89,8 +89,9 @@ struct hash<const char*> { ...@@ -89,8 +89,9 @@ struct hash<const char*> {
template <typename Key, typename Data, template <typename Key, typename Data,
typename HashFcn = hash<Key>, typename HashFcn = hash<Key>,
typename EqualKey = int > typename EqualKey = int,
class hash_map : public std::map<Key, Data, HashFcn> { typename Alloc = std::allocator< std::pair<const Key, Data> > >
class hash_map : public std::map<Key, Data, HashFcn, Alloc> {
public: public:
hash_map(int = 0) {} hash_map(int = 0) {}
}; };
...@@ -125,9 +126,10 @@ struct hash<const char*> ...@@ -125,9 +126,10 @@ struct hash<const char*>
template <typename Key, typename Data, template <typename Key, typename Data,
typename HashFcn = hash<Key>, 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< class hash_map : public GOOGLE_PROTOBUF_HASH_NAMESPACE::hash_map<
Key, Data, HashFcn> { Key, Data, HashFcn, Alloc> {
public: public:
hash_map(int = 0) {} hash_map(int = 0) {}
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment