diff options
3 files changed, 7 insertions, 3 deletions
diff --git a/contrib/protoc-bnet/BnetFileGenerator.cpp b/contrib/protoc-bnet/BnetFileGenerator.cpp index 24e3a6ef63b..912a3d75a78 100644 --- a/contrib/protoc-bnet/BnetFileGenerator.cpp +++ b/contrib/protoc-bnet/BnetFileGenerator.cpp @@ -174,7 +174,7 @@ void BnetFileGenerator::GenerateHeader(pb::io::Printer* printer) printer->Print("#include <type_traits>\n"); } else - printer->Print("#include \"Define.h\" // for TC_SHARED_API\n"); + printer->Print("#include \"Define.h\" // for TC_PROTO_API\n"); printer->Print("// @@protoc_insertion_point(includes)\n"); diff --git a/contrib/protoc-bnet/google/protobuf/compiler/cpp/cpp_enum_field.cc b/contrib/protoc-bnet/google/protobuf/compiler/cpp/cpp_enum_field.cc index 72f363bb378..ea15fd74744 100644 --- a/contrib/protoc-bnet/google/protobuf/compiler/cpp/cpp_enum_field.cc +++ b/contrib/protoc-bnet/google/protobuf/compiler/cpp/cpp_enum_field.cc @@ -285,7 +285,9 @@ GenerateSwappingCode(io::Printer* printer) const { void RepeatedEnumFieldGenerator:: GenerateConstructorCode(io::Printer* printer) const { - // Not needed for repeated fields. + if (descriptor_->options().packed()) { + printer->Print(variables_, "_$name$_cached_byte_size_ = 0;\n"); + } } void RepeatedEnumFieldGenerator:: diff --git a/contrib/protoc-bnet/google/protobuf/compiler/cpp/cpp_primitive_field.cc b/contrib/protoc-bnet/google/protobuf/compiler/cpp/cpp_primitive_field.cc index f9f13cee742..244a7f178d9 100644 --- a/contrib/protoc-bnet/google/protobuf/compiler/cpp/cpp_primitive_field.cc +++ b/contrib/protoc-bnet/google/protobuf/compiler/cpp/cpp_primitive_field.cc @@ -335,7 +335,9 @@ GenerateSwappingCode(io::Printer* printer) const { void RepeatedPrimitiveFieldGenerator:: GenerateConstructorCode(io::Printer* printer) const { - // Not needed for repeated fields. + if (descriptor_->options().packed()) { + printer->Print(variables_, "_$name$_cached_byte_size_ = 0;\n"); + } } void RepeatedPrimitiveFieldGenerator:: |