aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/ProtocolBuffers/Descriptors/FieldMappingAttribute.cs
diff options
context:
space:
mode:
authorJie Luo <jieluo@google.com>2015-04-29 15:55:11 -0700
committerJie Luo <jieluo@google.com>2015-04-29 15:55:11 -0700
commit954bc834133289cd7c844ab4195f574223a0e593 (patch)
tree70453d4abe66ab04aab861d40a95fe4dd1d5e24c /csharp/src/ProtocolBuffers/Descriptors/FieldMappingAttribute.cs
parent4af18b87117ab463042f90e9d3c00c1bb776bcf7 (diff)
parenta449f66bdb50f3e898889705945fb1ac6b105469 (diff)
downloadprotobuf-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/Descriptors/FieldMappingAttribute.cs')
-rw-r--r--csharp/src/ProtocolBuffers/Descriptors/FieldMappingAttribute.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/csharp/src/ProtocolBuffers/Descriptors/FieldMappingAttribute.cs b/csharp/src/ProtocolBuffers/Descriptors/FieldMappingAttribute.cs
index fc58d046..752ecf66 100644
--- a/csharp/src/ProtocolBuffers/Descriptors/FieldMappingAttribute.cs
+++ b/csharp/src/ProtocolBuffers/Descriptors/FieldMappingAttribute.cs
@@ -40,7 +40,6 @@ namespace Google.ProtocolBuffers.Descriptors
/// Defined specifically for the <see cref="FieldType" /> enumeration,
/// this allows each field type to specify the mapped type and wire type.
/// </summary>
- [CLSCompliant(false)]
[AttributeUsage(AttributeTargets.Field)]
public sealed class FieldMappingAttribute : Attribute
{