diff options
| author | Jie Luo <jieluo@google.com> | 2015-04-29 15:55:11 -0700 |
|---|---|---|
| committer | Jie Luo <jieluo@google.com> | 2015-04-29 15:55:11 -0700 |
| commit | 954bc834133289cd7c844ab4195f574223a0e593 (patch) | |
| tree | 70453d4abe66ab04aab861d40a95fe4dd1d5e24c /csharp/src/ProtocolBuffers/UnknownFieldSet.cs | |
| parent | 4af18b87117ab463042f90e9d3c00c1bb776bcf7 (diff) | |
| parent | a449f66bdb50f3e898889705945fb1ac6b105469 (diff) | |
| download | protobuf-954bc834133289cd7c844ab4195f574223a0e593.tar.gz protobuf-954bc834133289cd7c844ab4195f574223a0e593.tar.bz2 protobuf-954bc834133289cd7c844ab4195f574223a0e593.zip | |
Merge branch 'csharp' of git://github.com/google/protobuf into google-csharp
Diffstat (limited to 'csharp/src/ProtocolBuffers/UnknownFieldSet.cs')
| -rw-r--r-- | csharp/src/ProtocolBuffers/UnknownFieldSet.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/csharp/src/ProtocolBuffers/UnknownFieldSet.cs b/csharp/src/ProtocolBuffers/UnknownFieldSet.cs index 09ed680f..aee1b7c9 100644 --- a/csharp/src/ProtocolBuffers/UnknownFieldSet.cs +++ b/csharp/src/ProtocolBuffers/UnknownFieldSet.cs @@ -446,7 +446,6 @@ namespace Google.ProtocolBuffers /// <param name="tag">The field's tag number, which was already parsed.</param>
/// <param name="input">The coded input stream containing the field</param>
/// <returns>false if the tag is an "end group" tag, true otherwise</returns>
- [CLSCompliant(false)]
public bool MergeFieldFrom(uint tag, ICodedInputStream input)
{
if (tag == 0)
@@ -554,7 +553,6 @@ namespace Google.ProtocolBuffers /// value. This is used in particular when an unknown enum value is
/// encountered.
/// </summary>
- [CLSCompliant(false)]
public Builder MergeVarintField(int number, ulong value)
{
if (number == 0)
|