diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2015-02-07 12:51:36 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-02-07 12:51:36 -0800 |
| commit | 12d8a514c84ee8d60e5d8b8b84aa09dad15197f2 (patch) | |
| tree | ea00ee660534aff8cb321aa7f9a7d0a5b11227ae /src/google/protobuf/compiler/javanano/javanano_map_field.cc | |
| parent | d9a6f27bc333587fad88b3bc1f53b370a016ccd0 (diff) | |
Get the map factory per mergeFrom() call for JavaNano.
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_map_field.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_map_field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_map_field.cc b/src/google/protobuf/compiler/javanano/javanano_map_field.cc index 117c4f5c..83b2b0ce 100644 --- a/src/google/protobuf/compiler/javanano/javanano_map_field.cc +++ b/src/google/protobuf/compiler/javanano/javanano_map_field.cc @@ -134,7 +134,7 @@ void MapFieldGenerator:: GenerateMergingCode(io::Printer* printer) const { printer->Print(variables_, "this.$name$ = com.google.protobuf.nano.InternalNano.mergeMapEntry(\n" - " input, this.$name$,\n" + " input, this.$name$, mapFactory,\n" " com.google.protobuf.nano.InternalNano.$key_desc_type$,\n" " com.google.protobuf.nano.InternalNano.$value_desc_type$,\n" " $value_default$,\n" |