attempting to upgrade to proto 3.5
This commit is contained in:
1 parent
eb1b42a5e8
commit
cc3510c6c2
368 files changed
+35764
-24867
No files matched your search
@@ -54,8 +54,9 @@
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/stubs/substitute.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -171,36 +172,25 @@ Generate(io::Printer* printer) {
|
||||
.GenerateBuilderMembers(printer);
|
||||
}
|
||||
|
||||
if (!PreserveUnknownFields(descriptor_)) {
|
||||
printer->Print(
|
||||
"public final Builder setUnknownFields(\n"
|
||||
" final com.google.protobuf.UnknownFieldSet unknownFields) {\n"
|
||||
" return this;\n"
|
||||
"}\n"
|
||||
"\n"
|
||||
"public final Builder mergeUnknownFields(\n"
|
||||
" final com.google.protobuf.UnknownFieldSet unknownFields) {\n"
|
||||
" return this;\n"
|
||||
"}\n"
|
||||
"\n");
|
||||
} else {
|
||||
bool is_proto3 =
|
||||
descriptor_->file()->syntax() == FileDescriptor::SYNTAX_PROTO3;
|
||||
// Override methods declared in GeneratedMessage to return the concrete
|
||||
// generated type so callsites won't depend on GeneratedMessage. This
|
||||
// is needed to keep binary compatibility when we change generated code
|
||||
// to subclass a different GeneratedMessage class (e.g., in v3.0.0 release
|
||||
// we changed all generated code to subclass GeneratedMessageV3).
|
||||
printer->Print(
|
||||
"public final Builder setUnknownFields(\n"
|
||||
" final com.google.protobuf.UnknownFieldSet unknownFields) {\n"
|
||||
" return super.setUnknownFields(unknownFields);\n"
|
||||
"}\n"
|
||||
"\n"
|
||||
"public final Builder mergeUnknownFields(\n"
|
||||
" final com.google.protobuf.UnknownFieldSet unknownFields) {\n"
|
||||
" return super.mergeUnknownFields(unknownFields);\n"
|
||||
"}\n"
|
||||
"\n");
|
||||
}
|
||||
printer->Print(
|
||||
"public final Builder setUnknownFields(\n"
|
||||
" final com.google.protobuf.UnknownFieldSet unknownFields) {\n"
|
||||
" return super.setUnknownFields$suffix$(unknownFields);\n"
|
||||
"}\n"
|
||||
"\n"
|
||||
"public final Builder mergeUnknownFields(\n"
|
||||
" final com.google.protobuf.UnknownFieldSet unknownFields) {\n"
|
||||
" return super.mergeUnknownFields(unknownFields);\n"
|
||||
"}\n"
|
||||
"\n",
|
||||
"suffix", is_proto3 ? "Proto3" : "");
|
||||
|
||||
printer->Print(
|
||||
"\n"
|
||||
@@ -472,7 +462,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 +475,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");
|
||||
|
||||
@@ -594,10 +584,8 @@ GenerateCommonBuilderMethods(io::Printer* printer) {
|
||||
" this.mergeExtensionFields(other);\n");
|
||||
}
|
||||
|
||||
if (PreserveUnknownFields(descriptor_)) {
|
||||
printer->Print(
|
||||
" this.mergeUnknownFields(other.unknownFields);\n");
|
||||
}
|
||||
printer->Print(
|
||||
" this.mergeUnknownFields(other.unknownFields);\n");
|
||||
|
||||
printer->Print(
|
||||
" onChanged();\n");
|
||||
|
||||
Reference in new issue
Block a user