Side by Side Diff: compiled/library.cpp
Issue 29721753:
Issue 6180 - use ABP_TEXT everywhere in order to let String be a UTF-8 string (Closed)
Base URL: https://github.com/adblockplus/adblockpluscore.git@adb2678354813ce5b6de095072954c5a784a7bc4
Patch Set: rebase
Created March 15, 2018, 1:53 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« compiled/intrusive_ptr.h ('k')
|
compiled/storage/FilterStorage.cpp » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
| 3 * Copyright (C) 2006-present eyeo GmbH | 3 * Copyright (C) 2006-present eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 if (id < regexPool.size()) | 64 if (id < regexPool.size()) |
| 65 regexPool[id].reset(); | 65 regexPool[id].reset(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 bool TestRegExp(RegExpID id, const String& str) | 68 bool TestRegExp(RegExpID id, const String& str) |
| 69 { | 69 { |
| 70 std::lock_guard<std::mutex> guard(regexPoolMutex); | 70 std::lock_guard<std::mutex> guard(regexPoolMutex); |
| 71 if ((id < regexPool.size()) && regexPool[id]) | 71 if ((id < regexPool.size()) && regexPool[id]) |
| 72 return std::regex_match(StdWStringFromString(str), *regexPool[id]); | 72 return std::regex_match(StdWStringFromString(str), *regexPool[id]); |
| 73 | 73 |
| 74 assert2(id < regexPool.size() && regexPool[id], u"Invalid RegExp index."_str); | 74 assert2(id < regexPool.size() && regexPool[id], ABP_TEXT("Invalid RegExp index ."_str)); |
| 75 return false; | 75 return false; |
| 76 } | 76 } |
| 77 | 77 |
| OLD | NEW |
« no previous file with comments
|
« compiled/intrusive_ptr.h ('k')
|
compiled/storage/FilterStorage.cpp » ('j')
|
no next file with comments »
