| Index: third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_map_field.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_map_field.cc b/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_map_field.cc
|
| index b493495da7ee7281928a6578d922d09dd13d4b17..565d12259fdce20de056695e2695d0c8444e3c1c 100644
|
| --- a/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_map_field.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/compiler/csharp/csharp_map_field.cc
|
| @@ -48,8 +48,9 @@ namespace compiler {
|
| namespace csharp {
|
|
|
| MapFieldGenerator::MapFieldGenerator(const FieldDescriptor* descriptor,
|
| - int fieldOrdinal)
|
| - : FieldGeneratorBase(descriptor, fieldOrdinal) {
|
| + int fieldOrdinal,
|
| + const Options* options)
|
| + : FieldGeneratorBase(descriptor, fieldOrdinal, options) {
|
| }
|
|
|
| MapFieldGenerator::~MapFieldGenerator() {
|
| @@ -62,9 +63,10 @@ void MapFieldGenerator::GenerateMembers(io::Printer* printer) {
|
| descriptor_->message_type()->FindFieldByName("value");
|
| variables_["key_type_name"] = type_name(key_descriptor);
|
| variables_["value_type_name"] = type_name(value_descriptor);
|
| - variables_["true_for_wrappers"] = IsWrapperType(value_descriptor) ? "true" : "";
|
| - scoped_ptr<FieldGeneratorBase> key_generator(CreateFieldGenerator(key_descriptor, 1));
|
| - scoped_ptr<FieldGeneratorBase> value_generator(CreateFieldGenerator(value_descriptor, 2));
|
| + scoped_ptr<FieldGeneratorBase> key_generator(
|
| + CreateFieldGenerator(key_descriptor, 1, this->options()));
|
| + scoped_ptr<FieldGeneratorBase> value_generator(
|
| + CreateFieldGenerator(value_descriptor, 2, this->options()));
|
|
|
| printer->Print(
|
| variables_,
|
| @@ -76,7 +78,7 @@ void MapFieldGenerator::GenerateMembers(io::Printer* printer) {
|
| printer->Print(
|
| variables_,
|
| ", $tag$);\n"
|
| - "private readonly pbc::MapField<$key_type_name$, $value_type_name$> $name$_ = new pbc::MapField<$key_type_name$, $value_type_name$>($true_for_wrappers$);\n");
|
| + "private readonly pbc::MapField<$key_type_name$, $value_type_name$> $name$_ = new pbc::MapField<$key_type_name$, $value_type_name$>();\n");
|
| WritePropertyDocComment(printer, descriptor_);
|
| AddDeprecatedFlag(printer);
|
| printer->Print(
|
|
|