aboutsummaryrefslogtreecommitdiff
path: root/csharp/ProtocolBuffers/ExtendableBuilder.cs
diff options
context:
space:
mode:
authorJon Skeet <skeet@pobox.com>2008-08-14 20:35:34 +0100
committerJon Skeet <skeet@pobox.com>2008-08-14 20:35:34 +0100
commit38d453d3186eaf33afbc0474485f901d12a2a5c4 (patch)
tree10d2190446fea52f6fd1324f30119b677476b35a /csharp/ProtocolBuffers/ExtendableBuilder.cs
parent15041fa06cb43b0db82d20b848c2e12127651dd8 (diff)
downloadprotobuf-38d453d3186eaf33afbc0474485f901d12a2a5c4.tar.gz
protobuf-38d453d3186eaf33afbc0474485f901d12a2a5c4.tar.bz2
protobuf-38d453d3186eaf33afbc0474485f901d12a2a5c4.zip
Beginning to fix the TODOs
Diffstat (limited to 'csharp/ProtocolBuffers/ExtendableBuilder.cs')
-rw-r--r--csharp/ProtocolBuffers/ExtendableBuilder.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/csharp/ProtocolBuffers/ExtendableBuilder.cs b/csharp/ProtocolBuffers/ExtendableBuilder.cs
index f05743ec..6970d7c3 100644
--- a/csharp/ProtocolBuffers/ExtendableBuilder.cs
+++ b/csharp/ProtocolBuffers/ExtendableBuilder.cs
@@ -97,7 +97,7 @@ namespace Google.ProtocolBuffers {
/// <returns>true unless the tag is an end-group tag</returns>
protected override bool ParseUnknownField(CodedInputStream input, UnknownFieldSet.Builder unknownFields,
ExtensionRegistry extensionRegistry, uint tag) {
- return FieldSet.MergeFieldFrom(input, unknownFields, extensionRegistry, this, tag);
+ return unknownFields.MergeFieldFrom(input, extensionRegistry, this, tag);
}
// ---------------------------------------------------------------