third_party/re2/patches/rename-posix-option.patch - Issue 12033058: Updated to most recent version RE2 and remove upstreamed patches.

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/rename-posix-option.patch

Issue 12033058: Updated to most recent version RE2 and remove upstreamed patches. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 11 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:

View unified diff | Download patch | Annotate | Revision Log

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

2 index 6acd802..3cc3dd4 100644	2 index b9e44fc..fb43abf 100644

3 --- a/third_party/re2/re2/re2.cc	3 --- a/re2/re2.cc

4 +++ b/third_party/re2/re2/re2.cc	4 +++ b/re2/re2.cc

5 @@ -38,8 +38,8 @@ const int RE2::Options::kDefaultMaxMem; // initialized in re2 .h	5 @@ -56,8 +56,8 @@ RE2::Options::Options()

6	6

7 RE2::Options::Options(RE2::CannedOptions opt)	7 RE2::Options::Options(RE2::CannedOptions opt)

8 : encoding_(opt == RE2::Latin1 ? EncodingLatin1 : EncodingUTF8),	8 : encoding_(opt == RE2::Latin1 ? EncodingLatin1 : EncodingUTF8),

9 - posix_syntax_(opt == RE2::POSIX),	9 - posix_syntax_(opt == RE2::POSIX),

10 - longest_match_(opt == RE2::POSIX),	10 - longest_match_(opt == RE2::POSIX),

11 + posix_syntax_(opt == RE2::POSIX_SYNTAX),	11 + posix_syntax_(opt == RE2::POSIX_SYNTAX),

12 + longest_match_(opt == RE2::POSIX_SYNTAX),	12 + longest_match_(opt == RE2::POSIX_SYNTAX),

13 log_errors_(opt != RE2::Quiet),	13 log_errors_(opt != RE2::Quiet),

14 max_mem_(kDefaultMaxMem),	14 max_mem_(kDefaultMaxMem),

15 literal_(false),	15 literal_(false),

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

17 index 272028b..9f5b66d 100644	17 index c509853..98b06b8 100644

18 --- a/third_party/re2/re2/re2.h	18 --- a/re2/re2.h

19 +++ b/third_party/re2/re2/re2.h	19 +++ b/re2/re2.h

20 @@ -251,7 +251,7 @@ class RE2 {	20 @@ -251,7 +251,7 @@ class RE2 {

21 enum CannedOptions {	21 enum CannedOptions {

22 DefaultOptions = 0,	22 DefaultOptions = 0,

23 Latin1, // treat input as Latin-1 (default UTF-8)	23 Latin1, // treat input as Latin-1 (default UTF-8)

24 - POSIX, // POSIX syntax, leftmost-longest match	24 - POSIX, // POSIX syntax, leftmost-longest match

25 + POSIX_SYNTAX, // POSIX syntax, leftmost-longest match	25 + POSIX_SYNTAX, // POSIX syntax, leftmost-longest match

26 Quiet // do not log about regexp parse errors	26 Quiet // do not log about regexp parse errors

27 };	27 };

28	28

OLD	NEW

« no previous file with comments | « third_party/re2/patches/remove-valgrind-code.patch ('k') | third_party/re2/re2/dfa.cc » ('j') | no next file with comments »