diff options
author | Jon Skeet <skeet@pobox.com> | 2015-08-05 09:11:25 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2015-08-05 09:11:25 +0100 |
commit | 607940321c8ceeb80ec1099d94add8eef86825e5 (patch) | |
tree | a9ccd19f451afbbba95814ff8ea5bf8b15fc841a /csharp/src/Google.Protobuf/WellKnownTypes | |
parent | d77d70d227b648ac8c36183ac9d85cf39f782978 (diff) | |
parent | c13a612dc473ff0678602892121c3101c6890abb (diff) | |
download | protobuf-607940321c8ceeb80ec1099d94add8eef86825e5.tar.gz protobuf-607940321c8ceeb80ec1099d94add8eef86825e5.tar.bz2 protobuf-607940321c8ceeb80ec1099d94add8eef86825e5.zip |
Merge pull request #689 from jskeet/fix-eof
C# conformance tests
Diffstat (limited to 'csharp/src/Google.Protobuf/WellKnownTypes')
10 files changed, 25 insertions, 0 deletions
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs index 93395871..4352c16a 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs @@ -155,6 +155,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 10: { TypeUrl = input.ReadString(); diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs index 366bba21..a5d48166 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs @@ -218,6 +218,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 10: { Name = input.ReadString(); @@ -445,6 +446,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 10: { Name = input.ReadString(); diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs index 26c8d2b6..1ca33dce 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs @@ -156,6 +156,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 8: { Seconds = input.ReadInt64(); diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs index e14992f4..0d948e38 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs @@ -111,6 +111,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; } } diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs index 45ef9859..58dbc7fa 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs @@ -125,6 +125,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 10: { paths_.AddEntriesFrom(input, _repeated_paths_codec); diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs b/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs index 04fb6350..5566b5ce 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs @@ -134,6 +134,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 10: { FileName = input.ReadString(); diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs index 15dd6dcd..72bd16d4 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs @@ -144,6 +144,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 10: { fields_.AddEntriesFrom(input, _map_fields_codec); @@ -398,6 +399,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 8: { kind_ = input.ReadEnum(); @@ -527,6 +529,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 10: { values_.AddEntriesFrom(input, _repeated_values_codec); diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs index 3c42068a..c3e5383e 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs @@ -156,6 +156,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 8: { Seconds = input.ReadInt64(); diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs index 64142934..862caf82 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs @@ -231,6 +231,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 10: { Name = input.ReadString(); @@ -502,6 +503,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 8: { kind_ = (global::Google.Protobuf.WellKnownTypes.Field.Types.Kind) input.ReadEnum(); @@ -723,6 +725,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 10: { Name = input.ReadString(); @@ -880,6 +883,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 10: { Name = input.ReadString(); @@ -1019,6 +1023,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 10: { Name = input.ReadString(); diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs index c9dd6ea6..2b3814cc 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs @@ -143,6 +143,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 9: { Value = input.ReadDouble(); @@ -249,6 +250,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 13: { Value = input.ReadFloat(); @@ -355,6 +357,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 8: { Value = input.ReadInt64(); @@ -461,6 +464,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 8: { Value = input.ReadUInt64(); @@ -567,6 +571,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 8: { Value = input.ReadInt32(); @@ -673,6 +678,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 8: { Value = input.ReadUInt32(); @@ -779,6 +785,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 8: { Value = input.ReadBool(); @@ -885,6 +892,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 10: { Value = input.ReadString(); @@ -991,6 +999,7 @@ namespace Google.Protobuf.WellKnownTypes { if (pb::WireFormat.IsEndGroupTag(tag)) { return; } + input.ConsumeLastField(); break; case 10: { Value = input.ReadBytes(); |