diff options
| author | Bo Yang <teboring@google.com> | 2015-09-15 18:25:02 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2015-10-04 13:22:54 -0700 |
| commit | 7c14dc837b2fcd61ed244ced90debeb4b42d1119 (patch) | |
| tree | ebaea9d0a20b315f4f372136200494d4aff3936c /src/google/protobuf/stubs/hash.h | |
| parent | fbabf987e671aa37d11e1163e0175f99b32df5fe (diff) | |
| download | protobuf-7c14dc837b2fcd61ed244ced90debeb4b42d1119.tar.gz protobuf-7c14dc837b2fcd61ed244ced90debeb4b42d1119.tar.bz2 protobuf-7c14dc837b2fcd61ed244ced90debeb4b42d1119.zip | |
Down-integrate internal bug fixing changes.
Diffstat (limited to 'src/google/protobuf/stubs/hash.h')
| -rwxr-xr-x | src/google/protobuf/stubs/hash.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/hash.h b/src/google/protobuf/stubs/hash.h index e7b3771f..58334322 100755 --- a/src/google/protobuf/stubs/hash.h +++ b/src/google/protobuf/stubs/hash.h @@ -41,9 +41,14 @@ #define GOOGLE_PROTOBUF_HAVE_HASH_MAP 1 #define GOOGLE_PROTOBUF_HAVE_HASH_SET 1 +// Android +#if defined(__ANDROID__) +# undef GOOGLE_PROTOBUF_HAVE_HASH_MAP +# undef GOOGLE_PROTOBUF_HAVE_HASH_MAP + // Use C++11 unordered_{map|set} if available. -#if ((_LIBCPP_STD_VER >= 11) || \ - (((__cplusplus >= 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X)) && \ +#elif ((_LIBCPP_STD_VER >= 11) || \ + (((__cplusplus >= 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X)) && \ (__GLIBCXX__ > 20090421))) # define GOOGLE_PROTOBUF_HAS_CXX11_HASH |