| Index: third_party/re2/re2/filtered_re2.h
|
| diff --git a/third_party/re2/re2/filtered_re2.h b/third_party/re2/re2/filtered_re2.h
|
| index 64b35be6c2c392e5f5a6b5d5093b4f28eda0ae70..f4b2be484b44d3b9c99a4fa06e4e725410ac219b 100644
|
| --- a/third_party/re2/re2/filtered_re2.h
|
| +++ b/third_party/re2/re2/filtered_re2.h
|
| @@ -67,8 +67,16 @@ class FilteredRE2 {
|
| const vector<int>& atoms,
|
| vector<int>* matching_regexps) const;
|
|
|
| + // Returns the indices of all potentially matching regexps after first
|
| + // clearing potential_regexps.
|
| + // A regexp is potentially matching if it passes the filter.
|
| + // If a regexp passes the filter it may still not match.
|
| + // A regexp that does not pass the filter is guaranteed to not match.
|
| + void AllPotentials(const vector<int>& atoms,
|
| + vector<int>* potential_regexps) const;
|
| +
|
| // The number of regexps added.
|
| - int NumRegexps() const { return re2_vec_.size(); }
|
| + int NumRegexps() const { return static_cast<int>(re2_vec_.size()); }
|
|
|
| private:
|
|
|
| @@ -91,7 +99,7 @@ class FilteredRE2 {
|
| // An AND-OR tree of string atoms used for filtering regexps.
|
| PrefilterTree* prefilter_tree_;
|
|
|
| - //DISALLOW_EVIL_CONSTRUCTORS(FilteredRE2);
|
| + //DISALLOW_COPY_AND_ASSIGN(FilteredRE2);
|
| FilteredRE2(const FilteredRE2&);
|
| void operator=(const FilteredRE2&);
|
| };
|
|
|