added support for deprecated fields, reworded some todos

3 files changed, 6 insertions, 8 deletions

diff --git a/src/google/protobuf/compiler/csharp/csharp_extension.cc b/src/google/protobuf/compiler/csharp/csharp_extension.cc
index b089aed1..8a30144d 100644
--- a/src/google/protobuf/compiler/csharp/csharp_extension.cc
+++ b/src/google/protobuf/compiler/csharp/csharp_extension.cc
@@ -73,7 +73,7 @@ void ExtensionGenerator::Generate(Writer* writer) {
                     SimpleItoa(descriptor_->number()));
 
   if (use_lite_runtime()) {
-    // TODO(jtattermusch): check the argument...
+    // TODO(jtattermusch): include the following check
     //if (Descriptor.MappedType == MappedType.Message && Descriptor.MessageType.Options.MessageSetWireFormat)
     //{
     //    throw new ArgumentException(
@@ -122,7 +122,7 @@ void ExtensionGenerator::GenerateStaticVariableInitializers(Writer* writer) {
       }
       writer->WriteLine("$0$,", default_val);
     }
-    // TODO(jtattermusch):
+    // TODO(jtattermusch): include following snippet
     //writer.WriteLine("{0},",
     //                 (Descriptor.MappedType == MappedType.Message) ? type + ".DefaultInstance" : "null");
     //writer.WriteLine("{0},",
diff --git a/src/google/protobuf/compiler/csharp/csharp_field_base.cc b/src/google/protobuf/compiler/csharp/csharp_field_base.cc
index d7eb5d34..ed4d55c4 100644
--- a/src/google/protobuf/compiler/csharp/csharp_field_base.cc
+++ b/src/google/protobuf/compiler/csharp/csharp_field_base.cc
@@ -61,11 +61,10 @@ FieldGeneratorBase::~FieldGeneratorBase() {
 }
 
 void FieldGeneratorBase::AddDeprecatedFlag(Writer* writer) {
-  // TODO(jtattermusch):
-  //if (IsObsolete)
-  //{
-  //  writer.WriteLine("[global::System.ObsoleteAttribute()]");
-  //}
+  if (descriptor_->options().deprecated())
+  {
+    writer->WriteLine("[global::System.ObsoleteAttribute()]");
+  }
 }
 
 void FieldGeneratorBase::AddNullCheck(Writer* writer) {
diff --git a/src/google/protobuf/compiler/csharp/csharp_message.cc b/src/google/protobuf/compiler/csharp/csharp_message.cc
index 126ed22d..7156c9e5 100644
--- a/src/google/protobuf/compiler/csharp/csharp_message.cc
+++ b/src/google/protobuf/compiler/csharp/csharp_message.cc
@@ -81,7 +81,6 @@ MessageGenerator::~MessageGenerator() {
 }
 
 std::string MessageGenerator::class_name() {
-  // TODO: check correctness.
   return descriptor_->name();
 }