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/Descriptors | |
| 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/Descriptors')
| -rw-r--r-- | csharp/src/ProtocolBuffers/Descriptors/FieldDescriptor.cs | 10 | ||||
| -rw-r--r-- | csharp/src/ProtocolBuffers/Descriptors/FieldMappingAttribute.cs | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/csharp/src/ProtocolBuffers/Descriptors/FieldDescriptor.cs b/csharp/src/ProtocolBuffers/Descriptors/FieldDescriptor.cs index 98de5435..076dc852 100644 --- a/csharp/src/ProtocolBuffers/Descriptors/FieldDescriptor.cs +++ b/csharp/src/ProtocolBuffers/Descriptors/FieldDescriptor.cs @@ -298,16 +298,6 @@ namespace Google.ProtocolBuffers.Descriptors get { return fieldType; }
}
- public bool IsCLSCompliant
- {
- get
- {
- return mappedType != MappedType.UInt32 &&
- mappedType != MappedType.UInt64 &&
- !NameHelpers.UnderscoresToPascalCase(Name).StartsWith("_");
- }
- }
-
public int FieldNumber
{
get { return Proto.Number; }
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
{
|