ADD: added new version of protobuf
This commit is contained in:
@@ -3753,25 +3753,25 @@ namespace ProtobufTestMessages.Proto3 {
|
||||
unpackedDouble_.Add(other.unpackedDouble_);
|
||||
unpackedBool_.Add(other.unpackedBool_);
|
||||
unpackedNestedEnum_.Add(other.unpackedNestedEnum_);
|
||||
mapInt32Int32_.MergeFrom(other.mapInt32Int32_);
|
||||
mapInt64Int64_.MergeFrom(other.mapInt64Int64_);
|
||||
mapUint32Uint32_.MergeFrom(other.mapUint32Uint32_);
|
||||
mapUint64Uint64_.MergeFrom(other.mapUint64Uint64_);
|
||||
mapSint32Sint32_.MergeFrom(other.mapSint32Sint32_);
|
||||
mapSint64Sint64_.MergeFrom(other.mapSint64Sint64_);
|
||||
mapFixed32Fixed32_.MergeFrom(other.mapFixed32Fixed32_);
|
||||
mapFixed64Fixed64_.MergeFrom(other.mapFixed64Fixed64_);
|
||||
mapSfixed32Sfixed32_.MergeFrom(other.mapSfixed32Sfixed32_);
|
||||
mapSfixed64Sfixed64_.MergeFrom(other.mapSfixed64Sfixed64_);
|
||||
mapInt32Float_.MergeFrom(other.mapInt32Float_);
|
||||
mapInt32Double_.MergeFrom(other.mapInt32Double_);
|
||||
mapBoolBool_.MergeFrom(other.mapBoolBool_);
|
||||
mapStringString_.MergeFrom(other.mapStringString_);
|
||||
mapStringBytes_.MergeFrom(other.mapStringBytes_);
|
||||
mapStringNestedMessage_.MergeFrom(other.mapStringNestedMessage_);
|
||||
mapStringForeignMessage_.MergeFrom(other.mapStringForeignMessage_);
|
||||
mapStringNestedEnum_.MergeFrom(other.mapStringNestedEnum_);
|
||||
mapStringForeignEnum_.MergeFrom(other.mapStringForeignEnum_);
|
||||
mapInt32Int32_.Add(other.mapInt32Int32_);
|
||||
mapInt64Int64_.Add(other.mapInt64Int64_);
|
||||
mapUint32Uint32_.Add(other.mapUint32Uint32_);
|
||||
mapUint64Uint64_.Add(other.mapUint64Uint64_);
|
||||
mapSint32Sint32_.Add(other.mapSint32Sint32_);
|
||||
mapSint64Sint64_.Add(other.mapSint64Sint64_);
|
||||
mapFixed32Fixed32_.Add(other.mapFixed32Fixed32_);
|
||||
mapFixed64Fixed64_.Add(other.mapFixed64Fixed64_);
|
||||
mapSfixed32Sfixed32_.Add(other.mapSfixed32Sfixed32_);
|
||||
mapSfixed64Sfixed64_.Add(other.mapSfixed64Sfixed64_);
|
||||
mapInt32Float_.Add(other.mapInt32Float_);
|
||||
mapInt32Double_.Add(other.mapInt32Double_);
|
||||
mapBoolBool_.Add(other.mapBoolBool_);
|
||||
mapStringString_.Add(other.mapStringString_);
|
||||
mapStringBytes_.Add(other.mapStringBytes_);
|
||||
mapStringNestedMessage_.Add(other.mapStringNestedMessage_);
|
||||
mapStringForeignMessage_.Add(other.mapStringForeignMessage_);
|
||||
mapStringNestedEnum_.Add(other.mapStringNestedEnum_);
|
||||
mapStringForeignEnum_.Add(other.mapStringForeignEnum_);
|
||||
if (other.optionalBoolWrapper_ != null) {
|
||||
if (optionalBoolWrapper_ == null || other.OptionalBoolWrapper != false) {
|
||||
OptionalBoolWrapper = other.OptionalBoolWrapper;
|
||||
|
||||
Reference in New Issue
Block a user