Skip to content

P
protobuf
Commit a1be711e authored by Peter Kasting's avatar Peter Kasting
Browse files
Options

Try modifying check in hopes of passing upstream build

parent 432771fa
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
src/google/protobuf/stubs/hash.h
View file @ a1be711e
...@@ -42,8 +42,9 @@ ...@@ -42,8 +42,9 @@
#define GOOGLE_PROTOBUF_HAVE_HASH_SET 1 #define GOOGLE_PROTOBUF_HAVE_HASH_SET 1
// Use C++11 unordered_{map|set} if available. // Use C++11 unordered_{map|set} if available.
#if ((__cplusplus >= 201103L) && \ #if ((_LIBCPP_STD_VER >= 11) ||
((__GLIBCXX__ > 20090421) || (_LIBCPP_STD_VER >= 11))) (((__cplusplus >= 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X)) &&
(__GLIBCXX__ > 20090421)))
# define GOOGLE_PROTOBUF_HAS_CXX11_HASH # define GOOGLE_PROTOBUF_HAS_CXX11_HASH
// For XCode >= 4.6: the compiler is clang with libc++. // For XCode >= 4.6: the compiler is clang with libc++.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment