diff options
| author | Jon Skeet <jonskeet@google.com> | 2015-06-24 17:55:02 +0100 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2015-06-24 17:56:22 +0100 |
| commit | 322ec531615b3f1aa7b25902ecb10e8673408cac (patch) | |
| tree | 87ad38e9d5acd3f8f84ce558b2e92e62a65d805b /src/google/protobuf/compiler/csharp/csharp_field_base.cc | |
| parent | bfee2dfe137b07e64ebd46baf71d932d58d01b1f (diff) | |
| download | protobuf-322ec531615b3f1aa7b25902ecb10e8673408cac.tar.gz protobuf-322ec531615b3f1aa7b25902ecb10e8673408cac.tar.bz2 protobuf-322ec531615b3f1aa7b25902ecb10e8673408cac.zip | |
Revert the change to wire_format.h.
It seems too much code relies on the broken behaviour. See issue #493.
Instead, we reimplement MakeTag just for C#, temporarily.
Diffstat (limited to 'src/google/protobuf/compiler/csharp/csharp_field_base.cc')
| -rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_field_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_field_base.cc b/src/google/protobuf/compiler/csharp/csharp_field_base.cc index 0bfbc70e..c716e1bf 100644 --- a/src/google/protobuf/compiler/csharp/csharp_field_base.cc +++ b/src/google/protobuf/compiler/csharp/csharp_field_base.cc @@ -57,7 +57,7 @@ void FieldGeneratorBase::SetCommonFieldVariables( // repeated fields varies by wire format. The wire format is encoded in the bottom 3 bits, which // never effects the tag size. int tag_size = internal::WireFormat::TagSize(descriptor_->number(), descriptor_->type()); - uint tag = internal::WireFormat::MakeTag(descriptor_); + uint tag = FixedMakeTag(descriptor_); uint8 tag_array[5]; io::CodedOutputStream::WriteTagToArray(tag, tag_array); string tag_bytes = SimpleItoa(tag_array[0]); |