OLD | NEW |
(Empty) | |
| 1 diff --git a/third_party/re2/re2/dfa.cc b/third_party/re2/re2/dfa.cc |
| 2 index 32c8c33..36ec66f 100644 |
| 3 --- a/third_party/re2/re2/dfa.cc |
| 4 +++ b/third_party/re2/re2/dfa.cc |
| 5 @@ -470,8 +470,8 @@ DFA::DFA(Prog* prog, Prog::MatchKind kind, int64 max_mem) |
| 6 // At minimum, the search requires room for two states in order |
| 7 // to limp along, restarting frequently. We'll get better performance |
| 8 // if there is room for a larger number of states, say 20. |
| 9 - int one_state = sizeof(State) + (prog_->size()+nmark)*sizeof(int) + |
| 10 - (prog_->bytemap_range()+1)*sizeof(State*); |
| 11 + size_t one_state = sizeof(State) + (prog_->size()+nmark)*sizeof(int) + |
| 12 + (prog_->bytemap_range()+1)*sizeof(State*); |
| 13 if (state_budget_ < 20*one_state) { |
| 14 LOG(INFO) << StringPrintf("DFA out of memory: prog size %lld mem %lld", |
| 15 prog_->size(), max_mem); |
| 16 diff --git a/third_party/re2/util/logging.h b/third_party/re2/util/logging.h |
| 17 index 7302ea6..4478f9b 100644 |
| 18 --- a/third_party/re2/util/logging.h |
| 19 +++ b/third_party/re2/util/logging.h |
| 20 @@ -59,7 +59,11 @@ class LogMessage { |
| 21 void Flush() { |
| 22 stream() << "\n"; |
| 23 string s = str_.str(); |
| 24 +#ifdef WIN32 |
| 25 + write(2, s.data(), static_cast<unsigned int>(s.size())); |
| 26 +#else |
| 27 if(write(2, s.data(), s.size()) < 0) {} // shut up gcc |
| 28 +#endif |
| 29 flushed_ = true; |
| 30 } |
| 31 ~LogMessage() { |
OLD | NEW |