third_party/protobuf/src/google/protobuf/compiler/java/java_service.cc - Issue 6737030: third_party/protobuf: update to upstream r371

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/java/java_service.cc

Issue 6737030: third_party/protobuf: update to upstream r371 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 9 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/java/java_primitive_field.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/java/java_string_field.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/java/java_service.cc

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

index 5545bf7f4991e5f012d0b5cef31a44e505a222d3..1ae4f461663b75c6cf1333c170123d8d91dfd843 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_service.cc

+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_service.cc

@@ -118,7 +118,7 @@ void ServiceGenerator::GenerateNewReflectiveServiceMethod(

for (int i = 0; i < descriptor_->method_count(); i++) {

const MethodDescriptor* method = descriptor_->method(i);

- printer->Print("@Override\n");

+ printer->Print("@java.lang.Override\n");

GenerateMethodSignature(printer, method, IS_CONCRETE);

printer->Print(

" {\n"