From 75ac3973eff1eecd0506f87bf94a51d57b3cc072 Mon Sep 17 00:00:00 2001 From: Andrew Spiering Date: Wed, 11 Jan 2017 11:18:53 -0800 Subject: [PATCH] Fixing code formatting issues --- .../compiler/csharp/csharp_field_base.cc | 16 ++++------------ .../protobuf/compiler/csharp/csharp_message.cc | 3 +-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/google/protobuf/compiler/csharp/csharp_field_base.cc b/src/google/protobuf/compiler/csharp/csharp_field_base.cc index 7dde6f448..139cc7536 100644 --- a/src/google/protobuf/compiler/csharp/csharp_field_base.cc +++ b/src/google/protobuf/compiler/csharp/csharp_field_base.cc @@ -122,19 +122,11 @@ void FieldGeneratorBase::GenerateCodecCode(io::Printer* printer) { } void FieldGeneratorBase::AddDeprecatedFlag(io::Printer* printer) { - if (descriptor_->options().deprecated()) - { + if (descriptor_->options().deprecated()) { + printer->Print("[global::System.ObsoleteAttribute]\n"); + } else if (descriptor_->type() == FieldDescriptor::TYPE_MESSAGE && + descriptor_->message_type()->options().deprecated()) { printer->Print("[global::System.ObsoleteAttribute]\n"); - } - else - { - if (descriptor_->type() == FieldDescriptor::TYPE_MESSAGE) - { - if (descriptor_->message_type()->options().deprecated()) - { - printer->Print("[global::System.ObsoleteAttribute]\n"); - } - } } } diff --git a/src/google/protobuf/compiler/csharp/csharp_message.cc b/src/google/protobuf/compiler/csharp/csharp_message.cc index 78e076c82..b0cc6694c 100644 --- a/src/google/protobuf/compiler/csharp/csharp_message.cc +++ b/src/google/protobuf/compiler/csharp/csharp_message.cc @@ -99,8 +99,7 @@ const std::vector& MessageGenerator::fields_by_number() } void MessageGenerator::AddDeprecatedFlag(io::Printer* printer) { - if (descriptor_->options().deprecated()) - { + if (descriptor_->options().deprecated()) { printer->Print("[global::System.ObsoleteAttribute]\n"); } }