Index: third_party/re2/patches/remove-static-initializers.patch |
diff --git a/third_party/re2/patches/remove-static-initializers.patch b/third_party/re2/patches/remove-static-initializers.patch |
index 73df64c2c73a7f18b6f28d736a9d05fb9b7713fc..c9ef9e3ecec9ef65d59994048ed68e102fe7f93c 100644 |
--- a/third_party/re2/patches/remove-static-initializers.patch |
+++ b/third_party/re2/patches/remove-static-initializers.patch |
@@ -1,7 +1,7 @@ |
-diff --git a/third_party/re2/re2/compile.cc b/third_party/re2/re2/compile.cc |
+diff --git a/re2/compile.cc b/re2/compile.cc |
index adb45fd..14e401a 100644 |
---- a/third_party/re2/re2/compile.cc |
-+++ b/third_party/re2/re2/compile.cc |
+--- a/re2/compile.cc |
++++ b/re2/compile.cc |
@@ -44,7 +44,7 @@ struct PatchList { |
static PatchList Append(Prog::Inst *inst0, PatchList l1, PatchList l2); |
}; |
@@ -61,11 +61,11 @@ index adb45fd..14e401a 100644 |
re->Decref(); |
if (c.failed_) |
return NULL; |
-diff --git a/third_party/re2/re2/re2.cc b/third_party/re2/re2/re2.cc |
-index 78978f1..61b88e7 100644 |
---- a/third_party/re2/re2/re2.cc |
-+++ b/third_party/re2/re2/re2.cc |
-@@ -34,10 +34,10 @@ namespace re2 { |
+diff --git a/re2/re2.cc b/re2/re2.cc |
+index 0da886d..b9e44fc 100644 |
+--- a/re2/re2.cc |
++++ b/re2/re2.cc |
+@@ -32,10 +32,10 @@ namespace re2 { |
static const int kMaxArgs = 16; |
static const int kVecSize = 1+kMaxArgs; |
@@ -80,10 +80,10 @@ index 78978f1..61b88e7 100644 |
#define kDefaultMaxMem (8<<20) |
-diff --git a/third_party/re2/re2/variadic_function.h b/third_party/re2/re2/variadic_function.h |
+diff --git a/re2/variadic_function.h b/re2/variadic_function.h |
index 8d2b763..7c7d6d5 100644 |
---- a/third_party/re2/re2/variadic_function.h |
-+++ b/third_party/re2/re2/variadic_function.h |
+--- a/re2/variadic_function.h |
++++ b/re2/variadic_function.h |
@@ -11,8 +11,6 @@ template <typename Result, typename Param0, typename Param1, typename Arg, |
Result (*Func)(Param0, Param1, const Arg* const [], int count)> |
class VariadicFunction2 { |