third_party/re2/util/util.h - Issue 951983002: Reland "Enable libc++ on Android"

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/re2/util/util.h

Issue 951983002: Reland "Enable libc++ on Android" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix clang+mesa Created 5 years, 8 months 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/re2/util/util.h

diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h

index 21439e9755e11cb0198fff254eaefa139a77fccc..a4fdfcc936ac99577b5380216d3fe42f95a37f75 100644

--- a/third_party/re2/util/util.h

+++ b/third_party/re2/util/util.h

@@ -54,7 +54,7 @@ using std::tr1::unordered_set;

#else

#include <unordered_set>

-#if defined(WIN32) || defined(OS_ANDROID)

+#if defined(WIN32) || (defined(OS_ANDROID) && !defined(_LIBCPP_ABI_VERSION))

using std::tr1::unordered_set;

#else

using std::unordered_set;

« no previous file with comments | « third_party/re2/patches/re2-libcxx.patch ('k') | tools/android/run_pie/run_pie.gyp » ('j') | no next file with comments »