third_party/re2/patches/re2-libcxx.patch - Issue 835633003: Enable libc++ on Android

Side by Side Diff

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

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

Side by Side Diff: third_party/re2/patches/re2-libcxx.patch

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

Patch Set: Rebase to friending fixes Created 5 years, 10 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:

OLD	NEW
1 diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h	1 diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h

2 index 8f54040..de1ef5b 100644	2 index 8f54040..de1ef5b 100644

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

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

5 @@ -46,7 +46,8 @@ using std::sort;	5 @@ -46,7 +46,8 @@ using std::sort;

6 using std::swap;	6 using std::swap;

7 using std::make_pair;	7 using std::make_pair;

8	8

9 -#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID)	9 -#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID)

10 +#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID) && \	10 +#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID) && \

11 + !defined(_LIBCPP_ABI_VERSION)	11 + !defined(_LIBCPP_ABI_VERSION)

12	12

13 #include <tr1/unordered_set>	13 #include <tr1/unordered_set>

14 using std::tr1::unordered_set;	14 using std::tr1::unordered_set;

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

	16 #else

	17

	18 #include <unordered_set>

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

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

	21 using std::tr1::unordered_set;

	22 #else

	23 using std::unordered_set;

OLD	NEW