third_party/protobuf/src/google/protobuf/compiler/parser.cc - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

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

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/plugin.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/parser.cc

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

index ea792a9d8cba6150ddb8937dfd1920d6e333166a..90ded4de2144b254d6adf7da4c34d03abc6eb90d 100644

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

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

@@ -544,9 +544,9 @@ bool Parser::Parse(io::Tokenizer* input, FileDescriptorProto* file) {

// Store the syntax into the file.

if (file != NULL) file->set_syntax(syntax_identifier_);

} else if (!stop_after_syntax_identifier_) {

- GOOGLE_LOG(WARNING) << "No syntax specified for the proto file. "

- << "Please use 'syntax = \"proto2\";' or "

- << "'syntax = \"proto3\";' to specify a syntax "

+ GOOGLE_LOG(WARNING) << "No syntax specified for the proto file: "

+ << file->name() << ". Please use 'syntax = \"proto2\";' "

+ << "or 'syntax = \"proto3\";' to specify a syntax "

<< "version. (Defaulted to proto2 syntax.)";

syntax_identifier_ = "proto2";

}