third_party/protobuf/src/google/protobuf/compiler/importer.cc - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

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: third_party/protobuf/src/google/protobuf/compiler/importer.cc

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Make chrome settings proto generated file a component Created 4 years 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: third_party/protobuf/src/google/protobuf/compiler/importer.cc

diff --git a/third_party/protobuf/src/google/protobuf/compiler/importer.cc b/third_party/protobuf/src/google/protobuf/compiler/importer.cc

index 0d9093c047eae3af0c099114b8ccc8a5a8a9cb13..462748b9d5a351bf4f88bc0b16b06e5ddf3064ef 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/importer.cc

+++ b/third_party/protobuf/src/google/protobuf/compiler/importer.cc

@@ -270,8 +270,8 @@ static string CanonicalizePath(string path) {

}

#endif

- vector<string> canonical_parts;

- vector<string> parts = Split(

+ std::vector<string> canonical_parts;

+ std::vector<string> parts = Split(

path, "/", true); // Note: Removes empty parts.

for (int i = 0; i < parts.size(); i++) {

if (parts[i] == ".") {