Merge pull request #4183 from pcc/win-libcxx

Add support for libc++ on Windows.

Merge pull request #4183 from pcc/win-libcxx
Add support for libc++ on Windows.
9dc0a4d5 · Feng Xiao · GitHub · 325ecff0 · 3ba21cd5 · 9dc0a4d5
Unverified Commit 9dc0a4d5 authored Feb 26, 2018 by Feng Xiao Committed by GitHub Feb 26, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

arena.h src/google/protobuf/arena.h +1 -1

hash.h src/google/protobuf/stubs/hash.h +2 -1

No files found.
--- 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>

--- 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> {