aboutsummaryrefslogtreecommitdiff
path: root/src/ProtocolBuffers/UnknownFieldSet.cs
diff options
context:
space:
mode:
authorcsharptest <roger@csharptest.net>2011-06-10 14:41:47 -0500
committerrogerk <devnull@localhost>2011-06-10 14:41:47 -0500
commit2b86884659413efb1cbbcf7ebe22ef46a565b13d (patch)
treee35e2776944153fbcad1a146b4b37ae9ed691a41 /src/ProtocolBuffers/UnknownFieldSet.cs
parentb00ea13eb1b8055a0cde89d01bbde6d95e5cd1a5 (diff)
downloadprotobuf-2b86884659413efb1cbbcf7ebe22ef46a565b13d.tar.gz
protobuf-2b86884659413efb1cbbcf7ebe22ef46a565b13d.tar.bz2
protobuf-2b86884659413efb1cbbcf7ebe22ef46a565b13d.zip
Added the XmlFormatWriter/Reader
Diffstat (limited to 'src/ProtocolBuffers/UnknownFieldSet.cs')
-rw-r--r--src/ProtocolBuffers/UnknownFieldSet.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ProtocolBuffers/UnknownFieldSet.cs b/src/ProtocolBuffers/UnknownFieldSet.cs
index fbafb892..0918503e 100644
--- a/src/ProtocolBuffers/UnknownFieldSet.cs
+++ b/src/ProtocolBuffers/UnknownFieldSet.cs
@@ -446,6 +446,12 @@ namespace Google.ProtocolBuffers
[CLSCompliant(false)]
public bool MergeFieldFrom(uint tag, ICodedInputStream input)
{
+ if (tag == 0)
+ {
+ input.SkipField();
+ return true;
+ }
+
int number = WireFormat.GetTagFieldNumber(tag);
switch (WireFormat.GetTagWireType(tag))
{