aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google
diff options
context:
space:
mode:
authorGravatar Feng Xiao <xfxyjwf@gmail.com>2018-02-26 15:07:55 -0800
committerGravatar GitHub <noreply@github.com>2018-02-26 15:07:55 -0800
commit9dc0a4d5cf181845c4c8ca6c482ec38cc1835bbc (patch)
tree64b6b9ed7c52370a6e289a6bb5ca477c0f50e32e /src/google
parent325ecff0869543d74125a1bcd805f52227c1bd28 (diff)
parent3ba21cd5f724528ab8792c05bda6e06ceb557bff (diff)
Merge pull request #4183 from pcc/win-libcxx
Add support for libc++ on Windows.
Diffstat (limited to 'src/google')
-rw-r--r--src/google/protobuf/arena.h2
-rw-r--r--src/google/protobuf/stubs/hash.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h
index f3cdedac..b500b3be 100644
--- a/src/google/protobuf/arena.h
+++ b/src/google/protobuf/arena.h
@@ -40,7 +40,7 @@
#if LANG_CXX11
#include <google/protobuf/stubs/type_traits.h>
#endif
-#if defined(_MSC_VER) && !_HAS_EXCEPTIONS
+#if defined(_MSC_VER) && !defined(_LIBCPP_STD_VER) && !_HAS_EXCEPTIONS
// Work around bugs in MSVC <typeinfo> header when _HAS_EXCEPTIONS=0.
#include <exception>
#include <typeinfo>
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> {