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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/re2/patches/rename-posix-option.patch
diff --git a/third_party/re2/patches/rename-posix-option.patch b/third_party/re2/patches/rename-posix-option.patch
index 5c8a8e79d4aa1b6fbea5f7bfd26124aa1e74ee5b..47caa632a8a4f534f4f9fbdf2cd9d85af1c199b2 100644
--- a/third_party/re2/patches/rename-posix-option.patch
+++ b/third_party/re2/patches/rename-posix-option.patch
@@ -1,8 +1,8 @@
-diff --git a/third_party/re2/re2/re2.cc b/third_party/re2/re2/re2.cc
-index 6acd802..3cc3dd4 100644
---- a/third_party/re2/re2/re2.cc
-+++ b/third_party/re2/re2/re2.cc
-@@ -38,8 +38,8 @@ const int RE2::Options::kDefaultMaxMem; // initialized in re2.h
+diff --git a/re2/re2.cc b/re2/re2.cc
+index b9e44fc..fb43abf 100644
+--- a/re2/re2.cc
++++ b/re2/re2.cc
+@@ -56,8 +56,8 @@ RE2::Options::Options()
RE2::Options::Options(RE2::CannedOptions opt)
: encoding_(opt == RE2::Latin1 ? EncodingLatin1 : EncodingUTF8),
@@ -13,10 +13,10 @@ index 6acd802..3cc3dd4 100644
log_errors_(opt != RE2::Quiet),
max_mem_(kDefaultMaxMem),
literal_(false),
-diff --git a/third_party/re2/re2/re2.h b/third_party/re2/re2/re2.h
-index 272028b..9f5b66d 100644
---- a/third_party/re2/re2/re2.h
-+++ b/third_party/re2/re2/re2.h
+diff --git a/re2/re2.h b/re2/re2.h
+index c509853..98b06b8 100644
+--- a/re2/re2.h
++++ b/re2/re2.h
@@ -251,7 +251,7 @@ class RE2 {
enum CannedOptions {
DefaultOptions = 0,
« 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 »

Powered by Google App Engine
This is Rietveld 408576698