diff options
| author | Jisi Liu <liujisi@google.com> | 2017-03-09 17:13:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-09 17:13:55 -0800 |
| commit | a1bb147e96b6f74db6cdf3c3fcb00492472dbbfa (patch) | |
| tree | 1f3d23d1f8fa290627a92708cdd028205e2ccd1a /src/google | |
| parent | da003550e8d740f760bad84abddef17b209a17d8 (diff) | |
| parent | 009e491bd7aaa25d1d1819c8d26721d2e0500579 (diff) | |
| download | protobuf-a1bb147e96b6f74db6cdf3c3fcb00492472dbbfa.tar.gz protobuf-a1bb147e96b6f74db6cdf3c3fcb00492472dbbfa.tar.bz2 protobuf-a1bb147e96b6f74db6cdf3c3fcb00492472dbbfa.zip | |
Merge pull request #2825 from pherl/javawarning
Cherry-pick changes from javalite branch to also fix Java warnings in the master branch
Diffstat (limited to 'src/google')
| -rw-r--r-- | src/google/protobuf/compiler/java/java_message.cc | 1 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/java/java_message_lite.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/java/java_message.cc b/src/google/protobuf/compiler/java/java_message.cc index 652c5d78..3b8d7ab8 100644 --- a/src/google/protobuf/compiler/java/java_message.cc +++ b/src/google/protobuf/compiler/java/java_message.cc @@ -1453,6 +1453,7 @@ void ImmutableMessageGenerator::GenerateAnyMethods(io::Printer* printer) { "\n" "private volatile com.google.protobuf.Message cachedUnpackValue;\n" "\n" + "@java.lang.SuppressWarnings(\"unchecked\")\n" "public <T extends com.google.protobuf.Message> T unpack(\n" " java.lang.Class<T> clazz)\n" " throws com.google.protobuf.InvalidProtocolBufferException {\n" diff --git a/src/google/protobuf/compiler/java/java_message_lite.cc b/src/google/protobuf/compiler/java/java_message_lite.cc index 9720cacf..45834f2a 100644 --- a/src/google/protobuf/compiler/java/java_message_lite.cc +++ b/src/google/protobuf/compiler/java/java_message_lite.cc @@ -345,6 +345,7 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) { } printer->Print( + "@java.lang.SuppressWarnings(\"unchecked\")\n" "protected final Object dynamicMethod(\n" " com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,\n" " Object arg0, Object arg1) {\n" |