diff options
| author |  Jon Skeet <jonskeet@google.com> | 2015-08-07 13:43:05 +0100 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2015-08-07 13:45:56 +0100 |
| commit | 93bdf36f8b0ce94ebde3fb12e4b8dcaead6b8164 (patch) | |
| tree | 362bdf46fbb4c608dc1a41864c66f7628cd17f38 /src/google/protobuf/compiler/csharp/csharp_helpers.cc | |
| parent | b76b76ba4f5152550fd334a6f3533d4db208f633 (diff) | |
Remove our own version of MakeTag now that the main one is fixed.
"Tested" by regenerating code and observing that there are no changes.
Diffstat (limited to 'src/google/protobuf/compiler/csharp/csharp_helpers.cc')
| -rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_helpers.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_helpers.cc b/src/google/protobuf/compiler/csharp/csharp_helpers.cc index 46f4fc33..d25dcba9 100644 --- a/src/google/protobuf/compiler/csharp/csharp_helpers.cc +++ b/src/google/protobuf/compiler/csharp/csharp_helpers.cc @@ -338,17 +338,6 @@ std::string FileDescriptorToBase64(const FileDescriptor* descriptor) { return StringToBase64(fdp_bytes); } -// TODO(jonskeet): Remove this when internal::WireFormat::MakeTag works -// properly... -// Workaround for issue #493 -uint FixedMakeTag(const FieldDescriptor* field) { - internal::WireFormatLite::WireType field_type = field->is_packed() - ? internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED - : internal::WireFormat::WireTypeForFieldType(field->type()); - - return internal::WireFormatLite::MakeTag(field->number(), field_type); -} - FieldGeneratorBase* CreateFieldGenerator(const FieldDescriptor* descriptor, int fieldOrdinal) { switch (descriptor->type()) { |