base/files/file_path.h - Issue 1124763003: Update from https://crrev.com/327068

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: base/files/file_path.h

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

Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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: base/files/file_path.h

diff --git a/base/files/file_path.h b/base/files/file_path.h

index 93f9ec91e03aca3202dd070989bcdc5419f3ff75..5225b12ffd4c8cab478e5b73c8f6a9823c0c3f9c 100644

--- a/base/files/file_path.h

+++ b/base/files/file_path.h

@@ -443,11 +443,9 @@ BASE_EXPORT extern void PrintTo(const base::FilePath& path, std::ostream* out);

#if defined(OS_POSIX)

#define FILE_PATH_LITERAL(x) x

#define PRFilePath "s"

-#define PRFilePathLiteral "%s"

#elif defined(OS_WIN)

#define FILE_PATH_LITERAL(x) L ## x

#define PRFilePath "ls"

-#define PRFilePathLiteral L"%ls"

#endif // OS_WIN

// Provide a hash function so that hash_sets and maps can contain FilePath