diff options
| author | Jie Luo <jieluo@google.com> | 2017-12-19 11:54:11 -0800 |
|---|---|---|
| committer | Jie Luo <jieluo@google.com> | 2017-12-19 15:38:02 -0800 |
| commit | b308580bb1c3f87a062ac1448a3e0bdaab9d40cf (patch) | |
| tree | ea211f27b3deb05a9ba5461079288020a11b5c8d /csharp/src/Google.Protobuf/CodedInputStream.cs | |
| parent | 3a06fe1fc9590b534f403114a0668befba926947 (diff) | |
| download | protobuf-b308580bb1c3f87a062ac1448a3e0bdaab9d40cf.tar.gz protobuf-b308580bb1c3f87a062ac1448a3e0bdaab9d40cf.tar.bz2 protobuf-b308580bb1c3f87a062ac1448a3e0bdaab9d40cf.zip | |
Cherrypick for csharp, including:
Add preserve UnknownFields
Compare floating point values bitwise
Add auto-generated header to C# generated files
Diffstat (limited to 'csharp/src/Google.Protobuf/CodedInputStream.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf/CodedInputStream.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/csharp/src/Google.Protobuf/CodedInputStream.cs b/csharp/src/Google.Protobuf/CodedInputStream.cs index abd352b9..24d436c0 100644 --- a/csharp/src/Google.Protobuf/CodedInputStream.cs +++ b/csharp/src/Google.Protobuf/CodedInputStream.cs @@ -424,7 +424,10 @@ namespace Google.Protobuf }
}
- private void SkipGroup(uint startGroupTag)
+ /// <summary>
+ /// Skip a group.
+ /// </summary>
+ internal void SkipGroup(uint startGroupTag)
{
// Note: Currently we expect this to be the way that groups are read. We could put the recursion
// depth changes into the ReadTag method instead, potentially...
@@ -1270,7 +1273,6 @@ namespace Google.Protobuf }
}
}
-
#endregion
}
}
\ No newline at end of file |