diff options
| author |  Max Cai <maxtroy@google.com> | 2013-11-13 18:21:28 +0000 |
|---|---|---|
| committer | Max Cai <maxtroy@google.com> | 2013-11-18 11:47:25 +0000 |
| commit | adf2449a6d64f6f2ab2ba2e07f3dded44185da38 (patch) | |
| tree | e1fc15ea67d2053ec16049c53d034242e869fe7f /src/google/protobuf/compiler/javanano/javanano_primitive_field.h | |
| parent | 190edd7ef6fc98d49f7556271fc9c0b4d8160456 (diff) | |
Align with main: two ways of parsing repeated packable fields.
It is a requirement for parsing code to handle packed and unpacked
forms on the wire for repeated packable fields. This change aligns
the javanano's behavior with the java's.
Bonus: optimize array length calculation when parsing repeated
fixed-size-element-type fields.
Bonus 2: lose "xMemoizedSerializedSize" for repeated enum fields,
and make the serialized size calculation match that for repeated
int32 fields.
Change-Id: I8a06103d9290234adb46b0971b5ed155544fe86a
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_primitive_field.h')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_primitive_field.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_primitive_field.h b/src/google/protobuf/compiler/javanano/javanano_primitive_field.h index 2d2b2685..d2075354 100644 --- a/src/google/protobuf/compiler/javanano/javanano_primitive_field.h +++ b/src/google/protobuf/compiler/javanano/javanano_primitive_field.h @@ -98,6 +98,7 @@ class RepeatedPrimitiveFieldGenerator : public FieldGenerator { void GenerateMembers(io::Printer* printer) const; void GenerateClearCode(io::Printer* printer) const; void GenerateMergingCode(io::Printer* printer) const; + void GenerateMergingCodeFromPacked(io::Printer* printer) const; void GenerateSerializationCode(io::Printer* printer) const; void GenerateSerializedSizeCode(io::Printer* printer) const; void GenerateEqualsCode(io::Printer* printer) const; |