diff options
| author | lundefugl <montgomery_scott@gmx.de> | 2017-05-24 12:54:23 +0200 |
|---|---|---|
| committer | lundefugl <montgomery_scott@gmx.de> | 2017-05-24 12:54:23 +0200 |
| commit | aea4374393e34da4147965323319468a47c7f4a8 (patch) | |
| tree | fd230f50d0b95dd5a252b02c18c10fa780e61b52 /src/google/protobuf/compiler/java | |
| parent | 40da1ed572d60e9c7cc2fe1ca4175e30682f5a9d (diff) | |
| download | protobuf-aea4374393e34da4147965323319468a47c7f4a8.tar.gz protobuf-aea4374393e34da4147965323319468a47c7f4a8.tar.bz2 protobuf-aea4374393e34da4147965323319468a47c7f4a8.zip | |
Issue 3112: Object class with fully qualified name
Diffstat (limited to 'src/google/protobuf/compiler/java')
| -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" |