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
@@ -74,27 +74,26 @@ GeneratePrivateMembers(io::Printer* printer) const {
|
||||
|
||||
void EnumFieldGenerator::
|
||||
GenerateAccessorDeclarations(io::Printer* printer) const {
|
||||
printer->Print(variables_, "$deprecated_attr$$type$ $name$() const;\n");
|
||||
printer->Annotate("name", descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecated_attr$$type$ $name$() const;\n"
|
||||
"$deprecated_attr$void set_$name$($type$ value);\n");
|
||||
"$deprecated_attr$void ${$set_$name$$}$($type$ value);\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void EnumFieldGenerator::
|
||||
GenerateInlineAccessorDefinitions(io::Printer* printer,
|
||||
bool is_inline) const {
|
||||
std::map<string, string> variables(variables_);
|
||||
variables["inline"] = is_inline ? "inline " : "";
|
||||
printer->Print(variables,
|
||||
"$inline$$type$ $classname$::$name$() const {\n"
|
||||
GenerateInlineAccessorDefinitions(io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"inline $type$ $classname$::$name$() const {\n"
|
||||
" // @@protoc_insertion_point(field_get:$full_name$)\n"
|
||||
" return static_cast< $type$ >($name$_);\n"
|
||||
"}\n"
|
||||
"$inline$void $classname$::set_$name$($type$ value) {\n");
|
||||
"inline void $classname$::set_$name$($type$ value) {\n");
|
||||
if (!HasPreservingUnknownEnumSemantics(descriptor_->file())) {
|
||||
printer->Print(variables,
|
||||
printer->Print(variables_,
|
||||
" assert($type$_IsValid(value));\n");
|
||||
}
|
||||
printer->Print(variables,
|
||||
printer->Print(variables_,
|
||||
" $set_hasbit$\n"
|
||||
" $name$_ = value;\n"
|
||||
" // @@protoc_insertion_point(field_set:$full_name$)\n"
|
||||
@@ -113,7 +112,7 @@ GenerateMergingCode(io::Printer* printer) const {
|
||||
|
||||
void EnumFieldGenerator::
|
||||
GenerateSwappingCode(io::Printer* printer) const {
|
||||
printer->Print(variables_, "std::swap($name$_, other->$name$_);\n");
|
||||
printer->Print(variables_, "swap($name$_, other->$name$_);\n");
|
||||
}
|
||||
|
||||
void EnumFieldGenerator::
|
||||
@@ -143,12 +142,14 @@ GenerateMergeFromCodedStream(io::Printer* printer) const {
|
||||
if (UseUnknownFieldSet(descriptor_->file(), options_)) {
|
||||
printer->Print(variables_,
|
||||
"} else {\n"
|
||||
" mutable_unknown_fields()->AddVarint($number$, value);\n");
|
||||
" mutable_unknown_fields()->AddVarint(\n"
|
||||
" $number$, static_cast< ::google::protobuf::uint64>(value));\n");
|
||||
} else {
|
||||
printer->Print(
|
||||
"} else {\n"
|
||||
" unknown_fields_stream.WriteVarint32($tag$u);\n"
|
||||
" unknown_fields_stream.WriteVarint32(value);\n",
|
||||
" unknown_fields_stream.WriteVarint32(\n"
|
||||
" static_cast< ::google::protobuf::uint32>(value));\n",
|
||||
"tag", SimpleItoa(internal::WireFormat::MakeTag(descriptor_)));
|
||||
}
|
||||
printer->Print(variables_,
|
||||
@@ -189,24 +190,21 @@ EnumOneofFieldGenerator(const FieldDescriptor* descriptor,
|
||||
EnumOneofFieldGenerator::~EnumOneofFieldGenerator() {}
|
||||
|
||||
void EnumOneofFieldGenerator::
|
||||
GenerateInlineAccessorDefinitions(io::Printer* printer,
|
||||
bool is_inline) const {
|
||||
std::map<string, string> variables(variables_);
|
||||
variables["inline"] = is_inline ? "inline " : "";
|
||||
printer->Print(variables,
|
||||
"$inline$$type$ $classname$::$name$() const {\n"
|
||||
GenerateInlineAccessorDefinitions(io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"inline $type$ $classname$::$name$() const {\n"
|
||||
" // @@protoc_insertion_point(field_get:$full_name$)\n"
|
||||
" if (has_$name$()) {\n"
|
||||
" return static_cast< $type$ >($oneof_prefix$$name$_);\n"
|
||||
" }\n"
|
||||
" return static_cast< $type$ >($default$);\n"
|
||||
"}\n"
|
||||
"$inline$void $classname$::set_$name$($type$ value) {\n");
|
||||
"inline void $classname$::set_$name$($type$ value) {\n");
|
||||
if (!HasPreservingUnknownEnumSemantics(descriptor_->file())) {
|
||||
printer->Print(variables,
|
||||
printer->Print(variables_,
|
||||
" assert($type$_IsValid(value));\n");
|
||||
}
|
||||
printer->Print(variables,
|
||||
printer->Print(variables_,
|
||||
" if (!has_$name$()) {\n"
|
||||
" clear_$oneof_name$();\n"
|
||||
" set_has_$name$();\n"
|
||||
@@ -228,9 +226,8 @@ GenerateSwappingCode(io::Printer* printer) const {
|
||||
|
||||
void EnumOneofFieldGenerator::
|
||||
GenerateConstructorCode(io::Printer* printer) const {
|
||||
printer->Print(
|
||||
variables_,
|
||||
"_$classname$_default_instance_.$name$_ = $default$;\n");
|
||||
printer->Print(variables_,
|
||||
"$ns$::_$classname$_default_instance_.$name$_ = $default$;\n");
|
||||
}
|
||||
|
||||
// ===================================================================
|
||||
@@ -257,49 +254,56 @@ GeneratePrivateMembers(io::Printer* printer) const {
|
||||
void RepeatedEnumFieldGenerator::
|
||||
GenerateAccessorDeclarations(io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"$deprecated_attr$$type$ $name$(int index) const;\n"
|
||||
"$deprecated_attr$void set_$name$(int index, $type$ value);\n"
|
||||
"$deprecated_attr$void add_$name$($type$ value);\n");
|
||||
"$deprecated_attr$$type$ $name$(int index) const;\n");
|
||||
printer->Annotate("name", descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$deprecated_attr$void ${$set_$name$$}$(int index, $type$ value);\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecated_attr$const ::google::protobuf::RepeatedField<int>& $name$() const;\n"
|
||||
"$deprecated_attr$::google::protobuf::RepeatedField<int>* mutable_$name$();\n");
|
||||
"$deprecated_attr$void ${$add_$name$$}$($type$ value);\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$deprecated_attr$const ::google::protobuf::RepeatedField<int>& $name$() const;\n");
|
||||
printer->Annotate("name", descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecated_attr$::google::protobuf::RepeatedField<int>* "
|
||||
"${$mutable_$name$$}$();\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void RepeatedEnumFieldGenerator::
|
||||
GenerateInlineAccessorDefinitions(io::Printer* printer,
|
||||
bool is_inline) const {
|
||||
std::map<string, string> variables(variables_);
|
||||
variables["inline"] = is_inline ? "inline " : "";
|
||||
printer->Print(variables,
|
||||
"$inline$$type$ $classname$::$name$(int index) const {\n"
|
||||
GenerateInlineAccessorDefinitions(io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"inline $type$ $classname$::$name$(int index) const {\n"
|
||||
" // @@protoc_insertion_point(field_get:$full_name$)\n"
|
||||
" return static_cast< $type$ >($name$_.Get(index));\n"
|
||||
"}\n"
|
||||
"$inline$void $classname$::set_$name$(int index, $type$ value) {\n");
|
||||
"inline void $classname$::set_$name$(int index, $type$ value) {\n");
|
||||
if (!HasPreservingUnknownEnumSemantics(descriptor_->file())) {
|
||||
printer->Print(variables,
|
||||
printer->Print(variables_,
|
||||
" assert($type$_IsValid(value));\n");
|
||||
}
|
||||
printer->Print(variables,
|
||||
printer->Print(variables_,
|
||||
" $name$_.Set(index, value);\n"
|
||||
" // @@protoc_insertion_point(field_set:$full_name$)\n"
|
||||
"}\n"
|
||||
"$inline$void $classname$::add_$name$($type$ value) {\n");
|
||||
"inline void $classname$::add_$name$($type$ value) {\n");
|
||||
if (!HasPreservingUnknownEnumSemantics(descriptor_->file())) {
|
||||
printer->Print(variables,
|
||||
printer->Print(variables_,
|
||||
" assert($type$_IsValid(value));\n");
|
||||
}
|
||||
printer->Print(variables,
|
||||
printer->Print(variables_,
|
||||
" $name$_.Add(value);\n"
|
||||
" // @@protoc_insertion_point(field_add:$full_name$)\n"
|
||||
"}\n");
|
||||
printer->Print(variables,
|
||||
"$inline$const ::google::protobuf::RepeatedField<int>&\n"
|
||||
"}\n"
|
||||
"inline const ::google::protobuf::RepeatedField<int>&\n"
|
||||
"$classname$::$name$() const {\n"
|
||||
" // @@protoc_insertion_point(field_list:$full_name$)\n"
|
||||
" return $name$_;\n"
|
||||
"}\n"
|
||||
"$inline$::google::protobuf::RepeatedField<int>*\n"
|
||||
"inline ::google::protobuf::RepeatedField<int>*\n"
|
||||
"$classname$::mutable_$name$() {\n"
|
||||
" // @@protoc_insertion_point(field_mutable_list:$full_name$)\n"
|
||||
" return &$name$_;\n"
|
||||
@@ -344,12 +348,14 @@ GenerateMergeFromCodedStream(io::Printer* printer) const {
|
||||
if (UseUnknownFieldSet(descriptor_->file(), options_)) {
|
||||
printer->Print(variables_,
|
||||
"} else {\n"
|
||||
" mutable_unknown_fields()->AddVarint($number$, value);\n");
|
||||
" mutable_unknown_fields()->AddVarint(\n"
|
||||
" $number$, static_cast< ::google::protobuf::uint64>(value));\n");
|
||||
} else {
|
||||
printer->Print(
|
||||
"} else {\n"
|
||||
" unknown_fields_stream.WriteVarint32(tag);\n"
|
||||
" unknown_fields_stream.WriteVarint32(value);\n");
|
||||
" unknown_fields_stream.WriteVarint32(\n"
|
||||
" static_cast< ::google::protobuf::uint32>(value));\n");
|
||||
}
|
||||
printer->Print("}\n");
|
||||
}
|
||||
@@ -391,7 +397,7 @@ GenerateMergeFromCodedStreamWithPacking(io::Printer* printer) const {
|
||||
"::google::protobuf::uint32 length;\n"
|
||||
"DO_(input->ReadVarint32(&length));\n"
|
||||
"::google::protobuf::io::CodedInputStream::Limit limit = "
|
||||
"input->PushLimit(length);\n"
|
||||
"input->PushLimit(static_cast<int>(length));\n"
|
||||
"while (input->BytesUntilLimit() > 0) {\n"
|
||||
" int value;\n"
|
||||
" DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<\n"
|
||||
@@ -407,11 +413,13 @@ GenerateMergeFromCodedStreamWithPacking(io::Printer* printer) const {
|
||||
" } else {\n");
|
||||
if (UseUnknownFieldSet(descriptor_->file(), options_)) {
|
||||
printer->Print(variables_,
|
||||
" mutable_unknown_fields()->AddVarint($number$, value);\n");
|
||||
" mutable_unknown_fields()->AddVarint(\n"
|
||||
" $number$, static_cast< ::google::protobuf::uint64>(value));\n");
|
||||
} else {
|
||||
printer->Print(variables_,
|
||||
" unknown_fields_stream.WriteVarint32(tag);\n"
|
||||
" unknown_fields_stream.WriteVarint32(value);\n");
|
||||
" unknown_fields_stream.WriteVarint32(\n"
|
||||
" static_cast< ::google::protobuf::uint32>(value));\n");
|
||||
}
|
||||
printer->Print(
|
||||
" }\n");
|
||||
@@ -432,7 +440,8 @@ GenerateSerializeWithCachedSizes(io::Printer* printer) const {
|
||||
" $number$,\n"
|
||||
" ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED,\n"
|
||||
" output);\n"
|
||||
" output->WriteVarint32(_$name$_cached_byte_size_);\n"
|
||||
" output->WriteVarint32(\n"
|
||||
" static_cast< ::google::protobuf::uint32>(_$name$_cached_byte_size_));\n"
|
||||
"}\n");
|
||||
}
|
||||
printer->Print(variables_,
|
||||
@@ -460,7 +469,8 @@ GenerateSerializeWithCachedSizesToArray(io::Printer* printer) const {
|
||||
" ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED,\n"
|
||||
" target);\n"
|
||||
" target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray("
|
||||
" _$name$_cached_byte_size_, target);\n"
|
||||
" static_cast< ::google::protobuf::uint32>(\n"
|
||||
" _$name$_cached_byte_size_), target);\n"
|
||||
" target = ::google::protobuf::internal::WireFormatLite::WriteEnumNoTagToArray(\n"
|
||||
" this->$name$_, target);\n"
|
||||
"}\n");
|
||||
@@ -476,19 +486,20 @@ GenerateByteSize(io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"{\n"
|
||||
" size_t data_size = 0;\n"
|
||||
" unsigned int count = this->$name$_size();");
|
||||
" unsigned int count = static_cast<unsigned int>(this->$name$_size());");
|
||||
printer->Indent();
|
||||
printer->Print(variables_,
|
||||
"for (unsigned int i = 0; i < count; i++) {\n"
|
||||
" data_size += ::google::protobuf::internal::WireFormatLite::EnumSize(\n"
|
||||
" this->$name$(i));\n"
|
||||
" this->$name$(static_cast<int>(i)));\n"
|
||||
"}\n");
|
||||
|
||||
if (descriptor_->is_packed()) {
|
||||
printer->Print(variables_,
|
||||
"if (data_size > 0) {\n"
|
||||
" total_size += $tag_size$ +\n"
|
||||
" ::google::protobuf::internal::WireFormatLite::Int32Size(data_size);\n"
|
||||
" ::google::protobuf::internal::WireFormatLite::Int32Size(\n"
|
||||
" static_cast< ::google::protobuf::int32>(data_size));\n"
|
||||
"}\n"
|
||||
"int cached_size = ::google::protobuf::internal::ToCachedSize(data_size);\n"
|
||||
"GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();\n"
|
||||
|
||||
Reference in new issue
Block a user