Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Unified Diff: third_party/protobuf/java/core/src/main/java/com/google/protobuf/SingleFieldBuilder.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
Index: third_party/protobuf/java/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java
diff --git a/third_party/protobuf/java/src/main/java/com/google/protobuf/SingleFieldBuilder.java b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java
similarity index 99%
rename from third_party/protobuf/java/src/main/java/com/google/protobuf/SingleFieldBuilder.java
rename to third_party/protobuf/java/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java
index aba65e3226a2e24fe68a023791bf5a9e88a0cbee..941b5defc955c6a08193986fa602a50b2a3510c8 100644
--- a/third_party/protobuf/java/src/main/java/com/google/protobuf/SingleFieldBuilder.java
+++ b/third_party/protobuf/java/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java
@@ -234,7 +234,7 @@ public class SingleFieldBuilder
}
}
- //@Override (Java 1.6 override semantics, but we must support 1.5)
+ @Override
public void markDirty() {
onChanged();
}

Powered by Google App Engine
This is Rietveld 408576698