diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-04-13 12:40:48 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-04-13 12:40:48 -0700 |
| commit | 44664bb705fc704ac3cc5a745d200145a4897ed2 (patch) | |
| tree | 6c09d5ea86bdc8cddab959ec73af43dabb871b20 /src/google/protobuf/compiler/csharp/csharp_field_base.cc | |
| parent | b52cf04b3c4237bc8d2eee865d5a8f981a30d6bd (diff) | |
updated C# codegen to use restricted set of csharp options from descriptor.proto
Diffstat (limited to 'src/google/protobuf/compiler/csharp/csharp_field_base.cc')
| -rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_field_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_field_base.cc b/src/google/protobuf/compiler/csharp/csharp_field_base.cc index 48af999c..d7eb5d34 100644 --- a/src/google/protobuf/compiler/csharp/csharp_field_base.cc +++ b/src/google/protobuf/compiler/csharp/csharp_field_base.cc @@ -84,7 +84,7 @@ void FieldGeneratorBase::AddPublicMemberAttributes(Writer* writer) { } void FieldGeneratorBase::AddClsComplianceCheck(Writer* writer) { - if (!is_cls_compliant() && descriptor_->file()->options().csharp_cls_compliance()) { + if (cls_compliance() && !is_cls_compliant()) { writer->WriteLine("[global::System.CLSCompliant(false)]"); } } |