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

Unified Diff: third_party/re2/patches/remove-valgrind-code.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
« no previous file with comments | « third_party/re2/patches/remove-posix-option.patch ('k') | third_party/re2/re2/compile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/re2/patches/remove-valgrind-code.patch
diff --git a/third_party/re2/patches/remove-valgrind-code.patch b/third_party/re2/patches/remove-valgrind-code.patch
index 20fea48156eb455a44a2b4bd9bb7b6847ead38f0..1d8884aceb6b435847b5643a80cc7c691abf9093 100644
--- a/third_party/re2/patches/remove-valgrind-code.patch
+++ b/third_party/re2/patches/remove-valgrind-code.patch
@@ -1,6 +1,7 @@
-diff -r ceab86d470c1 re2/dfa.cc
---- a/re2/dfa.cc Tue Jul 03 16:43:11 2012 +0200
-+++ b/re2/dfa.cc Tue Jul 03 17:03:00 2012 +0200
+diff --git a/third_party/re2/re2/dfa.cc b/third_party/re2/re2/dfa.cc
+index 3a6a387..32c8c33 100644
+--- a/third_party/re2/re2/dfa.cc
++++ b/third_party/re2/re2/dfa.cc
@@ -27,6 +27,8 @@
#include "util/flags.h"
#include "util/sparse_set.h"
@@ -10,10 +11,11 @@ diff -r ceab86d470c1 re2/dfa.cc
DEFINE_bool(re2_dfa_bail_when_slow, true,
"Whether the RE2 DFA should bail out early "
"if the NFA would be faster (for testing).");
-diff -r ceab86d470c1 util/util.h
---- a/util/util.h Tue Jul 03 16:43:11 2012 +0200
-+++ b/util/util.h Tue Jul 03 17:03:00 2012 +0200
-@@ -28,6 +28,8 @@
+diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h
+index a43ff76..63a9c6f 100644
+--- a/third_party/re2/util/util.h
++++ b/third_party/re2/util/util.h
+@@ -26,6 +26,8 @@
#include <utility>
#include <set>
@@ -22,7 +24,7 @@ diff -r ceab86d470c1 util/util.h
// Use std names.
using std::set;
using std::pair;
-@@ -86,16 +88,6 @@
+@@ -80,17 +82,6 @@ template<bool> struct CompileAssert {};
#define arraysize(array) (sizeof(array)/sizeof((array)[0]))
@@ -35,11 +37,12 @@ diff -r ceab86d470c1 util/util.h
-#define NO_THREAD_SAFETY_ANALYSIS
-#define ANNOTATE_HAPPENS_BEFORE(x)
-#define ANNOTATE_HAPPENS_AFTER(x)
+-#define ANNOTATE_UNPROTECTED_READ(x) (x)
-
class StringPiece;
string CEscape(const StringPiece& src);
-@@ -121,8 +113,6 @@
+@@ -116,8 +107,6 @@ static inline uint64 Hash64StringWithSeed(const char* s, int len, uint32 seed) {
return ((uint64)x << 32) | y;
}
« no previous file with comments | « third_party/re2/patches/remove-posix-option.patch ('k') | third_party/re2/re2/compile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698