Browse Source

Fixing code formatting issues

Andrew Spiering 8 years ago
parent
commit
75ac3973ef

+ 4 - 12
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");
-      }
-    }
   }
 }
 

+ 1 - 2
src/google/protobuf/compiler/csharp/csharp_message.cc

@@ -99,8 +99,7 @@ const std::vector<const FieldDescriptor*>& MessageGenerator::fields_by_number()
 }
 
 void MessageGenerator::AddDeprecatedFlag(io::Printer* printer) {
-  if (descriptor_->options().deprecated())
-  {
+  if (descriptor_->options().deprecated()) {
     printer->Print("[global::System.ObsoleteAttribute]\n");
   }
 }