From a1be711e965f0f48faf84080319e97ddc6032243 Mon Sep 17 00:00:00 2001 From: Peter Kasting Date: Thu, 27 Aug 2015 19:59:06 -0700 Subject: Try modifying check in hopes of passing upstream build --- src/google/protobuf/stubs/hash.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/google/protobuf/stubs/hash.h') diff --git a/src/google/protobuf/stubs/hash.h b/src/google/protobuf/stubs/hash.h index 2f01be52..f322d722 100755 --- a/src/google/protobuf/stubs/hash.h +++ b/src/google/protobuf/stubs/hash.h @@ -42,8 +42,9 @@ #define GOOGLE_PROTOBUF_HAVE_HASH_SET 1 // Use C++11 unordered_{map|set} if available. -#if ((__cplusplus >= 201103L) && \ - ((__GLIBCXX__ > 20090421) || (_LIBCPP_STD_VER >= 11))) +#if ((_LIBCPP_STD_VER >= 11) || + (((__cplusplus >= 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X)) && + (__GLIBCXX__ > 20090421))) # define GOOGLE_PROTOBUF_HAS_CXX11_HASH // For XCode >= 4.6: the compiler is clang with libc++. -- cgit v1.2.3