diff options
| author |  unknown <teboring@TEBORING1-W.ad.corp.google.com> | 2015-05-27 11:45:32 -0700 |
|---|---|---|
| committer |  Bo Yang <teboring@google.com> | 2015-05-27 17:33:10 -0700 |
| commit | ca1c252923021306b7fbc488d33f6a6a89df59cf (patch) | |
| tree | 441c20dd9dff539e645f3dc29c697efb632e0d34 /src/google/protobuf/stubs/hash.h | |
| parent | b11d6fe515873591907bcce592ed86757c3d7cf3 (diff) | |
Fixes on visual studio 2008
Diffstat (limited to 'src/google/protobuf/stubs/hash.h')
| -rwxr-xr-x | src/google/protobuf/stubs/hash.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/google/protobuf/stubs/hash.h b/src/google/protobuf/stubs/hash.h index ee3c63fe..4da8a5d8 100755 --- a/src/google/protobuf/stubs/hash.h +++ b/src/google/protobuf/stubs/hash.h @@ -112,7 +112,7 @@ class hash_set : public std::set<Key, HashFcn> { #elif defined(_MSC_VER) && !defined(_STLPORT_VERSION) template <typename Key> -struct hash : public GOOGLE_PROTOBUF_HASH_NAMESPACE::hash_compare<Key> { +struct hash : public GOOGLE_PROTOBUF_HASH_COMPARE<Key> { }; // MSVC's hash_compare<const char*> hashes based on the string contents but @@ -126,8 +126,7 @@ class CstringLess { template <> struct hash<const char*> - : public GOOGLE_PROTOBUF_HASH_NAMESPACE::hash_compare< - const char*, CstringLess> {}; + : public GOOGLE_PROTOBUF_HASH_COMPARE<const char*, CstringLess> {}; template <typename Key, typename Data, typename HashFcn = hash<Key>, |