third_party/protobuf/java/core/src/main/java/com/google/protobuf/MessageOrBuilder.java - 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/java/core/src/main/java/com/google/protobuf/MessageOrBuilder.java

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/java/core/src/main/java/com/google/protobuf/MessageLiteToString.java ('k') | third_party/protobuf/java/core/src/main/java/com/google/protobuf/MessageReflection.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/java/core/src/main/java/com/google/protobuf/MessageOrBuilder.java

diff --git a/third_party/protobuf/java/src/main/java/com/google/protobuf/MessageOrBuilder.java b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/MessageOrBuilder.java

similarity index 98%

rename from third_party/protobuf/java/src/main/java/com/google/protobuf/MessageOrBuilder.java

rename to third_party/protobuf/java/core/src/main/java/com/google/protobuf/MessageOrBuilder.java

index f0fc4859ec780c4ca6d035e11022ca3ad526e394..5e7d78213254a6fc8d6aab6586241baf460c6e11 100644

--- a/third_party/protobuf/java/src/main/java/com/google/protobuf/MessageOrBuilder.java

+++ b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/MessageOrBuilder.java

@@ -42,7 +42,7 @@ import java.util.Map;

public interface MessageOrBuilder extends MessageLiteOrBuilder {

// (From MessageLite, re-declared here only for return type covariance.)

- //@Override (Java 1.6 override semantics, but we must support 1.5)

+ @Override

Message getDefaultInstanceForType();

/**