compiled/ElemHide.cpp - Issue 29721753: Issue 6180 - use ABP_TEXT everywhere in order to let String be a UTF-8 string

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: compiled/ElemHide.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.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: compiled/ElemHide.cpp

diff --git a/compiled/ElemHide.cpp b/compiled/ElemHide.cpp

index 88cd0b90b7e1eec25f3caaf64469c7f70583be60..ab72d8038e249bb0dd67cfbf9e89d522df133f1d 100644

--- a/compiled/ElemHide.cpp

+++ b/compiled/ElemHide.cpp

@@ -231,9 +231,9 @@ ElemHide_SelectorList* ElemHide::GetSelectorsForDomain(const String& domain,

if (currentDomain.empty())

break;

- auto nextDot = currentDomain.find(u'.');

+ auto nextDot = currentDomain.find(ABP_TEXT('.'));

currentDomain = nextDot == String::npos ?

- u""_str : DependentString(currentDomain, nextDot + 1);

+ ABP_TEXT(""_str) : DependentString(currentDomain, nextDot + 1);

}

return selectors.release();

« no previous file with comments | « .travis/travis-script.sh ('k') | compiled/Map.h » ('j') | no next file with comments »