Index: third_party/re2/re2/onepass.cc |
diff --git a/third_party/re2/re2/onepass.cc b/third_party/re2/re2/onepass.cc |
index 1c4998828b500a86ad7eceac27a1cd94d3e90de4..73acdc8d4e58337c7743fae5ad9dac77f65cee28 100644 |
--- a/third_party/re2/re2/onepass.cc |
+++ b/third_party/re2/re2/onepass.cc |
@@ -53,7 +53,6 @@ |
#include <string.h> |
#include <map> |
#include "util/util.h" |
-#include "util/arena.h" |
#include "util/sparse_set.h" |
#include "re2/prog.h" |
#include "re2/stringpiece.h" |
@@ -126,9 +125,6 @@ static const int Debug = 0; |
// whether a set of conditions required to finish a match at that |
// point in the input rather than process the next byte. |
-// A state in the one-pass NFA (aka DFA) - just an array of actions. |
-struct OneState; |
- |
// A state in the one-pass NFA - just an array of actions indexed |
// by the bytemap_[] of the next input byte. (The bytemap |
// maps next input bytes into equivalence classes, to reduce |
@@ -335,7 +331,8 @@ done: |
if (!matched) |
return false; |
for (int i = 0; i < nmatch; i++) |
- match[i].set(matchcap[2*i], matchcap[2*i+1] - matchcap[2*i]); |
+ match[i].set(matchcap[2*i], |
+ static_cast<int>(matchcap[2*i+1] - matchcap[2*i])); |
return true; |
} |