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

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.h

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

index cc8fcc39b09c7d55d1940a3e66c1d517c91a418e..759636e164b294b15a19ff717c4fd24f9056fe02 100644

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

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

@@ -305,7 +305,7 @@ class LIBPROTOBUF_EXPORT DiskSourceTree : public SourceTree {

const string& disk_path_param)

: virtual_path(virtual_path_param), disk_path(disk_path_param) {}

};

- vector<Mapping> mappings_;

+ std::vector<Mapping> mappings_;

string last_error_message_;

// Like Open(), but returns the on-disk path in disk_file if disk_file is