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

Side by Side Diff: third_party/re2/patches/remove-valgrind-code.patch

Issue 1516543002: Update re2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits Created 5 years 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
OLDNEW
(Empty)
1 diff --git a/re2/dfa.cc b/re2/dfa.cc
battre 2015/12/10 13:32:05 I think this is not necessary anymore.
2 index 2556c0f..f1fc7b0 100644
3 --- a/re2/dfa.cc
4 +++ b/re2/dfa.cc
5 @@ -27,6 +27,8 @@
6 #include "util/flags.h"
7 #include "util/sparse_set.h"
8
9 +#define NO_THREAD_SAFETY_ANALYSIS
10 +
11 DEFINE_bool(re2_dfa_bail_when_slow, true,
12 "Whether the RE2 DFA should bail out early "
13 "if the NFA would be faster (for testing).");
14 diff --git a/util/util.h b/util/util.h
15 index 471c64f..c46ab1b 100644
16 --- a/util/util.h
17 +++ b/util/util.h
18 @@ -27,6 +27,8 @@
19 #include <utility>
20 #include <set>
21
22 +#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
23 +
24 // Use std names.
25 using std::set;
26 using std::pair;
27 @@ -119,8 +121,6 @@ static inline uint64 Hash64StringWithSeed(const char* s, int len, uint32 seed) {
28 return ((uint64)x << 32) | y;
29 }
30
31 -int RunningOnValgrind();
32 -
33 } // namespace re2
34
35 #include "util/arena.h"
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698