| Index: third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_message_field.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_message_field.cc b/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_message_field.cc
|
| index f81f769b29853426ce994f27ef61a8173b864374..338692f8c73664b161767eed234c2828fefeaa98 100644
|
| --- a/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_message_field.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_message_field.cc
|
| @@ -41,6 +41,7 @@
|
| #include <google/protobuf/compiler/csharp/csharp_doc_comment.h>
|
| #include <google/protobuf/compiler/csharp/csharp_helpers.h>
|
| #include <google/protobuf/compiler/csharp/csharp_message_field.h>
|
| +#include <google/protobuf/compiler/csharp/csharp_options.h>
|
|
|
| namespace google {
|
| namespace protobuf {
|
| @@ -48,8 +49,9 @@ namespace compiler {
|
| namespace csharp {
|
|
|
| MessageFieldGenerator::MessageFieldGenerator(const FieldDescriptor* descriptor,
|
| - int fieldOrdinal)
|
| - : FieldGeneratorBase(descriptor, fieldOrdinal) {
|
| + int fieldOrdinal,
|
| + const Options *options)
|
| + : FieldGeneratorBase(descriptor, fieldOrdinal, options) {
|
| variables_["has_property_check"] = name() + "_ != null";
|
| variables_["has_not_property_check"] = name() + "_ == null";
|
| }
|
| @@ -143,9 +145,11 @@ void MessageFieldGenerator::GenerateCodecCode(io::Printer* printer) {
|
| "pb::FieldCodec.ForMessage($tag$, $type_name$.Parser)");
|
| }
|
|
|
| -MessageOneofFieldGenerator::MessageOneofFieldGenerator(const FieldDescriptor* descriptor,
|
| - int fieldOrdinal)
|
| - : MessageFieldGenerator(descriptor, fieldOrdinal) {
|
| +MessageOneofFieldGenerator::MessageOneofFieldGenerator(
|
| + const FieldDescriptor* descriptor,
|
| + int fieldOrdinal,
|
| + const Options *options)
|
| + : MessageFieldGenerator(descriptor, fieldOrdinal, options) {
|
| SetCommonOneofFieldVariables(&variables_);
|
| }
|
|
|
|
|