diff options
| author |  xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-09-22 02:40:50 +0000 |
|---|---|---|
| committer | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-09-22 02:40:50 +0000 |
| commit | b55a20fa2c669b181f47ea9219b8e74d1263da19 (patch) | |
| tree | 3936a0e7c22196587a6d8397372de41434fe2129 /src/google/protobuf/stubs/hash.h | |
| parent | 9ced30caf94bb4e7e9629c199679ff44e8ca7389 (diff) | |
Down-integrate from internal branch
Diffstat (limited to 'src/google/protobuf/stubs/hash.h')
| -rw-r--r-- | src/google/protobuf/stubs/hash.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/google/protobuf/stubs/hash.h b/src/google/protobuf/stubs/hash.h index 822d6050..f7d10712 100644 --- a/src/google/protobuf/stubs/hash.h +++ b/src/google/protobuf/stubs/hash.h @@ -90,12 +90,16 @@ template <typename Key, typename Data, typename HashFcn = hash<Key>, typename EqualKey = int > class hash_map : public std::map<Key, Data, HashFcn> { + public: + hash_map(int = 0) {} }; template <typename Key, typename HashFcn = hash<Key>, typename EqualKey = int > class hash_set : public std::set<Key, HashFcn> { + public: + hash_set(int = 0) {} }; #elif defined(_MSC_VER) && !defined(_STLPORT_VERSION) @@ -123,6 +127,8 @@ template <typename Key, typename Data, typename EqualKey = int > class hash_map : public HASH_NAMESPACE::hash_map< Key, Data, HashFcn> { + public: + hash_map(int = 0) {} }; template <typename Key, @@ -130,6 +136,8 @@ template <typename Key, typename EqualKey = int > class hash_set : public HASH_NAMESPACE::hash_set< Key, HashFcn> { + public: + hash_set(int = 0) {} }; #else @@ -163,6 +171,8 @@ template <typename Key, typename Data, typename EqualKey = std::equal_to<Key> > class hash_map : public HASH_NAMESPACE::HASH_MAP_CLASS< Key, Data, HashFcn, EqualKey> { + public: + hash_map(int = 0) {} }; template <typename Key, @@ -170,6 +180,8 @@ template <typename Key, typename EqualKey = std::equal_to<Key> > class hash_set : public HASH_NAMESPACE::HASH_SET_CLASS< Key, HashFcn, EqualKey> { + public: + hash_set(int = 0) {} }; #endif |