url/url_canon.h - Issue 952893003: Update from https://crrev.com/317530

Keyboard Shortcuts

	File
u :	up to issue
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

	Issue
u :	up to list of issues
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

Unified Diff: url/url_canon.h

Issue 952893003: Update from https://crrev.com/317530 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Fix gn for nacl Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: url/url_canon.h

diff --git a/url/url_canon.h b/url/url_canon.h

index 89e3509091c2424726c1a24f575d8672f85ff88f..432f29110e928fb590406bae335ffef4e2220712 100644

--- a/url/url_canon.h

+++ b/url/url_canon.h

@@ -734,8 +734,8 @@ class Replacements {

// Returns a pointer to a static empty string that is used as a placeholder

// to indicate a component should be deleted (see below).

const CHAR* Placeholder() {

- static const CHAR empty_string = 0;

- return &empty_string;

+ static const CHAR empty_cstr = 0;

+ return &empty_cstr;

}

// We support three states:

« no previous file with comments | « url/BUILD.gn ('k') | no next file » | no next file with comments »