diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2016-12-14 13:39:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-14 13:39:31 -0800 |
| commit | 83d681ee2caef1feb009656417830f846382d8ba (patch) | |
| tree | 3a041cb553b86cbc922684159c221817a8be4cbe | |
| parent | d1c1dad047cf2436415ea71701692db230b8d803 (diff) | |
| parent | 5587562a70cc115bf9ef921cf2080c12a241ad2c (diff) | |
| download | protobuf-83d681ee2caef1feb009656417830f846382d8ba.tar.gz protobuf-83d681ee2caef1feb009656417830f846382d8ba.tar.bz2 protobuf-83d681ee2caef1feb009656417830f846382d8ba.zip | |
Merge pull request #2495 from acozzette/android-hash
Removed Android-specific code from stubs/hash.h
| -rw-r--r-- | src/google/protobuf/map.h | 1 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/hash.h | 11 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h index efd421e6..47ced29f 100644 --- a/src/google/protobuf/map.h +++ b/src/google/protobuf/map.h @@ -615,7 +615,6 @@ class Map { #if __cplusplus >= 201103L && !defined(GOOGLE_PROTOBUF_OS_APPLE) && \ !defined(GOOGLE_PROTOBUF_OS_NACL) && \ - !defined(GOOGLE_PROTOBUF_OS_ANDROID) && \ !defined(GOOGLE_PROTOBUF_OS_EMSCRIPTEN) template<class NodeType, class... Args> void construct(NodeType* p, Args&&... args) { diff --git a/src/google/protobuf/stubs/hash.h b/src/google/protobuf/stubs/hash.h index 4eac7d5d..bf0b88b4 100644 --- a/src/google/protobuf/stubs/hash.h +++ b/src/google/protobuf/stubs/hash.h @@ -41,15 +41,10 @@ #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. -#elif ((_LIBCPP_STD_VER >= 11) || \ - (((__cplusplus >= 201103L) || defined(__GXX_EXPERIMENTAL_CXX0X)) && \ - (__GLIBCXX__ > 20090421))) +#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++. |