diff options
| author | Adam Cozzette <acozzette@google.com> | 2018-03-13 16:54:31 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-03-13 16:54:31 -0700 |
| commit | afe96b6d4235b9d9fbfce2465f5c6d82c2611f48 (patch) | |
| tree | d509cb3cc3f2b25b58a75563758d2092103ca19a /src/google/protobuf/stubs | |
| parent | 0400cca3236de1ca303af38bf81eab332d042b7c (diff) | |
| parent | 89b5333ad0f10058d5af62701c5ebea0db376c5b (diff) | |
| download | protobuf-afe96b6d4235b9d9fbfce2465f5c6d82c2611f48.tar.gz protobuf-afe96b6d4235b9d9fbfce2465f5c6d82c2611f48.tar.bz2 protobuf-afe96b6d4235b9d9fbfce2465f5c6d82c2611f48.zip | |
Merge branch 'master' into down-integrate
Diffstat (limited to 'src/google/protobuf/stubs')
| -rw-r--r-- | src/google/protobuf/stubs/hash.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/hash.h b/src/google/protobuf/stubs/hash.h index daf8ec57..d04a25e1 100644 --- a/src/google/protobuf/stubs/hash.h +++ b/src/google/protobuf/stubs/hash.h @@ -235,7 +235,8 @@ class hash_set : public std::set<Key, HashFcn> { HashFcn hash_function() const { return HashFcn(); } }; -#elif defined(_MSC_VER) && !defined(_STLPORT_VERSION) +#elif defined(_MSC_VER) && !defined(_STLPORT_VERSION) && \ + !(defined(_LIBCPP_STD_VER) && _LIBCPP_STD_VER >= 11) template <typename Key> struct hash : public GOOGLE_PROTOBUF_HASH_COMPARE<Key> { |