diff options
author | Jon Skeet <jonskeet@google.com> | 2015-08-06 11:40:32 +0100 |
---|---|---|
committer | Jon Skeet <jonskeet@google.com> | 2015-08-06 11:40:32 +0100 |
commit | e7f88ff1294ada0fca19334ed2c844cdb98ea2f6 (patch) | |
tree | 97ab85611ecdc29c56afe217893bafa1d520fc27 /csharp/src/Google.Protobuf/MessageExtensions.cs | |
parent | ad8a889d1e1e2b0efd5b7579aa57ea5326cda6da (diff) | |
download | protobuf-e7f88ff1294ada0fca19334ed2c844cdb98ea2f6.tar.gz protobuf-e7f88ff1294ada0fca19334ed2c844cdb98ea2f6.tar.bz2 protobuf-e7f88ff1294ada0fca19334ed2c844cdb98ea2f6.zip |
Skip groups properly.
Now the generated code doesn't need to check for end group tags, as it will skip whole groups at a time.
Currently it will ignore extraneous end group tags, which may or may not be a good thing.
Renamed ConsumeLastField to SkipLastField as it felt more natural.
Removed WireFormat.IsEndGroupTag as it's no longer useful.
This mostly fixes issue 688.
(Generated code changes coming in next commit.)
Diffstat (limited to 'csharp/src/Google.Protobuf/MessageExtensions.cs')
-rw-r--r-- | csharp/src/Google.Protobuf/MessageExtensions.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/csharp/src/Google.Protobuf/MessageExtensions.cs b/csharp/src/Google.Protobuf/MessageExtensions.cs index ee78dc8d..d2d057c0 100644 --- a/csharp/src/Google.Protobuf/MessageExtensions.cs +++ b/csharp/src/Google.Protobuf/MessageExtensions.cs @@ -50,7 +50,7 @@ namespace Google.Protobuf Preconditions.CheckNotNull(data, "data"); CodedInputStream input = new CodedInputStream(data); message.MergeFrom(input); - input.CheckLastTagWas(0); + input.CheckReadEndOfStreamTag(); } /// <summary> @@ -64,7 +64,7 @@ namespace Google.Protobuf Preconditions.CheckNotNull(data, "data"); CodedInputStream input = data.CreateCodedInput(); message.MergeFrom(input); - input.CheckLastTagWas(0); + input.CheckReadEndOfStreamTag(); } /// <summary> @@ -78,7 +78,7 @@ namespace Google.Protobuf Preconditions.CheckNotNull(input, "input"); CodedInputStream codedInput = new CodedInputStream(input); message.MergeFrom(codedInput); - codedInput.CheckLastTagWas(0); + codedInput.CheckReadEndOfStreamTag(); } /// <summary> |