third_party/re2/patches/re2-android.patch - Issue 1516543002: Update re2

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-android.patch

Issue 1516543002: Update re2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Nits Created 5 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:

OLD	NEW
	(Empty)
1 diff --git a/util/util.h b/util/util.h
battre 2015/12/10 13:32:05 This has been solved by util/util.h This has been solved by util/util.h
2 index 17ef824..8f54040 100644

3 --- a/util/util.h

4 +++ b/util/util.h

5 @@ -29,6 +29,7 @@

6 #include <utility>

7 #include <set>

8

9 +#include "build/build_config.h"

10 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"

11

12 // Use std names.

13 @@ -45,7 +46,7 @@ using std::sort;

14 using std::swap;

15 using std::make_pair;

16

17 -#if defined(__GNUC__) && !defined(USE_CXX0X)

18 +#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID)

19

20 #include <tr1/unordered_set>

21 using std::tr1::unordered_set;

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

23 #else

24

25 #include <unordered_set>

26 -#ifdef WIN32

27 +#if defined(WIN32) \|\| defined(OS_ANDROID)

28 using std::tr1::unordered_set;

29 #else

30 using std::unordered_set;

OLD	NEW