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

Side by Side 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, 3 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
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff -r ceab86d470c1 re2/dfa.cc 1 diff --git a/third_party/re2/re2/dfa.cc b/third_party/re2/re2/dfa.cc
2 --- a/re2/dfa.cc» Tue Jul 03 16:43:11 2012 +0200 2 index 3a6a387..32c8c33 100644
3 +++ b/re2/dfa.cc» Tue Jul 03 17:03:00 2012 +0200 3 --- a/third_party/re2/re2/dfa.cc
4 +++ b/third_party/re2/re2/dfa.cc
4 @@ -27,6 +27,8 @@ 5 @@ -27,6 +27,8 @@
5 #include "util/flags.h" 6 #include "util/flags.h"
6 #include "util/sparse_set.h" 7 #include "util/sparse_set.h"
7 8
8 +#define NO_THREAD_SAFETY_ANALYSIS 9 +#define NO_THREAD_SAFETY_ANALYSIS
9 + 10 +
10 DEFINE_bool(re2_dfa_bail_when_slow, true, 11 DEFINE_bool(re2_dfa_bail_when_slow, true,
11 "Whether the RE2 DFA should bail out early " 12 "Whether the RE2 DFA should bail out early "
12 "if the NFA would be faster (for testing)."); 13 "if the NFA would be faster (for testing).");
13 diff -r ceab86d470c1 util/util.h 14 diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h
14 --- a/util/util.h» Tue Jul 03 16:43:11 2012 +0200 15 index a43ff76..63a9c6f 100644
15 +++ b/util/util.h» Tue Jul 03 17:03:00 2012 +0200 16 --- a/third_party/re2/util/util.h
16 @@ -28,6 +28,8 @@ 17 +++ b/third_party/re2/util/util.h
18 @@ -26,6 +26,8 @@
17 #include <utility> 19 #include <utility>
18 #include <set> 20 #include <set>
19 21
20 +#include "base/third_party/dynamic_annotations/dynamic_annotations.h" 22 +#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
21 + 23 +
22 // Use std names. 24 // Use std names.
23 using std::set; 25 using std::set;
24 using std::pair; 26 using std::pair;
25 @@ -86,16 +88,6 @@ 27 @@ -80,17 +82,6 @@ template<bool> struct CompileAssert {};
26 28
27 #define arraysize(array) (sizeof(array)/sizeof((array)[0])) 29 #define arraysize(array) (sizeof(array)/sizeof((array)[0]))
28 30
29 -// Fake lock annotations. For real ones, see 31 -// Fake lock annotations. For real ones, see
30 -// http://code.google.com/p/data-race-test/ 32 -// http://code.google.com/p/data-race-test/
31 -#define ANNOTATE_PUBLISH_MEMORY_RANGE(a, b) 33 -#define ANNOTATE_PUBLISH_MEMORY_RANGE(a, b)
32 -#define ANNOTATE_IGNORE_WRITES_BEGIN() 34 -#define ANNOTATE_IGNORE_WRITES_BEGIN()
33 -#define ANNOTATE_IGNORE_WRITES_END() 35 -#define ANNOTATE_IGNORE_WRITES_END()
34 -#define ANNOTATE_BENIGN_RACE(a, b) 36 -#define ANNOTATE_BENIGN_RACE(a, b)
35 -#define NO_THREAD_SAFETY_ANALYSIS 37 -#define NO_THREAD_SAFETY_ANALYSIS
36 -#define ANNOTATE_HAPPENS_BEFORE(x) 38 -#define ANNOTATE_HAPPENS_BEFORE(x)
37 -#define ANNOTATE_HAPPENS_AFTER(x) 39 -#define ANNOTATE_HAPPENS_AFTER(x)
40 -#define ANNOTATE_UNPROTECTED_READ(x) (x)
38 - 41 -
39 class StringPiece; 42 class StringPiece;
40 43
41 string CEscape(const StringPiece& src); 44 string CEscape(const StringPiece& src);
42 @@ -121,8 +113,6 @@ 45 @@ -116,8 +107,6 @@ static inline uint64 Hash64StringWithSeed(const char* s, int len, uint32 seed) {
43 return ((uint64)x << 32) | y; 46 return ((uint64)x << 32) | y;
44 } 47 }
45 48
46 -int RunningOnValgrind(); 49 -int RunningOnValgrind();
47 - 50 -
48 } // namespace re2 51 } // namespace re2
49 52
50 #include "util/arena.h" 53 #include "util/arena.h"
OLDNEW
« 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