Unified Diff: compiled/String.h
Issue 29595633:
Issue 5870 - Implement the new ElemHideEmulation filter type (Closed)
Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Reworked the strings const. String::find() from a String::value_type*
Created Feb. 1, 2018, 8:36 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
compiled/filter/ElemHideBase.h » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: compiled/String.h |
| =================================================================== |
| --- a/compiled/String.h |
| +++ b/compiled/String.h |
| @@ -131,26 +131,31 @@ |
| for (size_type i = pos; i < length(); ++i) |
| if (mBuf[i] == c) |
| return i; |
| return npos; |
| } |
| size_type find(const String& str, size_type pos = 0) const |
| { |
| - if (pos > LENGTH_MASK || pos + str.length() > length()) |
| + return find(str.mBuf, pos, str.length()); |
| + } |
| + |
| + size_type find(const value_type* str, size_type pos, size_type count) const |
| + { |
| + if (pos > LENGTH_MASK || pos + count > length()) |
| return npos; |
| - if (!str.length()) |
| + if (!count) |
| return pos; |
| - for (; pos + str.length() <= length(); ++pos) |
| + for (; pos + count <= length(); ++pos) |
| { |
| if (mBuf[pos] == str[0] && |
| - std::memcmp(mBuf + pos, str.mBuf, sizeof(value_type) * str.length()) == 0) |
| + std::memcmp(mBuf + pos, str, sizeof(value_type) * count) == 0) |
| { |
| return pos; |
| } |
| } |
| return npos; |
| } |
« no previous file with comments
|
« no previous file
|
compiled/filter/ElemHideBase.h » ('j')
|
no next file with comments »
