diff options
| author |  Ulas Kirazci <ulas@google.com> | 2013-04-03 15:36:13 -0700 |
|---|---|---|
| committer |  Wink Saville <wink@google.com> | 2013-04-04 05:56:23 -0700 |
| commit | 741f208bb961b97fb9feeec925f9fe7096daa5cf (patch) | |
| tree | 6271ab84fa7e71db74f5c3ca2f3431d23c6679da /src/google/protobuf/compiler/javanano/javanano_primitive_field.h | |
| parent | d6592c758c2574ccdca78fdb70a2edc314447269 (diff) | |
Prevent conflicts between local and proto variable names.
Prefix access to proto variable names with "this.". Also remove unused
GenerateMergingCode.
Change-Id: I5f07d3252fc385c4174d9165b64785b40f676e17
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_primitive_field.h')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_primitive_field.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_primitive_field.h b/src/google/protobuf/compiler/javanano/javanano_primitive_field.h index 7c14e4c2..9b1bb465 100644 --- a/src/google/protobuf/compiler/javanano/javanano_primitive_field.h +++ b/src/google/protobuf/compiler/javanano/javanano_primitive_field.h @@ -51,7 +51,6 @@ class PrimitiveFieldGenerator : public FieldGenerator { // implements FieldGenerator --------------------------------------- void GenerateMembers(io::Printer* printer) const; - void GenerateMergingCode(io::Printer* printer) const; void GenerateParsingCode(io::Printer* printer) const; void GenerateSerializationCode(io::Printer* printer) const; void GenerateSerializedSizeCode(io::Printer* printer) const; @@ -72,7 +71,6 @@ class RepeatedPrimitiveFieldGenerator : public FieldGenerator { // implements FieldGenerator --------------------------------------- void GenerateMembers(io::Printer* printer) const; - void GenerateMergingCode(io::Printer* printer) const; void GenerateParsingCode(io::Printer* printer) const; void GenerateSerializationCode(io::Printer* printer) const; void GenerateSerializedSizeCode(io::Printer* printer) const; |