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_message.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_message.cc')
| -rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_message.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_message.cc b/src/google/protobuf/compiler/csharp/csharp_message.cc index 9580c167..a6c8e32b 100644 --- a/src/google/protobuf/compiler/csharp/csharp_message.cc +++ b/src/google/protobuf/compiler/csharp/csharp_message.cc @@ -194,8 +194,7 @@ void MessageGenerator::Generate(io::Printer* printer) { "slash", field_names().size() > 0 ? "\"" : ""); std::vector<std::string> tags; for (int i = 0; i < field_names().size(); i++) { - uint32 tag = internal::WireFormat::MakeTag( - descriptor_->FindFieldByName(field_names()[i])); + uint32 tag = FixedMakeTag(descriptor_->FindFieldByName(field_names()[i])); tags.push_back(SimpleItoa(tag)); } printer->Print( |