Merge pull request #766 from pkasting/hash

Refine check for unordered_{map|set} availability.

Merge pull request #766 from pkasting/hash
Refine check for unordered_{map|set} availability.
c8c5fed5 · Feng Xiao · e61ff47a · f5a33255 · c8c5fed5
Commit c8c5fed5 authored Sep 10, 2015 by Feng Xiao
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

hash.h src/google/protobuf/stubs/hash.h +4 -4

No files found.
--- a/src/google/protobuf/stubs/hash.h
+++ b/src/google/protobuf/stubs/hash.h
@@ -41,10 +41,10 @@
 #define GOOGLE_PROTOBUF_HAVE_HASH_MAP 1
 #define GOOGLE_PROTOBUF_HAVE_HASH_SET 1
-// Use C++11 unordered_{map|set} if available. Otherwise, libc++ always support
+// Use C++11 unordered_{map|set} if available.
-// unordered_{map|set}
+#if ((_LIBCPP_STD_VER >= 11) || \
-#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X) || \
+     (((__cplusplus >= 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X)) && \
-    defined(_LIBCPP_VERSION)
+      (__GLIBCXX__ > 20090421)))
 # define GOOGLE_PROTOBUF_HAS_CXX11_HASH
 // For XCode >= 4.6:  the compiler is clang with libc++.