base/file_path.cc - Issue 6609008: Change other usages of .size() to .empty() when applicable.

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/file_path.cc

Issue 6609008: Change other usages of .size() to .empty() when applicable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Peter nits Created 9 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: base/file_path.cc

diff --git a/base/file_path.cc b/base/file_path.cc

index 32217f2bc38abf8d4f339d4fb00dcfd454055ce1..29ec7a8044df88c405f237c215b0437961559518 100644

--- a/base/file_path.cc

+++ b/base/file_path.cc

@@ -249,9 +249,8 @@ bool FilePath::AppendRelativePath(const FilePath& child,

GetComponents(&parent_components);

child.GetComponents(&child_components);

- if (parent_components.size() >= child_components.size())

- return false;

- if (parent_components.empty())

+ if (parent_components.empty() ||

+ parent_components.size() >= child_components.size())

return false;

std::vector<StringType>::const_iterator parent_comp =

« no previous file with comments | « base/command_line_unittest.cc ('k') | base/process_util_posix.cc » ('j') | no next file with comments »