Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: third_party/re2/patches/re2-android.patch

Issue 10873029: Migrate WebRequestRedirectByRegExAction to use RE2 and roll RE2 to revision 97:401ab4168e8e (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged with ToT Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: third_party/re2/patches/re2-android.patch
diff --git a/third_party/re2/patches/re2-android.patch b/third_party/re2/patches/re2-android.patch
index a622035bd85fd112a99145d15f1d756d9dfda611..bcaea8d1cf50c03fa288b59c576a1be0da1055e2 100644
--- a/third_party/re2/patches/re2-android.patch
+++ b/third_party/re2/patches/re2-android.patch
@@ -1,6 +1,7 @@
-diff -r cae1910ce3c5 re2/parse.cc
---- a/re2/parse.cc Mon Jul 30 16:12:46 2012 +0200
-+++ b/re2/parse.cc Tue Jul 31 14:12:31 2012 +0200
+diff --git a/third_party/re2/re2/parse.cc b/third_party/re2/re2/parse.cc
+index 0cf4ab4..6423fe9 100644
+--- a/third_party/re2/re2/parse.cc
++++ b/third_party/re2/re2/parse.cc
@@ -16,6 +16,8 @@
// and recognizes the Perl escape sequences \d, \s, \w, \D, \S, and \W.
// See regexp.h for rationale.
@@ -10,9 +11,10 @@ diff -r cae1910ce3c5 re2/parse.cc
#include "util/util.h"
#include "re2/regexp.h"
#include "re2/stringpiece.h"
-diff -r cae1910ce3c5 re2/re2.cc
---- a/re2/re2.cc Mon Jul 30 16:12:46 2012 +0200
-+++ b/re2/re2.cc Tue Jul 31 14:12:31 2012 +0200
+diff --git a/third_party/re2/re2/re2.cc b/third_party/re2/re2/re2.cc
+index 989add6..78978f1 100644
+--- a/third_party/re2/re2/re2.cc
++++ b/third_party/re2/re2/re2.cc
@@ -9,6 +9,8 @@
#include "re2/re2.h"
@@ -22,9 +24,10 @@ diff -r cae1910ce3c5 re2/re2.cc
#include <stdio.h>
#include <string>
#ifdef WIN32
-diff -r cae1910ce3c5 util/util.h
---- a/util/util.h Mon Jul 30 16:12:46 2012 +0200
-+++ b/util/util.h Tue Jul 31 14:12:31 2012 +0200
+diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h
+index dab7e16..11b5f4a 100644
+--- a/third_party/re2/util/util.h
++++ b/third_party/re2/util/util.h
@@ -28,6 +28,7 @@
#include <utility>
#include <set>
@@ -33,7 +36,7 @@ diff -r cae1910ce3c5 util/util.h
#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
// Use std names.
-@@ -44,7 +45,7 @@
+@@ -44,7 +45,7 @@ using std::sort;
using std::swap;
using std::make_pair;
@@ -42,7 +45,7 @@ diff -r cae1910ce3c5 util/util.h
#include <tr1/unordered_set>
using std::tr1::unordered_set;
-@@ -52,7 +53,7 @@
+@@ -52,7 +53,7 @@ using std::tr1::unordered_set;
#else
#include <unordered_set>
« no previous file with comments | « third_party/re2/patches/fix-implicit-conversion.patch ('k') | third_party/re2/patches/re2-msvc9-chrome.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698