diff options
| author | Jon Skeet <skeet@pobox.com> | 2015-04-29 20:59:44 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2015-04-29 20:59:44 +0100 |
| commit | a449f66bdb50f3e898889705945fb1ac6b105469 (patch) | |
| tree | 87a1bb05e7a05d5fc0b2eb5046f637e64b0b3ec2 /csharp/src/ProtocolBuffers/UnknownFieldSet.cs | |
| parent | 32ead755d1f97e414f4a50edb7d9f1ebd9cab562 (diff) | |
| parent | 0e916d09a3fa272399b38f09b5509e0e2445e7fb (diff) | |
| download | protobuf-a449f66bdb50f3e898889705945fb1ac6b105469.tar.gz protobuf-a449f66bdb50f3e898889705945fb1ac6b105469.tar.bz2 protobuf-a449f66bdb50f3e898889705945fb1ac6b105469.zip | |
Merge pull request #317 from jskeet/csharp
Tidying up the C# runtime project
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)
|