diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2017-07-17 10:30:31 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-17 10:30:31 -0700 |
commit | eb8e3d3220f066cde610c48af9287cadb36a5779 (patch) | |
tree | d90c3e903308e5b764e46a74a5944a2b5dd0d8d5 /src/google | |
parent | aaa2550f7b0b24c65d0830fee66e12a9424c1966 (diff) | |
parent | aea4374393e34da4147965323319468a47c7f4a8 (diff) | |
download | protobuf-eb8e3d3220f066cde610c48af9287cadb36a5779.tar.gz protobuf-eb8e3d3220f066cde610c48af9287cadb36a5779.tar.bz2 protobuf-eb8e3d3220f066cde610c48af9287cadb36a5779.zip |
Merge pull request #3134 from lundefugl/javabug1
Issue 3112: Object class with fully qualified name
Diffstat (limited to 'src/google')
-rw-r--r-- | src/google/protobuf/compiler/java/java_message_builder.cc | 6 | ||||
-rw-r--r-- | src/google/protobuf/compiler/java/java_message_lite.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/google/protobuf/compiler/java/java_message_builder.cc b/src/google/protobuf/compiler/java/java_message_builder.cc index f5643abc..56017171 100644 --- a/src/google/protobuf/compiler/java/java_message_builder.cc +++ b/src/google/protobuf/compiler/java/java_message_builder.cc @@ -472,7 +472,7 @@ GenerateCommonBuilderMethods(io::Printer* printer) { "}\n" "public Builder setField(\n" " com.google.protobuf.Descriptors.FieldDescriptor field,\n" - " Object value) {\n" + " java.lang.Object value) {\n" " return (Builder) super.setField(field, value);\n" "}\n" "public Builder clearField(\n" @@ -485,12 +485,12 @@ GenerateCommonBuilderMethods(io::Printer* printer) { "}\n" "public Builder setRepeatedField(\n" " com.google.protobuf.Descriptors.FieldDescriptor field,\n" - " int index, Object value) {\n" + " int index, java.lang.Object value) {\n" " return (Builder) super.setRepeatedField(field, index, value);\n" "}\n" "public Builder addRepeatedField(\n" " com.google.protobuf.Descriptors.FieldDescriptor field,\n" - " Object value) {\n" + " java.lang.Object value) {\n" " return (Builder) super.addRepeatedField(field, value);\n" "}\n"); diff --git a/src/google/protobuf/compiler/java/java_message_lite.cc b/src/google/protobuf/compiler/java/java_message_lite.cc index 5007ecee..aad10bb1 100644 --- a/src/google/protobuf/compiler/java/java_message_lite.cc +++ b/src/google/protobuf/compiler/java/java_message_lite.cc @@ -346,9 +346,9 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) { printer->Print( "@java.lang.SuppressWarnings({\"unchecked\", \"fallthrough\"})\n" - "protected final Object dynamicMethod(\n" + "protected final java.lang.Object dynamicMethod(\n" " com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,\n" - " Object arg0, Object arg1) {\n" + " java.lang.Object arg0, java.lang.Object arg1) {\n" " switch (method) {\n" " case NEW_MUTABLE_INSTANCE: {\n" " return new $classname$();\n" |