third_party/protobuf/src/google/protobuf/stubs/hash.h - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/src/google/protobuf/stubs/hash.h

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Make chrome settings proto generated file a component Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/protobuf/src/google/protobuf/stubs/hash.h

diff --git a/third_party/protobuf/src/google/protobuf/stubs/hash.h b/third_party/protobuf/src/google/protobuf/stubs/hash.h

index 4eac7d5d2584cd75dd242ad097df2d3af0e8c946..bf0b88b4e7e9d7e1bd0ae116ba401b982d544d57 100644

--- a/third_party/protobuf/src/google/protobuf/stubs/hash.h

+++ b/third_party/protobuf/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

// 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++.